From 4d42d9675a51a16d76f83bcbb188a8acf42aefdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20B=C3=A9gaudeau?= Date: Thu, 15 Dec 2022 09:56:32 +0100 Subject: [PATCH] =?UTF-8?q?[cleanup]=C2=A0Remove=20useless=20comments=20fo?= =?UTF-8?q?r=20the=20internationalization?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Bégaudeau --- .../components/charts/barchart/BarChart.java | 4 +- .../charts/barchart/BarChartEntry.java | 2 +- .../barchart/components/BarChartStyle.java | 2 +- .../elements/BarChartElementProps.java | 2 +- .../charts/hierarchy/Hierarchy.java | 2 +- .../charts/hierarchy/HierarchyNode.java | 2 +- .../components/HierarchyComponent.java | 2 +- .../descriptions/HierarchyDescription.java | 2 +- .../elements/HierarchyElementProps.java | 2 +- .../elements/HierarchyNodeElementProps.java | 2 +- .../components/charts/piechart/PieChart.java | 4 +- .../charts/piechart/PieChartEntry.java | 2 +- .../components/PieChartComponent.java | 2 +- .../piechart/components/PieChartStyle.java | 2 +- .../elements/PieChartElementProps.java | 2 +- .../charts/ArchitectureConstants.java | 2 +- .../charts/HierarchyCreationService.java | 2 +- .../charts/HierarchyDeserializer.java | 6 +- .../charts/HierarchyEventFlux.java | 4 +- .../charts/HierarchyEventInput.java | 2 +- .../charts/HierarchyEventProcessor.java | 8 +- .../HierarchyRefreshedEventPayload.java | 2 +- ...tiveChartsMessageServiceConfiguration.java | 2 +- .../charts/messages/MessageConstants.java | 2 +- .../emf/AQLInterpreterFactory.java | 12 +- .../emf/DomainClassPredicate.java | 6 +- .../emf/SemanticCandidatesProvider.java | 4 +- .../emf/diagrams/ToolImageProvider.java | 12 +- .../ChildModelOperationHandler.java | 4 +- .../CreateInstanceOperationHandler.java | 6 +- .../CreateViewOperationHandler.java | 2 +- .../DeleteViewOperationHandler.java | 2 +- .../ExternalJavaActionOperationHandler.java | 4 +- .../ModelOperationHandlerSwitch.java | 2 +- .../MoveElementOperationHandler.java | 4 +- .../RemoveElementOperationHandler.java | 2 +- .../EBooleanIfDescriptionProvider.java | 8 +- .../EEnumIfDescriptionProvider.java | 10 +- .../EStringIfDescriptionProvider.java | 8 +- .../EStructuralFeatureLabelProvider.java | 4 +- ...ainmentReferenceIfDescriptionProvider.java | 8 +- ...ainmentReferenceIfDescriptionProvider.java | 10 +- .../NumberIfDescriptionProvider.java | 10 +- .../PropertiesDefaultDescriptionProvider.java | 16 +- .../PropertiesValidationProvider.java | 14 +- .../api/IPropertiesValidationProvider.java | 6 +- .../architecture/ArchitectureConstants.java | 4 +- .../DomainClassPredicateTests.java | 12 +- .../diagrams/EdgeMappingConverterTests.java | 28 +- .../SemanticCandidatesProviderTests.java | 16 +- .../diagrams/ToolImageProviderTests.java | 2 +- .../ChangeContextOperationHandlerTests.java | 8 +- .../ChildModelOperationHandlerTests.java | 10 +- .../CreateInstanceOperationHandlerTests.java | 22 +- .../CreateViewOperationHandlerTests.java | 47 +- .../DeleteViewOperationHandlerTests.java | 52 +- .../operations/ForOperationHandlerTests.java | 12 +- .../operations/IfOperationHandlerTests.java | 8 +- .../operations/LetOperationHandlerTests.java | 10 +- .../operations/ModelOperationServices.java | 8 +- .../MoveElementOperationHandlerTests.java | 12 +- .../NavigationOperationHandlerTests.java | 12 +- .../operations/OperationTestContext.java | 4 +- .../SetValueOperationHandlerTests.java | 8 +- .../SwitchOperationHandlerTests.java | 16 +- .../UnsetOperationHandlerTests.java | 12 +- .../properties/FormRendererTests.java | 54 +- .../api/IIdentifierProvider.java | 2 +- ...patibilityMessageServiceConfiguration.java | 2 +- .../AbstractNodeMappingConverter.java | 4 +- .../AbstractNodeMappingStyleProvider.java | 6 +- .../diagrams/ColorDescriptionConverter.java | 6 +- .../diagrams/DiagramLabelProvider.java | 6 +- .../diagrams/EdgeMappingConverter.java | 8 +- .../LabelStyleDescriptionConverter.java | 6 +- .../SelectModelElementVariableConverter.java | 4 +- .../compatibility/diagrams/ToolConverter.java | 20 +- .../WorkspaceImageDescriptionConverter.java | 4 +- .../forms/ControlDescriptionConverter.java | 4 +- .../forms/GroupDescriptionConverter.java | 4 +- .../forms/PageDescriptionConverter.java | 8 +- .../ViewExtensionDescriptionConverter.java | 2 +- .../forms/WidgetDescriptionConverter.java | 48 +- .../compatibility/forms/WidgetIdProvider.java | 6 +- .../ICompatibilityMessageService.java | 6 +- .../messages/MessageConstants.java | 6 +- .../services/ImageConstants.java | 8 +- ...InitialDirectEditElementLabelProvider.java | 2 +- ...ompatibilityReconnectionToolsExecutor.java | 8 +- .../CompatibilityToolSectionsProvider.java | 30 +- .../diagrams/DiagramDescriptionConverter.java | 2 +- ...ptionNodeAndEdgeDescriptionsPopulator.java | 6 +- .../services/diagrams/ToolProvider.java | 30 +- .../representations/ODesignReader.java | 8 +- .../utils/StringValueProvider.java | 4 +- .../architecture/ArchitectureConstants.java | 4 +- .../ColorDescriptionConverterTests.java | 4 +- .../ContainerMappingSizeProviderTests.java | 6 +- .../ContainerMappingStyleProviderTests.java | 8 +- .../diagrams/DiagramLabelProviderTests.java | 16 +- .../DomainBasedSourceNodesProviderTests.java | 14 +- .../EdgeMappingStyleProviderTests.java | 8 +- .../LabelStyleDescriptionConverterTests.java | 6 +- .../diagrams/MappingConverterTests.java | 52 +- .../NodeMappingSizeProviderTests.java | 4 +- .../NodeMappingStyleProviderTests.java | 8 +- ...RelationBasedSourceNodesProviderTests.java | 12 +- ...rkspaceImageDescriptionConverterTests.java | 6 +- .../collaborative/api/ChangeDescription.java | 4 +- .../collaborative/api/ChangeKind.java | 20 +- .../collaborative/api/Monitoring.java | 8 +- ...laborativeMessageServiceConfiguration.java | 4 +- .../collaborative/dto/CreateChildInput.java | 2 +- .../dto/CreateChildSuccessPayload.java | 2 +- .../dto/CreateDocumentInput.java | 2 +- .../dto/CreateDocumentSuccessPayload.java | 2 +- .../dto/CreateRepresentationInput.java | 2 +- .../CreateRepresentationSuccessPayload.java | 2 +- .../dto/CreateRootObjectInput.java | 2 +- .../dto/CreateRootObjectSuccessPayload.java | 2 +- .../dto/DeleteDocumentInput.java | 2 +- .../dto/DeleteDocumentSuccessPayload.java | 2 +- .../collaborative/dto/DeleteObjectInput.java | 2 +- .../dto/DeleteObjectSuccessPayload.java | 2 +- .../dto/DeleteRepresentationInput.java | 2 +- .../DeleteRepresentationSuccessPayload.java | 2 +- .../dto/EditingContextAction.java | 2 +- .../dto/EditingContextEventInput.java | 2 +- ...ontextRepresentationDescriptionsInput.java | 2 +- .../dto/GetEditingContextActionsInput.java | 2 +- ...etEditingContextActionsSuccessPayload.java | 2 +- .../dto/InvokeEditingContextActionInput.java | 2 +- ...okeEditingContextActionSuccessPayload.java | 2 +- .../dto/QueryBasedBooleanInput.java | 4 +- .../dto/QueryBasedBooleanSuccessPayload.java | 4 +- .../collaborative/dto/QueryBasedIntInput.java | 4 +- .../dto/QueryBasedIntSuccessPayload.java | 4 +- .../dto/QueryBasedObjectInput.java | 4 +- .../dto/QueryBasedObjectSuccessPayload.java | 4 +- .../dto/QueryBasedObjectsInput.java | 4 +- .../dto/QueryBasedObjectsSuccessPayload.java | 4 +- .../dto/QueryBasedStringInput.java | 4 +- .../dto/QueryBasedStringSuccessPayload.java | 4 +- .../dto/RenameDocumentInput.java | 2 +- .../dto/RenameDocumentSuccessPayload.java | 2 +- .../collaborative/dto/RenameObjectInput.java | 2 +- .../dto/RenameObjectSuccessPayload.java | 2 +- .../dto/RenameRepresentationInput.java | 2 +- .../RenameRepresentationSuccessPayload.java | 2 +- .../RepresentationRenamedEventPayload.java | 2 +- .../collaborative/dto/Subscriber.java | 2 +- .../dto/SubscribersUpdatedEventPayload.java | 2 +- .../EditingContextEventProcessor.java | 30 +- .../EditingContextEventProcessorRegistry.java | 8 +- .../handlers/DeleteObjectEventHandler.java | 4 +- ...nvokeEditingContextActionEventHandler.java | 4 +- .../messages/CollaborativeMessageService.java | 8 +- .../ICollaborativeMessageService.java | 8 +- .../representations/SubscriptionManager.java | 10 +- .../architecture/ArchitectureConstants.java | 4 +- .../CreateChildEventHandlerTests.java | 4 +- .../CreateRootObjectEventHandlerTests.java | 4 +- .../DeleteObjectEventHandlerTests.java | 4 +- ...ditingContextActionsEventHandlerTests.java | 4 +- ...EditingContextActionEventHandlerTests.java | 10 +- .../QueryBasedBooleanEventHandlerTests.java | 6 +- .../QueryBasedIntEventHandlerTests.java | 6 +- .../QueryBasedObjectEventHandlerTests.java | 6 +- .../QueryBasedObjectsEventHandlerTests.java | 6 +- .../QueryBasedStringEventHandlerTests.java | 8 +- .../RenameObjectEventHandlerTests.java | 6 +- .../sirius/components/core/KindParser.java | 6 +- .../core/RepresentationMetadata.java | 2 +- .../core/api/ChildCreationDescription.java | 2 +- .../sirius/components/core/api/Domain.java | 4 +- .../components/core/api/Environment.java | 4 +- .../components/core/api/ErrorPayload.java | 2 +- .../components/core/api/IEditingContext.java | 4 +- .../components/core/api/IObjectService.java | 12 +- .../core/api/SemanticKindConstants.java | 6 +- .../configuration/StereotypeDescription.java | 4 +- .../architecture/ArchitectureConstants.java | 4 +- .../graphql/api/GraphQLConstants.java | 6 +- .../graphql/api/LocalContextConstants.java | 4 +- .../components/graphql/api/URLConstants.java | 8 +- .../components/graphql/api/UploadFile.java | 4 +- .../graphql/api/UploadScalarType.java | 4 +- .../components/representations/Fragment.java | 4 +- .../GetOrCreateRandomIdProvider.java | 2 +- .../representations/IRepresentation.java | 2 +- .../IRepresentationDescription.java | 2 +- .../components/representations/Success.java | 4 +- .../representations/VariableManager.java | 8 +- .../representations/WorkbenchSelection.java | 2 +- .../WorkbenchSelectionEntry.java | 2 +- .../diagrams/DiagramChangeKind.java | 4 +- .../diagrams/DiagramCreationService.java | 2 +- .../diagrams/DiagramEventFlux.java | 6 +- .../diagrams/DiagramEventProcessor.java | 10 +- .../diagrams/DiagramImagePathService.java | 4 +- .../diagrams/DiagramImageProvider.java | 2 +- .../diagrams/ILayoutStrategyDeserializer.java | 2 +- .../diagrams/api/DiagramImageConstants.java | 8 +- .../diagrams/api/IDiagramContext.java | 4 +- .../diagrams/api/ParametricSVGImage.java | 2 +- .../diagrams/api/SVGAttribute.java | 16 +- ...iveDiagramMessageServiceConfiguration.java | 4 +- .../diagrams/dto/ArrangeAllInput.java | 2 +- .../dto/ArrangeAllSuccessPayload.java | 2 +- .../diagrams/dto/DeleteFromDiagramInput.java | 2 +- .../dto/DeleteFromDiagramSuccessPayload.java | 2 +- .../diagrams/dto/DiagramEventInput.java | 2 +- .../dto/DiagramRefreshedEventPayload.java | 2 +- .../diagrams/dto/DropOnDiagramInput.java | 4 +- .../dto/DropOnDiagramSuccessPayload.java | 4 +- .../diagrams/dto/EditLabelInput.java | 2 +- .../diagrams/dto/EditLabelSuccessPayload.java | 2 +- .../dto/ExportRepresentationPayload.java | 2 +- .../diagrams/dto/FadeDiagramElementInput.java | 2 +- .../dto/FadeDiagramElementSuccessPayload.java | 2 +- .../diagrams/dto/GetConnectorToolsInput.java | 2 +- .../dto/GetConnectorToolsSuccessPayload.java | 2 +- .../dto/GetToolSectionSuccessPayload.java | 2 +- .../diagrams/dto/GetToolSectionsInput.java | 2 +- .../diagrams/dto/HideDiagramElementInput.java | 2 +- .../dto/HideDiagramElementSuccessPayload.java | 2 +- .../InitialDirectEditElementLabelInput.java | 2 +- ...lDirectEditElementLabelSuccessPayload.java | 2 +- .../dto/InvokeDeleteToolOnDiagramInput.java | 2 +- ...vokeDeleteToolOnDiagramSuccessPayload.java | 2 +- ...eSingleClickOnDiagramElementToolInput.java | 2 +- ...ickOnDiagramElementToolSuccessPayload.java | 2 +- ...gleClickOnTwoDiagramElementsToolInput.java | 2 +- ...nTwoDiagramElementsToolSuccessPayload.java | 2 +- .../diagrams/dto/ReconnectEdgeInput.java | 2 +- .../dto/ReconnectEdgeSuccessPayload.java | 2 +- .../diagrams/dto/RenameDiagramInput.java | 2 +- .../dto/UpdateEdgeRoutingPointsInput.java | 2 +- ...UpdateEdgeRoutingPointsSuccessPayload.java | 2 +- .../diagrams/dto/UpdateNodeBoundsInput.java | 2 +- .../dto/UpdateNodeBoundsSuccessPayload.java | 2 +- .../diagrams/dto/UpdateNodePositionInput.java | 2 +- .../dto/UpdateNodePositionSuccessPayload.java | 2 +- .../svg/DiagramElementExportService.java | 128 ++--- .../export/svg/DiagramExportService.java | 22 +- .../export/svg/EdgeExportService.java | 168 +++--- .../export/svg/NodeExportService.java | 30 +- .../DeleteFromDiagramEventHandler.java | 10 +- .../handlers/DropOnDiagramEventHandler.java | 2 +- .../handlers/EditLabelEventHandler.java | 4 +- .../handlers/ExportDiagramEventHandler.java | 2 +- ...ClickOnDiagramElementToolEventHandler.java | 4 +- ...kOnTwoDiagramElementsToolEventHandler.java | 2 +- .../handlers/ReconnectEdgeEventHandler.java | 2 +- .../ICollaborativeDiagramMessageService.java | 24 +- .../diagrams/messages/MessageConstants.java | 24 +- .../services/DiagramDeserializer.java | 4 +- .../diagrams/DiagramEventProcessorTests.java | 2 +- .../architecture/ArchitectureConstants.java | 4 +- .../export/DiagramExportServiceTests.java | 12 +- .../handlers/ArrangeAllEventHandlerTests.java | 2 +- .../ChangeVisibilityEventHandlerTests.java | 8 +- .../CreateDiagramEventHandlerTests.java | 10 +- .../DeleteFromDiagramEventHandlerTests.java | 8 +- .../GetConnectorToolsEventHandlerTests.java | 50 +- ...rectEditElementLabelEventHandlerTests.java | 2 +- ...OnDiagramElementToolEventHandlerTests.java | 20 +- .../ReconnectEdgeEventHandlerTests.java | 2 +- .../RenameDiagramEventHandlerTests.java | 4 +- ...ateEdgeRoutingPointsEventHandlerTests.java | 2 +- ...mDescriptionConnectorToolsDataFetcher.java | 4 +- ...tialDirectEditElementLabelDataFetcher.java | 2 +- ...ramDescriptionToolSectionsDataFetcher.java | 2 +- .../MutationArrangeAllDataFetcher.java | 2 +- .../MutationDeleteFromDiagramDataFetcher.java | 2 +- .../MutationDropOnDiagramDataFetcher.java | 2 +- .../MutationEditLabelDataFetcher.java | 2 +- ...MutationFadeDiagramElementDataFetcher.java | 2 +- ...MutationHideDiagramElementDataFetcher.java | 2 +- ...eClickOnDiagramElementToolDataFetcher.java | 2 +- ...ckOnTwoDiagramElementsToolDataFetcher.java | 2 +- .../MutationReconnectEdgeDataFetcher.java | 2 +- ...ionUpdateEdgeRoutingPointsDataFetcher.java | 2 +- .../MutationUpdateNodeBoundsDataFetcher.java | 2 +- ...MutationUpdateNodePositionDataFetcher.java | 2 +- .../SubscriptionDiagramEventDataFetcher.java | 2 +- .../architecture/ArchitectureConstants.java | 2 +- .../diagrams/layout/api/Bounds.java | 2 +- .../diagrams/layout/ELKDiagramConverter.java | 16 +- .../diagrams/layout/TextBoundsService.java | 14 +- .../LayoutEngineHandlerSwitch.java | 2 +- .../LayoutStrategyEngineHandlerSwitch.java | 2 +- .../provider/ImageSizeProvider.java | 10 +- .../provider/NodePositionProvider.java | 4 +- .../updater/ContainmentUpdater.java | 2 +- .../architecture/ArchitectureConstants.java | 4 +- .../incremental/BorderNodePositionTests.java | 6 +- .../incremental/DiagramLayoutTests.java | 38 +- .../EdgeLabelPositionProviderTests.java | 6 +- .../layout/incremental/EdgeLayoutTests.java | 26 +- .../incremental/IncrementalLayoutTests.java | 70 +-- .../layout/incremental/NodeCreationTests.java | 52 +- .../NodeLabelPositionProviderTests.java | 6 +- .../layout/incremental/NodeMoveTests.java | 14 +- .../layout/incremental/NodeResizeTests.java | 6 +- .../incremental/ReconnectEdgeTests.java | 26 +- ...DefaultTestDiagramDescriptionProvider.java | 70 +-- .../layout/services/DiagramELKLayoutTest.java | 8 +- .../ImageNodeStyleSizeProviderTests.java | 4 +- .../services/ImageSizeProviderTests.java | 8 +- .../services/TestLayoutObjectService.java | 6 +- .../diagrams/tests/DiagramAssert.java | 20 +- .../components/diagrams/tests/EdgeAssert.java | 6 +- .../diagrams/tests/LabelAssert.java | 20 +- .../components/diagrams/tests/NodeAssert.java | 14 +- .../diagrams/tests/TestDiagramBuilder.java | 36 +- .../tests/TestDiagramDescriptionBuilder.java | 38 +- .../builder/TestLayoutDiagramBuilder.java | 8 +- .../tests/builder/edge/EdgeBuilder.java | 8 +- .../tests/builder/label/LabelBuilder.java | 4 +- .../builder/node/IconlabelNodeBuilder.java | 4 +- .../tests/builder/node/ImageNodeBuilder.java | 4 +- .../builder/node/RectangleNodeBuilder.java | 6 +- .../sirius/components/diagrams/Diagram.java | 4 +- .../sirius/components/diagrams/Edge.java | 12 +- .../sirius/components/diagrams/EdgeStyle.java | 2 +- .../diagrams/FreeFormLayoutStrategy.java | 2 +- .../diagrams/IconLabelNodeStyle.java | 2 +- .../components/diagrams/ImageNodeStyle.java | 4 +- .../sirius/components/diagrams/Label.java | 2 +- .../diagrams/ListLayoutStrategy.java | 2 +- .../sirius/components/diagrams/Node.java | 4 +- .../sirius/components/diagrams/NodeType.java | 6 +- .../diagrams/ParametricSVGNodeStyle.java | 6 +- .../diagrams/ParametricSVGNodeType.java | 2 +- .../sirius/components/diagrams/Position.java | 2 +- .../sirius/components/diagrams/Ratio.java | 2 +- .../diagrams/RectangularNodeStyle.java | 2 +- .../sirius/components/diagrams/Size.java | 2 +- .../diagrams/TextBoundsProvider.java | 8 +- .../diagrams/ViewCreationRequest.java | 4 +- .../diagrams/ViewDeletionRequest.java | 4 +- .../diagrams/components/EdgeComponent.java | 6 +- .../diagrams/components/LabelType.java | 12 +- .../diagrams/components/NodeComponent.java | 2 +- .../description/DiagramDescription.java | 8 +- .../diagrams/description/EdgeDescription.java | 10 +- .../description/LabelDescription.java | 8 +- .../diagrams/description/NodeDescription.java | 2 +- .../elements/DiagramElementProps.java | 4 +- .../diagrams/elements/EdgeElementProps.java | 4 +- .../diagrams/elements/LabelElementProps.java | 6 +- .../diagrams/elements/NodeElementProps.java | 4 +- .../renderer/DiagramElementFactory.java | 2 +- .../diagrams/tools/EdgeReconnectionTool.java | 4 +- .../SingleClickOnDiagramElementTool.java | 4 +- ...gleClickOnTwoDiagramElementsCandidate.java | 2 +- .../SingleClickOnTwoDiagramElementsTool.java | 2 +- .../diagrams/tools/ToolSection.java | 2 +- .../architecture/ArchitectureConstants.java | 4 +- .../DiagramElementChangeVisibilityTests.java | 30 +- .../renderer/DiagramRendererEdgeTests.java | 44 +- .../renderer/DiagramRendererNodeTests.java | 42 +- .../renderer/UnsynchronizedDiagramTests.java | 46 +- .../design/services/DomainServices.java | 26 +- .../provider/AttributeItemProvider.java | 30 +- .../domain/provider/DomainEditPlugin.java | 26 +- .../domain/provider/DomainItemProvider.java | 10 +- .../domain/provider/EntityItemProvider.java | 20 +- .../domain/provider/FeatureItemProvider.java | 16 +- .../provider/NamedElementItemProvider.java | 12 +- .../domain/provider/RelationItemProvider.java | 16 +- .../domain/emf/DomainConverter.java | 8 +- .../domain/emf/DomainValidator.java | 8 +- .../domains/emf/DomainConverterTests.java | 14 +- .../domains/emf/DomainValidatorTests.java | 44 +- .../architecture/ArchitectureConstants.java | 4 +- .../sirius/components/domain/DataType.java | 8 +- .../components/domain/DomainPackage.java | 8 +- .../components/domain/impl/AttributeImpl.java | 4 +- .../domain/impl/DomainFactoryImpl.java | 16 +- .../domain/impl/DomainPackageImpl.java | 38 +- .../components/domain/impl/EntityImpl.java | 4 +- .../components/domain/impl/FeatureImpl.java | 6 +- .../domain/impl/NamedElementImpl.java | 4 +- .../components/domain/impl/RelationImpl.java | 4 +- .../src/main/resources/model/domain.genmodel | 2 +- .../EMFMessageServiceConfiguration.java | 4 +- .../components/emf/query/EMFQueryService.java | 4 +- .../emf/services/EMFImagePathService.java | 4 +- .../emf/services/EMFKindService.java | 4 +- .../components/emf/services/EditService.java | 2 +- .../emf/services/EditingContext.java | 2 +- .../emf/services/JSONResourceFactory.java | 4 +- .../emf/services/ObjectService.java | 16 +- .../emf/services/api/IEMFKindService.java | 8 +- .../services/messages/EMFMessageService.java | 8 +- .../services/messages/IEMFMessageService.java | 8 +- .../emf/utils/EMFResourceUtils.java | 10 +- .../architecture/ArchitectureConstants.java | 4 +- .../emf/query/EMFQueryServiceTests.java | 20 +- ...itingContextCrossReferenceAdapterTest.java | 2 +- .../emf/services/IDManagerTests.java | 12 +- .../emf/services/ObjectServiceTests.java | 6 +- .../interpreter/AQLInterpreter.java | 10 +- .../interpreter/ExpressionConverter.java | 26 +- .../sirius/components/interpreter/Result.java | 8 +- .../interpreter/AQLInterpreterTests.java | 26 +- .../interpreter/ExpressionConverterTests.java | 38 +- .../components/interpreter/ResultTests.java | 6 +- .../components/interpreter/TestServices.java | 2 +- .../FormDescriptionEditorCreationService.java | 2 +- .../FormDescriptionEditorEventFlux.java | 4 +- .../FormDescriptionEditorEventProcessor.java | 10 +- ...FormDescriptionEditorImagePathService.java | 2 +- .../FormDescriptionEditorImageProvider.java | 2 +- ...rmDescriptionEditorCreationParameters.java | 2 +- .../api/IFormDescriptionEditorContext.java | 2 +- ...tionEditorMessageServiceConfiguration.java | 2 +- .../dto/AddGroupInput.java | 2 +- .../dto/AddGroupSuccessPayload.java | 2 +- .../dto/AddToolbarActionInput.java | 2 +- .../dto/AddToolbarActionSuccessPayload.java | 2 +- .../dto/AddWidgetInput.java | 2 +- .../dto/AddWidgetSuccessPayload.java | 2 +- .../dto/DeleteGroupInput.java | 2 +- .../dto/DeleteGroupSuccessPayload.java | 2 +- .../dto/DeleteToolbarActionInput.java | 2 +- .../DeleteToolbarActionSuccessPayload.java | 2 +- .../dto/DeleteWidgetInput.java | 2 +- .../dto/DeleteWidgetSuccessPayload.java | 2 +- .../dto/FormDescriptionEditorEventInput.java | 2 +- ...escriptionEditorRefreshedEventPayload.java | 2 +- .../dto/MoveGroupInput.java | 2 +- .../dto/MoveGroupSuccessPayload.java | 2 +- .../dto/MoveToolbarActionInput.java | 2 +- .../dto/MoveToolbarActionSuccessPayload.java | 2 +- .../dto/MoveWidgetInput.java | 2 +- .../dto/MoveWidgetSuccessPayload.java | 2 +- .../dto/RenameFormDescriptionEditorInput.java | 2 +- .../AddToolbarActionEventHandler.java | 2 +- .../handlers/AddWidgetEventHandler.java | 4 +- ...veFormDescriptionEditorMessageService.java | 2 +- ...veFormDescriptionEditorMessageService.java | 2 +- .../FormDescriptionEditorDeserializer.java | 2 +- ...torRepresentationDescriptionsProvider.java | 2 +- ...mDescriptionEditorEventProcessorTests.java | 2 +- .../TestFormDescriptionEditorBuilder.java | 10 +- ...rmDescriptionEditorDescriptionBuilder.java | 4 +- .../architecture/ArchitectureConstants.java | 2 +- .../AddToolbarActionEventHandlerTests.java | 2 +- .../handlers/AddWidgetEventHandlerTests.java | 2 +- ...ormDescriptionEditorEventHandlerTests.java | 6 +- .../DeleteToolbarActionEventHandlerTests.java | 4 +- .../DeleteWidgetEventHandlerTests.java | 2 +- .../MoveToolbarActionEventHandlerTests.java | 12 +- .../handlers/MoveWidgetEventHandlerTests.java | 2 +- ...ormDescriptionEditorEventHandlerTests.java | 4 +- .../mutation/MutationAddGroupDataFetcher.java | 2 +- .../MutationAddToolbarActionDataFetcher.java | 2 +- .../MutationAddWidgetDataFetcher.java | 2 +- .../MutationDeleteGroupDataFetcher.java | 2 +- ...utationDeleteToolbarActionDataFetcher.java | 2 +- .../MutationDeleteWidgetDataFetcher.java | 2 +- .../MutationMoveGroupDataFetcher.java | 2 +- .../MutationMoveToolbarActionDataFetcher.java | 2 +- .../MutationMoveWidgetDataFetcher.java | 2 +- ...FormDescriptionEditorEventDataFetcher.java | 2 +- .../architecture/ArchitectureConstants.java | 2 +- .../FormDescriptionEditor.java | 6 +- .../FormDescriptionEditorComponent.java | 2 +- .../FormDescriptionEditorGroupComponent.java | 4 +- ...wFormDescriptionEditorConverterSwitch.java | 126 ++--- ...onEditorDescriptionRegistryConfigurer.java | 4 +- .../FormDescriptionEditorDescription.java | 2 +- .../FormDescriptionEditorElementProps.java | 4 +- .../architecture/ArchitectureConstants.java | 2 +- ...DescriptionEditorConverterSwitchTests.java | 22 +- .../forms/FormDescriptionAggregator.java | 4 +- .../forms/FormEventProcessor.java | 12 +- .../forms/FormImagePathService.java | 4 +- .../forms/FormImageProvider.java | 2 +- .../collaborative/forms/FormQueryService.java | 2 +- .../PropertiesEventProcessorFactory.java | 2 +- .../forms/WidgetSubscriptionManager.java | 4 +- .../forms/api/FormCreationParameters.java | 2 +- .../forms/api/PropertiesConfiguration.java | 2 +- .../api/RelatedElementsConfiguration.java | 2 +- .../api/RepresentationsConfiguration.java | 4 +- ...rativeFormMessageServiceConfiguration.java | 4 +- .../forms/dto/ClickListItemInput.java | 2 +- .../dto/ClickListItemSuccessPayload.java | 2 +- .../forms/dto/CompletionRequestInput.java | 2 +- .../dto/CompletionRequestSuccessPayload.java | 2 +- .../forms/dto/DeleteListItemInput.java | 2 +- .../dto/DeleteListItemSuccessPayload.java | 2 +- .../forms/dto/EditCheckboxInput.java | 2 +- .../forms/dto/EditCheckboxSuccessPayload.java | 2 +- .../forms/dto/EditMultiSelectInput.java | 2 +- .../dto/EditMultiSelectSuccessPayload.java | 2 +- .../forms/dto/EditRadioInput.java | 2 +- .../forms/dto/EditRadioSuccessPayload.java | 2 +- .../forms/dto/EditRichTextInput.java | 2 +- .../forms/dto/EditRichTextSuccessPayload.java | 2 +- .../forms/dto/EditSelectInput.java | 2 +- .../forms/dto/EditSelectSuccessPayload.java | 2 +- .../forms/dto/EditTextfieldInput.java | 2 +- .../dto/EditTextfieldSuccessPayload.java | 2 +- .../forms/dto/FormEventInput.java | 2 +- .../forms/dto/FormRefreshedEventPayload.java | 2 +- .../forms/dto/PropertiesEventInput.java | 2 +- .../dto/PropertiesRefreshedEventPayload.java | 2 +- .../forms/dto/PushButtonInput.java | 2 +- .../forms/dto/PushButtonSuccessPayload.java | 2 +- .../forms/dto/RenameFormInput.java | 2 +- .../forms/dto/RepresentationsEventInput.java | 2 +- .../forms/dto/UpdateWidgetFocusInput.java | 2 +- .../dto/UpdateWidgetFocusSuccessPayload.java | 2 +- .../forms/dto/WidgetSubscription.java | 2 +- ...idgetSubscriptionsUpdatedEventPayload.java | 2 +- .../handlers/ClickListItemEventHandler.java | 2 +- .../handlers/DeleteListItemEventHandler.java | 2 +- .../handlers/EditCheckboxEventHandler.java | 2 +- .../handlers/EditMultiSelectEventHandler.java | 2 +- .../forms/handlers/EditRadioEventHandler.java | 2 +- .../handlers/EditRichTextEventHandler.java | 2 +- .../handlers/EditSelectEventHandler.java | 2 +- .../handlers/EditTextfieldEventHandler.java | 2 +- .../handlers/PushButtonEventHandler.java | 2 +- .../CollaborativeFormMessageService.java | 4 +- .../ICollaborativeFormMessageService.java | 4 +- .../forms/services/FormDeserializer.java | 4 +- .../forms/FormDescriptionAggregatorTests.java | 14 +- .../forms/FormEventProcessorTests.java | 6 +- .../architecture/ArchitectureConstants.java | 4 +- .../CompletionProposalEventHandlerTests.java | 22 +- .../handlers/CreateFormEventHandlerTests.java | 14 +- .../EditCheckboxEventHandlerTests.java | 16 +- .../EditMultiSelectEventHandlerTests.java | 26 +- .../handlers/EditRadioEventHandlerTests.java | 22 +- .../handlers/EditSelectEventHandlerTests.java | 28 +- .../EditTextfieldEventHandlerTests.java | 20 +- .../handlers/ListItemEventHandlersTests.java | 54 +- .../handlers/PushButtonEventHandlerTests.java | 16 +- .../handlers/RenameFormEventHandlerTests.java | 4 +- .../form/ButtonImageURLDataFetcher.java | 2 +- ...riptionCompletionProposalsDataFetcher.java | 8 +- .../form/ImageURLDataFetcher.java | 2 +- .../ToolbarActionImageURLDataFetcher.java | 2 +- .../form/WidgetIconURLDataFetcher.java | 24 +- .../MutationClickListItemDataFetcher.java | 2 +- .../MutationEditCheckboxDataFetcher.java | 2 +- .../MutationEditMultiSelectDataFetcher.java | 2 +- .../MutationEditRadioDataFetcher.java | 2 +- .../MutationEditRichTextDataFetcher.java | 2 +- .../MutationEditSelectDataFetcher.java | 2 +- .../MutationEditTextfieldDataFetcher.java | 2 +- .../MutationPushButtonDataFetcher.java | 2 +- .../SubscriptionFormEventDataFetcher.java | 2 +- ...ubscriptionPropertiesEventDataFetcher.java | 2 +- ...iptionRelatedElementsEventDataFetcher.java | 2 +- ...iptionRepresentationsEventDataFetcher.java | 2 +- .../architecture/ArchitectureConstants.java | 2 +- .../components/forms/tests/FormAssert.java | 8 +- .../components/forms/tests/WidgetAssert.java | 2 +- .../forms/tests/WidgetDeserializer.java | 2 +- .../sirius/components/forms/Button.java | 2 +- .../sirius/components/forms/ButtonStyle.java | 2 +- .../sirius/components/forms/ChartWidget.java | 2 +- .../sirius/components/forms/Checkbox.java | 2 +- .../components/forms/CheckboxStyle.java | 2 +- .../components/forms/CompletionProposal.java | 2 +- .../components/forms/CompletionRequest.java | 6 +- .../components/forms/FlexDirection.java | 2 +- .../components/forms/FlexboxContainer.java | 2 +- .../eclipse/sirius/components/forms/Form.java | 4 +- .../sirius/components/forms/Group.java | 2 +- .../sirius/components/forms/Image.java | 2 +- .../sirius/components/forms/LabelWidget.java | 2 +- .../components/forms/LabelWidgetStyle.java | 2 +- .../eclipse/sirius/components/forms/Link.java | 2 +- .../sirius/components/forms/LinkStyle.java | 2 +- .../eclipse/sirius/components/forms/List.java | 2 +- .../sirius/components/forms/ListItem.java | 2 +- .../sirius/components/forms/ListStyle.java | 2 +- .../sirius/components/forms/MultiSelect.java | 2 +- .../components/forms/MultiSelectStyle.java | 2 +- .../eclipse/sirius/components/forms/Page.java | 2 +- .../sirius/components/forms/Radio.java | 2 +- .../sirius/components/forms/RadioOption.java | 2 +- .../sirius/components/forms/RadioStyle.java | 2 +- .../sirius/components/forms/RichText.java | 2 +- .../sirius/components/forms/Select.java | 2 +- .../sirius/components/forms/SelectOption.java | 2 +- .../sirius/components/forms/SelectStyle.java | 2 +- .../sirius/components/forms/Textarea.java | 2 +- .../components/forms/TextareaStyle.java | 2 +- .../sirius/components/forms/Textfield.java | 2 +- .../components/forms/TextfieldStyle.java | 2 +- .../components/forms/ToolbarAction.java | 2 +- .../sirius/components/forms/TreeNode.java | 2 +- .../sirius/components/forms/TreeWidget.java | 2 +- .../forms/components/GroupComponent.java | 2 +- .../forms/components/ListComponent.java | 4 +- .../components/MultiSelectComponent.java | 2 +- .../forms/components/RadioComponent.java | 2 +- .../forms/components/SelectComponent.java | 2 +- .../forms/components/TreeComponent.java | 6 +- .../forms/components/WidgetComponent.java | 2 +- .../forms/description/ButtonDescription.java | 2 +- .../description/ChartWidgetDescription.java | 2 +- .../description/CheckboxDescription.java | 2 +- .../FlexboxContainerDescription.java | 2 +- .../forms/description/ForDescription.java | 4 +- .../forms/description/FormDescription.java | 2 +- .../forms/description/GroupDescription.java | 2 +- .../forms/description/IfDescription.java | 4 +- .../forms/description/ImageDescription.java | 2 +- .../forms/description/LabelDescription.java | 2 +- .../forms/description/LinkDescription.java | 2 +- .../forms/description/ListDescription.java | 2 +- .../description/MultiSelectDescription.java | 2 +- .../forms/description/PageDescription.java | 4 +- .../forms/description/RadioDescription.java | 2 +- .../description/RichTextDescription.java | 2 +- .../forms/description/SelectDescription.java | 2 +- .../description/TextareaDescription.java | 2 +- .../description/TextfieldDescription.java | 2 +- .../forms/description/TreeDescription.java | 2 +- .../forms/elements/ButtonElementProps.java | 4 +- .../elements/ChartWidgetElementProps.java | 4 +- .../forms/elements/CheckboxElementProps.java | 4 +- .../FlexboxContainerElementProps.java | 4 +- .../forms/elements/FormElementProps.java | 4 +- .../forms/elements/GroupElementProps.java | 4 +- .../forms/elements/ImageElementProps.java | 4 +- .../elements/LabelWidgetElementProps.java | 4 +- .../forms/elements/LinkElementProps.java | 4 +- .../forms/elements/ListElementProps.java | 4 +- .../elements/MultiSelectElementProps.java | 4 +- .../forms/elements/PageElementProps.java | 6 +- .../forms/elements/RadioElementProps.java | 4 +- .../forms/elements/RichTextElementProps.java | 4 +- .../forms/elements/SelectElementProps.java | 4 +- .../forms/elements/TextareaElementProps.java | 4 +- .../forms/elements/TextfieldElementProps.java | 4 +- .../elements/ToolbarActionElementProps.java | 4 +- .../forms/elements/TreeElementProps.java | 4 +- .../forms/renderer/FormElementFactory.java | 2 +- .../validation/DiagnosticElementProps.java | 6 +- .../architecture/ArchitectureConstants.java | 4 +- .../forms/render/RenderTextfieldTest.java | 54 +- .../selection/SelectionEventProcessor.java | 12 +- .../selection/dto/SelectionEventInput.java | 2 +- .../dto/SelectionRefreshedEventPayload.java | 2 +- .../architecture/ArchitectureConstants.java | 4 +- ...SubscriptionSelectionEventDataFetcher.java | 2 +- .../architecture/ArchitectureConstants.java | 2 +- .../components/selection/Selection.java | 4 +- .../components/selection/SelectionObject.java | 2 +- .../description/SelectionDescription.java | 2 +- .../architecture/ArchitectureConstants.java | 2 +- .../graphql/schema/DiagramTypesProvider.java | 14 +- .../graphql/schema/DocumentTypesProvider.java | 4 +- .../schema/EditingContextTypeProvider.java | 36 +- .../web/graphql/schema/FormTypesProvider.java | 16 +- .../web/graphql/schema/GraphQLConstants.java | 4 +- .../web/graphql/schema/IdFieldProvider.java | 2 +- .../graphql/schema/ImageURLFieldProvider.java | 2 +- .../web/graphql/schema/KindFieldProvider.java | 2 +- .../graphql/schema/LabelFieldProvider.java | 2 +- .../graphql/schema/MutationTypeProvider.java | 4 +- .../graphql/schema/ObjectTypeProvider.java | 14 +- .../graphql/schema/PageInfoTypeProvider.java | 10 +- .../schema/PaginationArgumentsProvider.java | 8 +- .../PaginationConnectionTypeProvider.java | 4 +- .../schema/PaginationEdgeTypeProvider.java | 2 +- .../graphql/schema/ProfileTypeProvider.java | 2 +- .../graphql/schema/ProjectTypeProvider.java | 10 +- .../web/graphql/schema/QueryTypeProvider.java | 4 +- ...RepresentationDescriptionTypeProvider.java | 2 +- .../schema/RepresentationTypeProvider.java | 2 +- .../schema/SelectionTypesProvider.java | 4 +- .../StereotypeDescriptionTypeProvider.java | 4 +- .../schema/SubscriptionTypeProvider.java | 4 +- .../web/graphql/schema/ToolTypeProvider.java | 2 +- .../web/graphql/schema/TreeTypeProvider.java | 6 +- .../schema/ValidationTypesProvider.java | 4 +- .../graphql/schema/ViewerTypeProvider.java | 18 +- .../architecture/ArchitectureConstants.java | 2 +- .../configuration/GraphQLConfiguration.java | 6 +- .../GraphQLMessageServiceConfiguration.java | 2 +- ...ContextCompletionProposalsDataFetcher.java | 2 +- ...RepresentationDescriptionsDataFetcher.java | 2 +- .../MutationCreateChildDataFetcher.java | 2 +- .../MutationCreateDocumentDataFetcher.java | 2 +- .../MutationCreateProjectDataFetcher.java | 2 +- ...tationCreateRepresentationDataFetcher.java | 2 +- .../MutationCreateRootObjectDataFetcher.java | 2 +- .../MutationDeleteDocumentDataFetcher.java | 2 +- .../MutationDeleteImageDataFetcher.java | 2 +- .../MutationDeleteListItemDataFetcher.java | 2 +- .../MutationDeleteObjectDataFetcher.java | 2 +- .../MutationDeleteProjectDataFetcher.java | 2 +- ...tationDeleteRepresentationDataFetcher.java | 2 +- ...nInvokeDeleteToolOnDiagramDataFetcher.java | 2 +- ...InvokeEditingContextActionDataFetcher.java | 2 +- .../MutationRenameDocumentDataFetcher.java | 2 +- .../MutationRenameImageDataFetcher.java | 2 +- .../MutationRenameObjectDataFetcher.java | 2 +- .../MutationRenameProjectDataFetcher.java | 2 +- ...tationRenameRepresentationDataFetcher.java | 2 +- .../MutationUpdateWidgetFocusDataFetcher.java | 2 +- .../MutationUploadDocumentDataFetcher.java | 8 +- .../MutationUploadImageDataFetcher.java | 8 +- .../MutationUploadProjectDataFetcher.java | 6 +- .../RepresentationMetadataDataFetcher.java | 18 +- ...riptionEditingContextEventDataFetcher.java | 2 +- .../user/UserEditingContextDataFetcher.java | 2 +- .../messages/GraphQLMessageService.java | 2 +- .../architecture/ArchitectureConstants.java | 2 +- .../persistence/entities/AccountEntity.java | 2 +- .../entities/CustomImageEntity.java | 4 +- .../entities/CustomImageMetadataEntity.java | 4 +- .../persistence/entities/DocumentEntity.java | 2 +- .../persistence/entities/IdMappingEntity.java | 2 +- .../persistence/entities/ProjectEntity.java | 2 +- .../entities/RepresentationEntity.java | 2 +- .../architecture/ArchitectureConstants.java | 2 +- .../architecture/RepositoryTests.java | 6 +- .../AccountRepositoryIntegrationTests.java | 16 +- .../DocumentRepositoryIntegrationTests.java | 32 +- .../ProjectRepositoryIntegrationTests.java | 16 +- ...resentationRepositoryIntegrationTests.java | 50 +- .../repositories/TestPostgreSQLContainer.java | 4 +- .../configuration/CustomImagesLoader.java | 6 +- .../SampleSiriusConfiguration.java | 4 +- .../configuration/SpringWebMvcConfigurer.java | 8 +- .../SpringWebSecurityConfiguration.java | 6 +- .../configuration/StereotypeBuilder.java | 6 +- ...ereotypeDescriptionRegistryConfigurer.java | 510 +++++++++--------- .../SiriusWebAuthenticationFilter.java | 4 +- .../web/sample/services/ImagePathService.java | 2 +- .../web/sample/services/ViewerProvider.java | 2 +- .../ViewDetailsRenderingIntegrationTests.java | 22 +- .../web/services/api/accounts/Profile.java | 2 +- .../web/services/api/document/Document.java | 2 +- .../api/document/IDocumentService.java | 4 +- .../api/document/RewriteProxiesInput.java | 2 +- .../RewriteProxiesSuccessPayload.java | 2 +- .../api/document/UploadDocumentInput.java | 2 +- .../UploadDocumentSuccessPayload.java | 2 +- .../api/images/CustomImageMetadata.java | 2 +- .../services/api/images/DeleteImageInput.java | 2 +- .../api/images/DeleteImageSuccessPayload.java | 2 +- .../services/api/images/RenameImageInput.java | 2 +- .../api/images/RenameImageSuccessPayload.java | 2 +- .../api/images/UploadImageSuccessPayload.java | 2 +- .../api/projects/CreateProjectInput.java | 2 +- .../projects/CreateProjectSuccessPayload.java | 2 +- .../api/projects/DeleteProjectInput.java | 2 +- .../projects/DeleteProjectSuccessPayload.java | 2 +- .../web/services/api/projects/Project.java | 2 +- .../api/projects/RenameProjectInput.java | 2 +- .../projects/RenameProjectSuccessPayload.java | 2 +- .../api/projects/UploadProjectInput.java | 2 +- .../projects/UploadProjectSuccessPayload.java | 2 +- .../sirius/web/services/api/viewer/User.java | 2 +- .../architecture/ArchitectureConstants.java | 2 +- .../compatibility/IdentifierProvider.java | 2 +- .../ServicesMessageServiceConfiguration.java | 2 +- .../documents/RewriteProxiesEventHandler.java | 2 +- .../documents/UploadDocumentEventHandler.java | 6 +- .../EditingContextEPackageService.java | 4 +- .../EditingContextPersistenceService.java | 2 +- .../EditingContextSearchService.java | 8 +- .../DeleteDocumentTreeItemEventHandler.java | 2 +- .../DeleteObjectTreeItemEventHandler.java | 4 +- .../explorer/ExplorerDescriptionProvider.java | 14 +- .../RenameDocumentTreeItemHandler.java | 2 +- .../RenameObjectTreeItemEventHandler.java | 2 +- .../images/CustomImageEditService.java | 2 +- .../images/CustomImageImportService.java | 6 +- ...ojectCustomImageMetadataSearchService.java | 2 +- .../messages/ServicesMessageService.java | 12 +- .../projects/ProjectExportService.java | 14 +- .../services/projects/ProjectImporter.java | 4 +- .../web/services/projects/ProjectService.java | 2 +- .../services/projects/ProjectUnzipper.java | 8 +- .../relatedelements/CurrentTreeProvider.java | 24 +- ...ultRelatedElementsDescriptionProvider.java | 10 +- .../relatedelements/IncomingTreeProvider.java | 16 +- .../relatedelements/OutgoingTreeProvider.java | 12 +- .../RepresentationService.java | 2 +- .../RepresentationsDescriptionProvider.java | 28 +- .../ValidationDescriptionProvider.java | 16 +- .../architecture/ArchitectureConstants.java | 2 +- .../CreateDocumentEventHandlerTests.java | 68 +-- .../DeleteDocumentEventHandlerTests.java | 2 +- .../RenameDocumentEventHandlerTests.java | 6 +- .../UploadDocumentEventHandlerTests.java | 78 +-- ...EditingContextPersistenceServiceTests.java | 10 +- .../EditingContextSearchServiceTests.java | 60 +-- .../projects/NoOpServicesMessageService.java | 12 +- .../projects/ProjectServiceTests.java | 12 +- .../RenameProjectEventHandlerTests.java | 4 +- .../SpringWebMvcConfigurerConstants.java | 28 +- .../controllers/DocumentController.java | 2 +- .../spring/controllers/ImagesController.java | 18 +- .../spring/controllers/ProjectController.java | 6 +- .../controllers/RepresentationController.java | 2 +- .../web/spring/controllers/URLConstants.java | 18 +- .../architecture/ArchitectureConstants.java | 2 +- .../controllers/DocumentControllerTests.java | 4 +- .../controllers/ImagesControllerTests.java | 12 +- .../controllers/ProjectControllerTests.java | 10 +- .../SiriusWebStarterConfiguration.java | 4 +- .../services/EditingContextDispatcher.java | 4 +- .../AbstractConfigurationTests.java | 4 +- .../architecture/AbstractServicesTests.java | 6 +- .../AbstractCodingRulesTests.java | 70 +-- .../architecture/AbstractImmutableTests.java | 32 +- .../HaveAValidBuilderCondition.java | 14 +- .../components/tests/GeneralPurposeTests.java | 136 ++--- .../trees/TreeEventProcessor.java | 16 +- .../trees/api/TreeCreationParameters.java | 4 +- ...rativeTreeMessageServiceConfiguration.java | 4 +- .../trees/dto/DeleteTreeItemInput.java | 2 +- .../dto/DeleteTreeItemSuccessPayload.java | 2 +- .../trees/dto/RenameTreeItemInput.java | 2 +- .../dto/RenameTreeItemSuccessPayload.java | 2 +- .../trees/dto/TreeEventInput.java | 2 +- .../collaborative/trees/dto/TreePath.java | 2 +- .../trees/dto/TreePathInput.java | 2 +- .../trees/dto/TreePathSuccessPayload.java | 2 +- .../trees/dto/TreeRefreshedEventPayload.java | 2 +- .../CollaborativeTreeMessageService.java | 4 +- .../api/ICollaborativeTreeMessageService.java | 4 +- .../architecture/ArchitectureConstants.java | 4 +- .../EditingContextTreePathDataFetcher.java | 4 +- .../MutationDeleteTreeItemDataFetcher.java | 2 +- .../MutationRenameTreeItemDataFetcher.java | 2 +- .../SubscriptionTreeEventDataFetcher.java | 2 +- .../architecture/ArchitectureConstants.java | 2 +- .../eclipse/sirius/components/trees/Tree.java | 4 +- .../sirius/components/trees/TreeItem.java | 4 +- .../trees/description/TreeDescription.java | 2 +- .../trees/renderer/TreeRenderer.java | 4 +- .../architecture/ArchitectureConstants.java | 4 +- .../validation/ValidationEventProcessor.java | 14 +- .../api/ValidationConfiguration.java | 4 +- .../validation/dto/ValidationEventInput.java | 2 +- .../dto/ValidationRefreshedEventPayload.java | 2 +- .../architecture/ArchitectureConstants.java | 4 +- ...ubscriptionValidationEventDataFetcher.java | 2 +- .../architecture/ArchitectureConstants.java | 2 +- .../components/validation/Validation.java | 4 +- .../components/ValidationComponent.java | 4 +- .../description/ValidationDescription.java | 2 +- .../elements/DiagnosticElementProps.java | 6 +- .../elements/ValidationElementProps.java | 4 +- .../architecture/ArchitectureConstants.java | 4 +- .../BarChartDescriptionItemProvider.java | 28 +- .../BarChartDescriptionStyleItemProvider.java | 28 +- .../ButtonDescriptionItemProvider.java | 16 +- .../ButtonDescriptionStyleItemProvider.java | 32 +- .../provider/ChangeContextItemProvider.java | 12 +- .../CheckboxDescriptionItemProvider.java | 12 +- .../CheckboxDescriptionStyleItemProvider.java | 10 +- ...lBarChartDescriptionStyleItemProvider.java | 30 +- ...nalButtonDescriptionStyleItemProvider.java | 34 +- ...lCheckboxDescriptionStyleItemProvider.java | 10 +- .../ConditionalEdgeStyleItemProvider.java | 50 +- .../provider/ConditionalItemProvider.java | 12 +- ...onalLabelDescriptionStyleItemProvider.java | 30 +- ...ionalLinkDescriptionStyleItemProvider.java | 30 +- ...ionalListDescriptionStyleItemProvider.java | 30 +- ...ltiSelectDescriptionStyleItemProvider.java | 34 +- .../ConditionalNodeStyleItemProvider.java | 6 +- ...lPieChartDescriptionStyleItemProvider.java | 38 +- ...onalRadioDescriptionStyleItemProvider.java | 30 +- ...nalSelectDescriptionStyleItemProvider.java | 34 +- ...lTextareaDescriptionStyleItemProvider.java | 34 +- ...TextfieldDescriptionStyleItemProvider.java | 34 +- .../provider/CreateInstanceItemProvider.java | 20 +- .../view/provider/CreateViewItemProvider.java | 24 +- .../provider/DeleteElementItemProvider.java | 6 +- .../view/provider/DeleteToolItemProvider.java | 8 +- .../view/provider/DeleteViewItemProvider.java | 12 +- .../DiagramDescriptionItemProvider.java | 22 +- ...DiagramElementDescriptionItemProvider.java | 32 +- .../view/provider/DropToolItemProvider.java | 8 +- .../provider/EdgeDescriptionItemProvider.java | 52 +- .../EdgeReconnectionToolItemProvider.java | 4 +- .../view/provider/EdgeStyleItemProvider.java | 46 +- .../view/provider/EdgeToolItemProvider.java | 8 +- ...exboxContainerDescriptionItemProvider.java | 12 +- .../provider/FormDescriptionItemProvider.java | 6 +- ...LayoutStrategyDescriptionItemProvider.java | 4 +- .../GroupDescriptionItemProvider.java | 26 +- ...LabelNodeStyleDescriptionItemProvider.java | 54 +- .../ImageDescriptionItemProvider.java | 14 +- ...ImageNodeStyleDescriptionItemProvider.java | 58 +- .../LabelDescriptionItemProvider.java | 12 +- .../LabelDescriptionStyleItemProvider.java | 28 +- .../provider/LabelEditToolItemProvider.java | 10 +- .../view/provider/LabelStyleItemProvider.java | 26 +- .../provider/LinkDescriptionItemProvider.java | 12 +- .../LinkDescriptionStyleItemProvider.java | 28 +- .../provider/ListDescriptionItemProvider.java | 20 +- .../ListDescriptionStyleItemProvider.java | 28 +- ...LayoutStrategyDescriptionItemProvider.java | 4 +- .../MultiSelectDescriptionItemProvider.java | 20 +- ...ltiSelectDescriptionStyleItemProvider.java | 32 +- .../provider/NodeDescriptionItemProvider.java | 40 +- .../view/provider/NodeToolItemProvider.java | 8 +- .../view/provider/OperationItemProvider.java | 4 +- .../PieChartDescriptionItemProvider.java | 16 +- .../PieChartDescriptionStyleItemProvider.java | 36 +- .../RadioDescriptionItemProvider.java | 20 +- .../RadioDescriptionStyleItemProvider.java | 28 +- ...gularNodeStyleDescriptionItemProvider.java | 58 +- ...RepresentationDescriptionItemProvider.java | 22 +- .../RichTextDescriptionItemProvider.java | 10 +- .../SelectDescriptionItemProvider.java | 20 +- .../SelectDescriptionStyleItemProvider.java | 32 +- .../view/provider/SetValueItemProvider.java | 16 +- ...ceEdgeEndReconnectionToolItemProvider.java | 6 +- .../view/provider/StyleItemProvider.java | 12 +- ...etEdgeEndReconnectionToolItemProvider.java | 6 +- .../TextAreaDescriptionItemProvider.java | 12 +- .../TextareaDescriptionStyleItemProvider.java | 32 +- .../TextfieldDescriptionItemProvider.java | 12 +- ...TextfieldDescriptionStyleItemProvider.java | 32 +- .../view/provider/ToolItemProvider.java | 10 +- .../view/provider/UnsetValueItemProvider.java | 16 +- .../view/provider/ViewEditPlugin.java | 26 +- .../view/provider/ViewItemProvider.java | 8 +- .../WidgetDescriptionItemProvider.java | 12 +- .../WidgetDescriptionStyleItemProvider.java | 2 +- .../view/emf/AQLTextfieldCustomizer.java | 10 +- .../view/emf/CanonicalBehaviors.java | 6 +- .../view/emf/CustomImageMetadata.java | 4 +- ...tomizableEStringIfDescriptionProvider.java | 8 +- .../emf/DomainTypeTextfieldCustomizer.java | 8 +- .../emf/OperationInterpreterViewSwitch.java | 2 +- .../components/view/emf/ViewConverter.java | 2 +- ...opertiesDescriptionRegistryConfigurer.java | 18 +- .../diagram/DiagramDescriptionValidator.java | 22 +- .../diagram/DiagramOperationInterpreter.java | 2 +- .../emf/diagram/ImageNodeStyleProvider.java | 10 +- .../NodeStylePropertiesConfigurer.java | 100 ++-- .../view/emf/diagram/StylesFactory.java | 12 +- .../ViewDiagramDescriptionConverter.java | 46 +- .../ViewReconnectionToolsExecutor.java | 22 +- .../emf/diagram/ViewToolSectionsProvider.java | 30 +- ...InitialDirectEditElementLabelProvider.java | 8 +- .../form/ViewFormDescriptionConverter.java | 10 +- .../ViewFormDescriptionConverterSwitch.java | 90 ++-- .../architecture/ArchitectureConstants.java | 4 +- .../emf/validation/ViewValidatorTests.java | 26 +- .../view/emf/view/DynamicDiagramsTests.java | 38 +- .../view/emf/view/DynamicFormsTests.java | 452 ++++++++-------- .../sirius/components/view/ArrowStyle.java | 28 +- .../sirius/components/view/FlexDirection.java | 8 +- .../components/view/GroupDisplayMode.java | 4 +- .../components/view/LayoutDirection.java | 2 +- .../sirius/components/view/LineStyle.java | 10 +- .../view/SynchronizationPolicy.java | 6 +- .../sirius/components/view/ViewPackage.java | 6 +- .../view/impl/BarChartDescriptionImpl.java | 10 +- .../impl/BarChartDescriptionStyleImpl.java | 12 +- .../view/impl/ButtonDescriptionImpl.java | 4 +- .../view/impl/ButtonDescriptionStyleImpl.java | 14 +- .../view/impl/ChangeContextImpl.java | 6 +- .../view/impl/CheckboxDescriptionImpl.java | 2 +- .../impl/CheckboxDescriptionStyleImpl.java | 2 +- ...nditionalBarChartDescriptionStyleImpl.java | 12 +- ...ConditionalButtonDescriptionStyleImpl.java | 14 +- ...nditionalCheckboxDescriptionStyleImpl.java | 2 +- .../view/impl/ConditionalEdgeStyleImpl.java | 24 +- .../components/view/impl/ConditionalImpl.java | 6 +- .../ConditionalLabelDescriptionStyleImpl.java | 12 +- .../ConditionalLinkDescriptionStyleImpl.java | 12 +- .../ConditionalListDescriptionStyleImpl.java | 12 +- ...tionalMultiSelectDescriptionStyleImpl.java | 14 +- ...nditionalPieChartDescriptionStyleImpl.java | 16 +- .../ConditionalRadioDescriptionStyleImpl.java | 12 +- ...ConditionalSelectDescriptionStyleImpl.java | 14 +- ...nditionalTextareaDescriptionStyleImpl.java | 14 +- ...ditionalTextfieldDescriptionStyleImpl.java | 14 +- .../view/impl/CreateInstanceImpl.java | 10 +- .../components/view/impl/CreateViewImpl.java | 12 +- .../components/view/impl/DeleteViewImpl.java | 6 +- .../view/impl/DiagramDescriptionImpl.java | 4 +- .../impl/DiagramElementDescriptionImpl.java | 18 +- .../view/impl/EdgeDescriptionImpl.java | 18 +- .../components/view/impl/EdgeStyleImpl.java | 20 +- .../impl/FlexboxContainerDescriptionImpl.java | 2 +- .../view/impl/GroupDescriptionImpl.java | 10 +- .../IconLabelNodeStyleDescriptionImpl.java | 30 +- .../view/impl/ImageDescriptionImpl.java | 4 +- .../impl/ImageNodeStyleDescriptionImpl.java | 32 +- .../view/impl/LabelDescriptionImpl.java | 2 +- .../view/impl/LabelDescriptionStyleImpl.java | 12 +- .../view/impl/LabelEditToolImpl.java | 2 +- .../components/view/impl/LabelStyleImpl.java | 12 +- .../view/impl/LinkDescriptionImpl.java | 2 +- .../view/impl/LinkDescriptionStyleImpl.java | 12 +- .../view/impl/ListDescriptionImpl.java | 6 +- .../view/impl/ListDescriptionStyleImpl.java | 12 +- .../view/impl/MultiSelectDescriptionImpl.java | 6 +- .../impl/MultiSelectDescriptionStyleImpl.java | 14 +- .../view/impl/PieChartDescriptionImpl.java | 4 +- .../impl/PieChartDescriptionStyleImpl.java | 16 +- .../view/impl/RadioDescriptionImpl.java | 6 +- .../view/impl/RadioDescriptionStyleImpl.java | 12 +- .../RectangularNodeStyleDescriptionImpl.java | 32 +- .../impl/RepresentationDescriptionImpl.java | 18 +- .../view/impl/RichTextDescriptionImpl.java | 2 +- .../view/impl/SelectDescriptionImpl.java | 6 +- .../view/impl/SelectDescriptionStyleImpl.java | 14 +- .../components/view/impl/SetValueImpl.java | 6 +- .../components/view/impl/StyleImpl.java | 6 +- .../view/impl/TextAreaDescriptionImpl.java | 2 +- .../impl/TextareaDescriptionStyleImpl.java | 14 +- .../view/impl/TextfieldDescriptionImpl.java | 2 +- .../impl/TextfieldDescriptionStyleImpl.java | 14 +- .../sirius/components/view/impl/ToolImpl.java | 6 +- .../components/view/impl/UnsetValueImpl.java | 6 +- .../components/view/impl/ViewFactoryImpl.java | 18 +- .../components/view/impl/ViewPackageImpl.java | 508 ++++++++--------- .../view/impl/WidgetDescriptionImpl.java | 4 +- .../src/main/resources/model/view.genmodel | 7 +- .../controllers/GraphQLCacheClearer.java | 4 +- .../controllers/GraphQLController.java | 28 +- .../graphql/ws/GraphQLWebSocketHandler.java | 24 +- .../ws/dto/input/ConnectionInitMessage.java | 6 +- .../dto/input/ConnectionTerminateMessage.java | 6 +- .../graphql/ws/dto/input/StartMessage.java | 6 +- .../graphql/ws/dto/input/StopMessage.java | 6 +- .../ws/dto/output/CompleteMessage.java | 6 +- .../output/ConnectionAcknowledgeMessage.java | 6 +- .../ws/dto/output/ConnectionErrorMessage.java | 6 +- .../output/ConnectionKeepAliveMessage.java | 6 +- .../graphql/ws/dto/output/DataMessage.java | 8 +- .../graphql/ws/dto/output/ErrorMessage.java | 6 +- .../ws/handlers/IWebSocketMessageHandler.java | 4 +- .../ws/handlers/StartMessageHandler.java | 4 +- .../architecture/ArchitectureConstants.java | 4 +- .../controllers/GraphQLControllerTests.java | 28 +- .../graphql/ws/NoOpWebSocketSession.java | 4 +- .../graphql/ws/WebSocketHandlerTests.java | 38 +- .../ParametricSVGImageController.java | 4 +- .../web/controller/URLConstants.java | 4 +- .../components/web/images/ImageRegistry.java | 34 +- .../architecture/ArchitectureConstants.java | 4 +- 1057 files changed, 5388 insertions(+), 5394 deletions(-) diff --git a/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/barchart/BarChart.java b/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/barchart/BarChart.java index 180b250f74..62dcce8f45 100644 --- a/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/barchart/BarChart.java +++ b/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/barchart/BarChart.java @@ -28,7 +28,7 @@ */ @Immutable public final class BarChart implements IChart { - public static final String KIND = "BarChart"; //$NON-NLS-1$ + public static final String KIND = "BarChart"; private String id; @@ -92,7 +92,7 @@ public static Builder newBarChart(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, descriptionId: {2}, label: {3}, kind: {4}, width: {5}, height: {6}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, descriptionId: {2}, label: {3}, kind: {4}, width: {5}, height: {6}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.descriptionId, this.label, this.kind, this.width, this.height); } diff --git a/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/barchart/BarChartEntry.java b/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/barchart/BarChartEntry.java index 398773627e..01471c751e 100644 --- a/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/barchart/BarChartEntry.java +++ b/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/barchart/BarChartEntry.java @@ -41,7 +41,7 @@ public Number getValue() { @Override public String toString() { - String pattern = "{0} '{'key: {1}, value: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'key: {1}, value: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.key, this.value); } diff --git a/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/barchart/components/BarChartStyle.java b/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/barchart/components/BarChartStyle.java index d0105aba39..e0bdc70ce0 100644 --- a/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/barchart/components/BarChartStyle.java +++ b/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/barchart/components/BarChartStyle.java @@ -71,7 +71,7 @@ public static Builder newBarChartStyle() { @Override public String toString() { - String pattern = "{0} '{'barsColor: {1}, fontSize: {2}, italic: {3}, bold: {4}, underline: {5}, strikeThrough: {6}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'barsColor: {1}, fontSize: {2}, italic: {3}, bold: {4}, underline: {5}, strikeThrough: {6}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.barsColor, this.fontSize, this.italic, this.bold, this.underline, this.strikeThrough); } diff --git a/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/barchart/elements/BarChartElementProps.java b/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/barchart/elements/BarChartElementProps.java index 434cc4b264..716dcbf413 100644 --- a/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/barchart/elements/BarChartElementProps.java +++ b/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/barchart/elements/BarChartElementProps.java @@ -27,7 +27,7 @@ @Immutable public final class BarChartElementProps implements IProps { - public static final String TYPE = "BarChart"; //$NON-NLS-1$ + public static final String TYPE = "BarChart"; private String id; diff --git a/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/hierarchy/Hierarchy.java b/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/hierarchy/Hierarchy.java index c3aa6f36d2..7d85eccc81 100644 --- a/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/hierarchy/Hierarchy.java +++ b/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/hierarchy/Hierarchy.java @@ -82,7 +82,7 @@ public List getChildren() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, targetObjectId: {2}, descriptionId: {3}, label: {4}, kind: {5}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, targetObjectId: {2}, descriptionId: {3}, label: {4}, kind: {5}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.targetObjectId, this.descriptionId, this.label, this.kind); } diff --git a/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/hierarchy/HierarchyNode.java b/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/hierarchy/HierarchyNode.java index de4b06095b..e700bcbd06 100644 --- a/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/hierarchy/HierarchyNode.java +++ b/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/hierarchy/HierarchyNode.java @@ -59,7 +59,7 @@ public List getChildren() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, targetObjectId: {2}, label: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, targetObjectId: {2}, label: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.targetObjectId, this.label); } } diff --git a/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/hierarchy/components/HierarchyComponent.java b/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/hierarchy/components/HierarchyComponent.java index 9b8a2fdb21..1121de48bd 100644 --- a/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/hierarchy/components/HierarchyComponent.java +++ b/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/hierarchy/components/HierarchyComponent.java @@ -46,7 +46,7 @@ public Element render() { String id = optionalPreviousHierarchy.map(Hierarchy::getId).orElseGet(() -> UUID.randomUUID().toString()); String targetObjectId = hierarchyDescription.getTargetObjectIdProvider().apply(variableManager); - String label = variableManager.get(HierarchyDescription.LABEL, String.class).orElse(""); //$NON-NLS-1$ + String label = variableManager.get(HierarchyDescription.LABEL, String.class).orElse(""); String kind = hierarchyDescription.getKind(); List previousNodes = optionalPreviousHierarchy.map(Hierarchy::getChildren).orElse(List.of()); diff --git a/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/hierarchy/descriptions/HierarchyDescription.java b/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/hierarchy/descriptions/HierarchyDescription.java index e8ac102136..bbe1082110 100644 --- a/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/hierarchy/descriptions/HierarchyDescription.java +++ b/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/hierarchy/descriptions/HierarchyDescription.java @@ -26,7 +26,7 @@ * @author sbegaudeau */ public class HierarchyDescription implements IRepresentationDescription { - public static final String LABEL = "label"; //$NON-NLS-1$ + public static final String LABEL = "label"; private String id; diff --git a/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/hierarchy/elements/HierarchyElementProps.java b/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/hierarchy/elements/HierarchyElementProps.java index 4c24c7d2f4..77aa4d7147 100644 --- a/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/hierarchy/elements/HierarchyElementProps.java +++ b/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/hierarchy/elements/HierarchyElementProps.java @@ -25,7 +25,7 @@ */ public class HierarchyElementProps implements IProps { - public static final String TYPE = "Hierarchy"; //$NON-NLS-1$ + public static final String TYPE = "Hierarchy"; private final String id; diff --git a/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/hierarchy/elements/HierarchyNodeElementProps.java b/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/hierarchy/elements/HierarchyNodeElementProps.java index 0450d564c3..f9205e68f6 100644 --- a/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/hierarchy/elements/HierarchyNodeElementProps.java +++ b/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/hierarchy/elements/HierarchyNodeElementProps.java @@ -25,7 +25,7 @@ */ public class HierarchyNodeElementProps implements IProps { - public static final String TYPE = "HierarchyNode"; //$NON-NLS-1$ + public static final String TYPE = "HierarchyNode"; private final String id; diff --git a/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/piechart/PieChart.java b/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/piechart/PieChart.java index adf3cbbea2..0df1d6c68d 100644 --- a/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/piechart/PieChart.java +++ b/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/piechart/PieChart.java @@ -28,7 +28,7 @@ */ @Immutable public final class PieChart implements IChart { - public static final String KIND = "PieChart"; //$NON-NLS-1$ + public static final String KIND = "PieChart"; private String id; @@ -80,7 +80,7 @@ public static Builder newPieChart(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, descriptionId: {2}, label: {3}, kind: {4}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, descriptionId: {2}, label: {3}, kind: {4}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.descriptionId, this.label, this.kind); } diff --git a/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/piechart/PieChartEntry.java b/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/piechart/PieChartEntry.java index 30c14c31f6..08ee432866 100644 --- a/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/piechart/PieChartEntry.java +++ b/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/piechart/PieChartEntry.java @@ -41,7 +41,7 @@ public Number getValue() { @Override public String toString() { - String pattern = "{0} '{'key: {1}, value: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'key: {1}, value: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.key, this.value); } diff --git a/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/piechart/components/PieChartComponent.java b/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/piechart/components/PieChartComponent.java index e189d8e658..8797397505 100644 --- a/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/piechart/components/PieChartComponent.java +++ b/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/piechart/components/PieChartComponent.java @@ -45,7 +45,7 @@ public Element render() { Optional optionalPreviousPieChart = this.props.getPreviousPieChart(); String id = optionalPreviousPieChart.map(PieChart::getId).orElseGet(() -> UUID.randomUUID().toString()); - String label = Optional.ofNullable(pieChartDescription.getLabel()).orElse(""); //$NON-NLS-1$ + String label = Optional.ofNullable(pieChartDescription.getLabel()).orElse(""); List values = pieChartDescription.getValuesProvider().apply(variableManager); List keys = pieChartDescription.getKeysProvider().apply(variableManager); PieChartStyle pieChartStyle = pieChartDescription.getStyleProvider().apply(variableManager); diff --git a/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/piechart/components/PieChartStyle.java b/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/piechart/components/PieChartStyle.java index 3691a05785..dee4b973de 100644 --- a/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/piechart/components/PieChartStyle.java +++ b/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/piechart/components/PieChartStyle.java @@ -85,7 +85,7 @@ public static Builder newPieChartStyle() { @Override public String toString() { - String pattern = "{0} '{'colors: {1}, strokeWidth: {2}, strokeColor: {3}, fontSize: {4}, italic: {5}, bold: {6}, underline: {7}, strikeThrough: {8}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'colors: {1}, strokeWidth: {2}, strokeColor: {3}, fontSize: {4}, italic: {5}, bold: {6}, underline: {7}, strikeThrough: {8}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.colors, this.strokeWidth, this.strokeColor, this.fontSize, this.italic, this.bold, this.underline, this.strikeThrough); } diff --git a/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/piechart/elements/PieChartElementProps.java b/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/piechart/elements/PieChartElementProps.java index ea3e729b78..8978766aeb 100644 --- a/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/piechart/elements/PieChartElementProps.java +++ b/packages/charts/backend/sirius-components-charts/src/main/java/org/eclipse/sirius/components/charts/piechart/elements/PieChartElementProps.java @@ -27,7 +27,7 @@ @Immutable public final class PieChartElementProps implements IProps { - public static final String TYPE = "PieChart"; //$NON-NLS-1$ + public static final String TYPE = "PieChart"; private String id; diff --git a/packages/charts/backend/sirius-components-charts/src/test/java/org/eclipse/sirius/components/charts/ArchitectureConstants.java b/packages/charts/backend/sirius-components-charts/src/test/java/org/eclipse/sirius/components/charts/ArchitectureConstants.java index f13f26efc7..67b98a0251 100644 --- a/packages/charts/backend/sirius-components-charts/src/test/java/org/eclipse/sirius/components/charts/ArchitectureConstants.java +++ b/packages/charts/backend/sirius-components-charts/src/test/java/org/eclipse/sirius/components/charts/ArchitectureConstants.java @@ -22,7 +22,7 @@ * @author sbegaudeau */ public final class ArchitectureConstants { - public static final String SIRIUS_COMPONENTS_CHARTS_ROOT_PACKAGE = "org.eclipse.sirius.components.charts.."; //$NON-NLS-1$ + public static final String SIRIUS_COMPONENTS_CHARTS_ROOT_PACKAGE = "org.eclipse.sirius.components.charts.."; // @formatter:off public static final JavaClasses CLASSES = new ClassFileImporter() diff --git a/packages/charts/backend/sirius-components-collaborative-charts/src/main/java/org/eclipse/sirius/components/collaborative/charts/HierarchyCreationService.java b/packages/charts/backend/sirius-components-collaborative-charts/src/main/java/org/eclipse/sirius/components/collaborative/charts/HierarchyCreationService.java index ee18fbfd82..eb3f093ead 100644 --- a/packages/charts/backend/sirius-components-collaborative-charts/src/main/java/org/eclipse/sirius/components/collaborative/charts/HierarchyCreationService.java +++ b/packages/charts/backend/sirius-components-collaborative-charts/src/main/java/org/eclipse/sirius/components/collaborative/charts/HierarchyCreationService.java @@ -56,7 +56,7 @@ public HierarchyCreationService(IRepresentationDescriptionSearchService represen this.objectService = Objects.requireNonNull(objectService); // @formatter:off this.timer = Timer.builder(Monitoring.REPRESENTATION_EVENT_PROCESSOR_REFRESH) - .tag(Monitoring.NAME, "hierarchy") //$NON-NLS-1$ + .tag(Monitoring.NAME, "hierarchy") .register(meterRegistry); // @formatter:on } diff --git a/packages/charts/backend/sirius-components-collaborative-charts/src/main/java/org/eclipse/sirius/components/collaborative/charts/HierarchyDeserializer.java b/packages/charts/backend/sirius-components-collaborative-charts/src/main/java/org/eclipse/sirius/components/collaborative/charts/HierarchyDeserializer.java index 1ff1405248..3763d311ee 100644 --- a/packages/charts/backend/sirius-components-collaborative-charts/src/main/java/org/eclipse/sirius/components/collaborative/charts/HierarchyDeserializer.java +++ b/packages/charts/backend/sirius-components-collaborative-charts/src/main/java/org/eclipse/sirius/components/collaborative/charts/HierarchyDeserializer.java @@ -48,7 +48,7 @@ public HierarchyDeserializer(IKindParser kindParser) { @Override public boolean canHandle(ObjectNode root) { // @formatter:off - return Optional.ofNullable(root.get("kind")) //$NON-NLS-1$ + return Optional.ofNullable(root.get("kind")) .map(JsonNode::asText) .filter(this::isHierarchyRepresentation) .isPresent(); @@ -56,8 +56,8 @@ public boolean canHandle(ObjectNode root) { } private boolean isHierarchyRepresentation(String kind) { - String type = this.kindParser.getParameterValues(kind).get("type").get(0); //$NON-NLS-1$ - return type.equals("ForceDirectedTree") || type.equals("TreeMap") || type.equals("ZoomableCirclePacking"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + String type = this.kindParser.getParameterValues(kind).get("type").get(0); + return type.equals("ForceDirectedTree") || type.equals("TreeMap") || type.equals("ZoomableCirclePacking"); } @Override diff --git a/packages/charts/backend/sirius-components-collaborative-charts/src/main/java/org/eclipse/sirius/components/collaborative/charts/HierarchyEventFlux.java b/packages/charts/backend/sirius-components-collaborative-charts/src/main/java/org/eclipse/sirius/components/collaborative/charts/HierarchyEventFlux.java index 0ec4e3f78f..bbbd460f58 100644 --- a/packages/charts/backend/sirius-components-collaborative-charts/src/main/java/org/eclipse/sirius/components/collaborative/charts/HierarchyEventFlux.java +++ b/packages/charts/backend/sirius-components-collaborative-charts/src/main/java/org/eclipse/sirius/components/collaborative/charts/HierarchyEventFlux.java @@ -49,7 +49,7 @@ public void hierarchyRefreshed(IInput input, Hierarchy newHierarchy) { if (this.sink.currentSubscriberCount() > 0) { EmitResult emitResult = this.sink.tryEmitNext(new HierarchyRefreshedEventPayload(input.getId(), this.currentHierarchy)); if (emitResult.isFailure()) { - String pattern = "An error has occurred while emitting a HierarchyRefreshedEventPayload: {}"; //$NON-NLS-1$ + String pattern = "An error has occurred while emitting a HierarchyRefreshedEventPayload: {}"; this.logger.warn(pattern, emitResult); } } @@ -63,7 +63,7 @@ public Flux getFlux(IInput input) { public void dispose() { EmitResult emitResult = this.sink.tryEmitComplete(); if (emitResult.isFailure()) { - String pattern = "An error has occurred while marking the publisher as complete: {}"; //$NON-NLS-1$ + String pattern = "An error has occurred while marking the publisher as complete: {}"; this.logger.warn(pattern, emitResult); } } diff --git a/packages/charts/backend/sirius-components-collaborative-charts/src/main/java/org/eclipse/sirius/components/collaborative/charts/HierarchyEventInput.java b/packages/charts/backend/sirius-components-collaborative-charts/src/main/java/org/eclipse/sirius/components/collaborative/charts/HierarchyEventInput.java index ad3b868e6d..fb2f3692d7 100644 --- a/packages/charts/backend/sirius-components-collaborative-charts/src/main/java/org/eclipse/sirius/components/collaborative/charts/HierarchyEventInput.java +++ b/packages/charts/backend/sirius-components-collaborative-charts/src/main/java/org/eclipse/sirius/components/collaborative/charts/HierarchyEventInput.java @@ -55,7 +55,7 @@ public UUID getHierarchyId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, projectId: {2}, hierarchyId: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, projectId: {2}, hierarchyId: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.editingContextId, this.hierarchyId); } } diff --git a/packages/charts/backend/sirius-components-collaborative-charts/src/main/java/org/eclipse/sirius/components/collaborative/charts/HierarchyEventProcessor.java b/packages/charts/backend/sirius-components-collaborative-charts/src/main/java/org/eclipse/sirius/components/collaborative/charts/HierarchyEventProcessor.java index 72c3fd8f63..3feba7cabe 100644 --- a/packages/charts/backend/sirius-components-collaborative-charts/src/main/java/org/eclipse/sirius/components/collaborative/charts/HierarchyEventProcessor.java +++ b/packages/charts/backend/sirius-components-collaborative-charts/src/main/java/org/eclipse/sirius/components/collaborative/charts/HierarchyEventProcessor.java @@ -51,7 +51,7 @@ public class HierarchyEventProcessor implements IHierarchyEventProcessor { private final HierarchyEventFlux hierarchyEventFlux; public HierarchyEventProcessor(IEditingContext editingContext, HierarchyContext hierarchyContext, ISubscriptionManager subscriptionManager, HierarchyCreationService hierarchyCreationService) { - this.logger.trace("Creating the hierarchy event processor {}", hierarchyContext.getHierarchy().getId()); //$NON-NLS-1$ + this.logger.trace("Creating the hierarchy event processor {}", hierarchyContext.getHierarchy().getId()); this.editingContext = Objects.requireNonNull(editingContext); this.hierarchyContext = Objects.requireNonNull(hierarchyContext); @@ -64,7 +64,7 @@ public HierarchyEventProcessor(IEditingContext editingContext, HierarchyContext hierarchyContext.update(hierarchy); this.hierarchyEventFlux = new HierarchyEventFlux(hierarchy); - this.logger.trace("Hierarchy refreshed: {})", hierarchy.getId()); //$NON-NLS-1$ + this.logger.trace("Hierarchy refreshed: {})", hierarchy.getId()); } @Override @@ -87,7 +87,7 @@ public void refresh(ChangeDescription changeDescription) { if (this.shouldRefresh(changeDescription)) { Hierarchy refreshedHierarchy = this.hierarchyCreationService.refresh(this.editingContext, this.hierarchyContext).orElse(null); - this.logger.trace("Hierarchy refreshed: {}", refreshedHierarchy.getId()); //$NON-NLS-1$ + this.logger.trace("Hierarchy refreshed: {}", refreshedHierarchy.getId()); this.hierarchyContext.update(refreshedHierarchy); this.hierarchyEventFlux.hierarchyRefreshed(changeDescription.getInput(), refreshedHierarchy); @@ -117,7 +117,7 @@ public Flux getOutputEvents(IInput input) { @Override public void dispose() { - this.logger.trace("Disposing the hierarchy event processor {}", this.hierarchyContext.getHierarchy().getId()); //$NON-NLS-1$ + this.logger.trace("Disposing the hierarchy event processor {}", this.hierarchyContext.getHierarchy().getId()); this.subscriptionManager.dispose(); this.hierarchyEventFlux.dispose(); diff --git a/packages/charts/backend/sirius-components-collaborative-charts/src/main/java/org/eclipse/sirius/components/collaborative/charts/HierarchyRefreshedEventPayload.java b/packages/charts/backend/sirius-components-collaborative-charts/src/main/java/org/eclipse/sirius/components/collaborative/charts/HierarchyRefreshedEventPayload.java index 63bcd8c9b4..dfcdfaf8f2 100644 --- a/packages/charts/backend/sirius-components-collaborative-charts/src/main/java/org/eclipse/sirius/components/collaborative/charts/HierarchyRefreshedEventPayload.java +++ b/packages/charts/backend/sirius-components-collaborative-charts/src/main/java/org/eclipse/sirius/components/collaborative/charts/HierarchyRefreshedEventPayload.java @@ -46,7 +46,7 @@ public Hierarchy getHierarchy() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, hierarchy: '{'id: {2}, label: {3}'}''}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, hierarchy: '{'id: {2}, label: {3}'}''}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.hierarchy.getId(), this.hierarchy.getLabel()); } } diff --git a/packages/charts/backend/sirius-components-collaborative-charts/src/main/java/org/eclipse/sirius/components/collaborative/charts/configuration/CollaborativeChartsMessageServiceConfiguration.java b/packages/charts/backend/sirius-components-collaborative-charts/src/main/java/org/eclipse/sirius/components/collaborative/charts/configuration/CollaborativeChartsMessageServiceConfiguration.java index eff484ee7b..014d303af4 100644 --- a/packages/charts/backend/sirius-components-collaborative-charts/src/main/java/org/eclipse/sirius/components/collaborative/charts/configuration/CollaborativeChartsMessageServiceConfiguration.java +++ b/packages/charts/backend/sirius-components-collaborative-charts/src/main/java/org/eclipse/sirius/components/collaborative/charts/configuration/CollaborativeChartsMessageServiceConfiguration.java @@ -24,7 +24,7 @@ */ @Configuration public class CollaborativeChartsMessageServiceConfiguration { - private static final String PATH = "messages/sirius-components-collaborative-charts"; //$NON-NLS-1$ + private static final String PATH = "messages/sirius-components-collaborative-charts"; @Bean public MessageSourceAccessor collaborativeChartsMessageSourceAccessor() { diff --git a/packages/charts/backend/sirius-components-collaborative-charts/src/main/java/org/eclipse/sirius/components/collaborative/charts/messages/MessageConstants.java b/packages/charts/backend/sirius-components-collaborative-charts/src/main/java/org/eclipse/sirius/components/collaborative/charts/messages/MessageConstants.java index 4de0873de6..ece29531c9 100644 --- a/packages/charts/backend/sirius-components-collaborative-charts/src/main/java/org/eclipse/sirius/components/collaborative/charts/messages/MessageConstants.java +++ b/packages/charts/backend/sirius-components-collaborative-charts/src/main/java/org/eclipse/sirius/components/collaborative/charts/messages/MessageConstants.java @@ -19,7 +19,7 @@ */ public final class MessageConstants { - public static final String INVALID_INPUT = "INVALID_INPUT"; //$NON-NLS-1$ + public static final String INVALID_INPUT = "INVALID_INPUT"; private MessageConstants() { // Prevent instantiation diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/AQLInterpreterFactory.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/AQLInterpreterFactory.java index 830b0b74fe..ce7f213055 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/AQLInterpreterFactory.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/AQLInterpreterFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -85,18 +85,18 @@ private List> getJavaServices(Viewpoint viewpoint) { // @formatter:on for (String qualifiedName : qualifiedNames) { - if (qualifiedName.contains("::")) { //$NON-NLS-1$ - this.logger.warn("Sirius Web does not support Acceleo-style :: references"); //$NON-NLS-1$ + if (qualifiedName.contains("::")) { + this.logger.warn("Sirius Web does not support Acceleo-style :: references"); continue; } try { Class aClass = Class.forName(qualifiedName); classes.add(aClass); } catch (ClassNotFoundException exception) { - this.logger.warn("Could not load class '{}'", qualifiedName); //$NON-NLS-1$ + this.logger.warn("Could not load class '{}'", qualifiedName); } catch (NoClassDefFoundError exception) { - this.logger.error("Could not load class '{}'; not all dependencies could be " //$NON-NLS-1$ - + "instantiated by the JVM: {}", qualifiedName, exception.getMessage()); //$NON-NLS-1$ + this.logger.error("Could not load class '{}'; not all dependencies could be " + + "instantiated by the JVM: {}", qualifiedName, exception.getMessage()); } } diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/DomainClassPredicate.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/DomainClassPredicate.java index 55bc380a47..8f4c0fc63c 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/DomainClassPredicate.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/DomainClassPredicate.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -32,7 +32,7 @@ public class DomainClassPredicate implements Predicate { /** * The pattern used to match the separator used by both Sirius and AQL. */ - private static final Pattern SEPARATOR = Pattern.compile("(::?|\\.)"); //$NON-NLS-1$ + private static final Pattern SEPARATOR = Pattern.compile("(::?|\\.)"); private String domainClass; @@ -54,7 +54,7 @@ public boolean test(EClass actualType) { className = this.domainClass; } - if (!("EObject".equals(className) && packageName == null) && !("EObject".equals(className) && "ecore".equals(packageName))) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + if (!("EObject".equals(className) && packageName == null) && !("EObject".equals(className) && "ecore".equals(packageName))) { boolean result = false; List eAllTypes = new ArrayList<>(); diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/SemanticCandidatesProvider.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/SemanticCandidatesProvider.java index bb948b438c..f141b6ad9d 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/SemanticCandidatesProvider.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/SemanticCandidatesProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -40,7 +40,7 @@ public class SemanticCandidatesProvider implements Function { - private static final String ICON_PATH = "iconPath"; //$NON-NLS-1$ + private static final String ICON_PATH = "iconPath"; - private static final String ICON = "icon"; //$NON-NLS-1$ + private static final String ICON = "icon"; - private static final Pattern SEPARATOR = Pattern.compile("(::?|\\.)"); //$NON-NLS-1$ + private static final Pattern SEPARATOR = Pattern.compile("(::?|\\.)"); private final IObjectService objectService; @@ -65,7 +65,7 @@ public String get() { // @formatter:off return this.getImagePathFromIconPath() .or(this::getImagePathFromDomainClass) - .orElse(""); //$NON-NLS-1$ + .orElse(""); // @formatter:on } @@ -86,8 +86,8 @@ private Optional getImagePathFromIconPath() { private String normalize(String iconPath) { String path = iconPath; - if (!iconPath.startsWith("/")) { //$NON-NLS-1$ - path = "/" + iconPath; //$NON-NLS-1$ + if (!iconPath.startsWith("/")) { + path = "/" + iconPath; } int index = path.indexOf('/', 1); diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/ChildModelOperationHandler.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/ChildModelOperationHandler.java index 6607b3546e..2eac9b4a9b 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/ChildModelOperationHandler.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/ChildModelOperationHandler.java @@ -54,7 +54,7 @@ public IStatus handle(IObjectService objectService, IRepresentationMetadataSearc IStatus status = optionalModelOperationHandler.map(handler -> { return handler.handle(variables); - }).orElse(new Failure("")); //$NON-NLS-1$ + }).orElse(new Failure("")); hasBeenSuccessfullyExecuted = hasBeenSuccessfullyExecuted && status instanceof Success; @@ -84,6 +84,6 @@ public IStatus handle(IObjectService objectService, IRepresentationMetadataSearc if (hasBeenSuccessfullyExecuted) { return success; } - return new Failure(""); //$NON-NLS-1$ + return new Failure(""); } } diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/CreateInstanceOperationHandler.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/CreateInstanceOperationHandler.java index 9864d4c41c..f40f83faf7 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/CreateInstanceOperationHandler.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/CreateInstanceOperationHandler.java @@ -51,7 +51,7 @@ public class CreateInstanceOperationHandler implements IModelOperationHandler { /** * The pattern used to match the separator used by both Sirius and AQL. */ - private static final Pattern SEPARATOR = Pattern.compile("(::?|\\.)"); //$NON-NLS-1$ + private static final Pattern SEPARATOR = Pattern.compile("(::?|\\.)"); private final Logger logger = LoggerFactory.getLogger(CreateInstanceOperationHandler.class); @@ -118,11 +118,11 @@ public IStatus handle(Map variables) { EObject createdInstance = ecoreIntrinsicExtender.createInstance(className); if (createdInstance == null) { - this.logger.warn("The creation of an instance of Type {} failed.", typeName); //$NON-NLS-1$ + this.logger.warn("The creation of an instance of Type {} failed.", typeName); } else { Object addedObject = ecoreIntrinsicExtender.eAdd(ownerEObject, referenceName, createdInstance); if (addedObject == null) { - this.logger.warn("The feature {} does not exist on {}.", referenceName, typeName); //$NON-NLS-1$ + this.logger.warn("The feature {} does not exist on {}.", referenceName, typeName); } else if (variableName != null && !variableName.isBlank()) { childVariables.put(variableName, createdInstance); } diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/CreateViewOperationHandler.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/CreateViewOperationHandler.java index dd60e0e660..40e76133a1 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/CreateViewOperationHandler.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/CreateViewOperationHandler.java @@ -85,7 +85,7 @@ public IStatus handle(Map variables) { }); if (optionalParentElementId.isEmpty()) { - return new Failure(""); //$NON-NLS-1$ + return new Failure(""); } DiagramElementMapping diagramElementMapping = this.createView.getMapping(); diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/DeleteViewOperationHandler.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/DeleteViewOperationHandler.java index a6e2639ac1..9e7a520ded 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/DeleteViewOperationHandler.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/DeleteViewOperationHandler.java @@ -81,7 +81,7 @@ public IStatus handle(Map variables) { List subModelOperations = this.deleteView.getSubModelOperations(); return this.childModelOperationHandler.handle(this.objectService, this.representationMetadataSearchService, this.identifierProvider, this.interpreter, childVariables, subModelOperations); } - return new Failure(""); //$NON-NLS-1$ + return new Failure(""); } } diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/ExternalJavaActionOperationHandler.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/ExternalJavaActionOperationHandler.java index 74d51f466e..0faa93b175 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/ExternalJavaActionOperationHandler.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/ExternalJavaActionOperationHandler.java @@ -79,8 +79,8 @@ public IStatus handle(Map variables) { // @formatter:on if (optionalExternalJavaAction.isEmpty()) { - this.logger.warn("Unable to find external java action from id:{}", this.externalJavaAction.getId()); //$NON-NLS-1$ - return new Failure(""); //$NON-NLS-1$ + this.logger.warn("Unable to find external java action from id:{}", this.externalJavaAction.getId()); + return new Failure(""); } else { IExternalJavaAction javaAction = optionalExternalJavaAction.get(); diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/ModelOperationHandlerSwitch.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/ModelOperationHandlerSwitch.java index 2790e62b32..db92e1e108 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/ModelOperationHandlerSwitch.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/ModelOperationHandlerSwitch.java @@ -113,7 +113,7 @@ public Optional apply(ModelOperation modelOperation) { } if (optionalModelOperationHandler.isEmpty()) { - String pattern = "The model operation {} is not currently supported"; //$NON-NLS-1$ + String pattern = "The model operation {} is not currently supported"; this.logger.warn(pattern, modelOperation.getClass().getSimpleName()); } diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/MoveElementOperationHandler.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/MoveElementOperationHandler.java index c0a93839cf..833e4730a4 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/MoveElementOperationHandler.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/MoveElementOperationHandler.java @@ -99,12 +99,12 @@ private void doMoveElement(EObject newContainer, EObject valueObject, String fea EcoreIntrinsicExtender ecoreIntrinsicExtender = new EcoreIntrinsicExtender(); Boolean isMany = ecoreIntrinsicExtender.eIsMany(newContainer, featureName); if (isMany == null) { - this.logger.warn("The feature {} is unknown on the object {}", featureName, newContainer); //$NON-NLS-1$ + this.logger.warn("The feature {} is unknown on the object {}", featureName, newContainer); } else { if (!isMany) { Object currentValueOnContainer = ecoreIntrinsicExtender.eGet(newContainer, featureName); if (currentValueOnContainer == null) { - this.logger.warn("Impossible to add a value to the reference {} of the object {}", featureName, newContainer); //$NON-NLS-1$ + this.logger.warn("Impossible to add a value to the reference {} of the object {}", featureName, newContainer); return; } } else { diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/RemoveElementOperationHandler.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/RemoveElementOperationHandler.java index 06de613797..c225a1492f 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/RemoveElementOperationHandler.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/modeloperations/RemoveElementOperationHandler.java @@ -79,7 +79,7 @@ public IStatus handle(Map variables) { EObject container = ecoreIntrinsicExtender.eContainer(objectToRemove); Object removedElement = ecoreIntrinsicExtender.eRemove(container, containingFeatureName, objectToRemove); if (removedElement == null) { - this.logger.warn("The removal of the object {} from the instance {} on the feature {} failed.", objectToRemove, container, containingFeatureName); //$NON-NLS-1$ + this.logger.warn("The removal of the object {} from the instance {} on the feature {} failed.", objectToRemove, container, containingFeatureName); } } diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/EBooleanIfDescriptionProvider.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/EBooleanIfDescriptionProvider.java index 95809c0d07..1d712966da 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/EBooleanIfDescriptionProvider.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/EBooleanIfDescriptionProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -36,9 +36,9 @@ */ public class EBooleanIfDescriptionProvider { - private static final String IF_DESCRIPTION_ID = "EBoolean"; //$NON-NLS-1$ + private static final String IF_DESCRIPTION_ID = "EBoolean"; - private static final String CHECKBOX_DESCRIPTION_ID = "Checkbox"; //$NON-NLS-1$ + private static final String CHECKBOX_DESCRIPTION_ID = "Checkbox"; private final ComposedAdapterFactory composedAdapterFactory; @@ -109,7 +109,7 @@ private BiFunction getNewValueHandler() { eObject.eSet(eAttribute, newValue); return new Success(); } - return new Failure(""); //$NON-NLS-1$ + return new Failure(""); }; } diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/EEnumIfDescriptionProvider.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/EEnumIfDescriptionProvider.java index 554939de4c..feeeb55d13 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/EEnumIfDescriptionProvider.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/EEnumIfDescriptionProvider.java @@ -48,9 +48,9 @@ */ public class EEnumIfDescriptionProvider { - private static final String IF_DESCRIPTION_ID = "EEnum"; //$NON-NLS-1$ + private static final String IF_DESCRIPTION_ID = "EEnum"; - private static final String RADIO_DESCRIPTION_ID = "Radio"; //$NON-NLS-1$ + private static final String RADIO_DESCRIPTION_ID = "Radio"; private final Logger logger = LoggerFactory.getLogger(EEnumIfDescriptionProvider.class); @@ -127,7 +127,7 @@ private Function getOptionIdProvider() { if (litteral instanceof Enumerator) { return Integer.valueOf(((Enumerator) litteral).getValue()).toString(); } - return ""; //$NON-NLS-1$ + return ""; }; } @@ -137,7 +137,7 @@ private Function getOptionLabelProvider() { if (litteral instanceof Enumerator) { return ((Enumerator) litteral).getLiteral(); } - return ""; //$NON-NLS-1$ + return ""; }; } @@ -187,7 +187,7 @@ private BiFunction getNewValueHandler() { } } catch (NumberFormatException exception) { this.logger.warn(exception.getMessage(), exception); - return new Failure(""); //$NON-NLS-1$ + return new Failure(""); } return new Success(); }; diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/EStringIfDescriptionProvider.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/EStringIfDescriptionProvider.java index ad15bd8f30..c9049d919a 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/EStringIfDescriptionProvider.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/EStringIfDescriptionProvider.java @@ -37,9 +37,9 @@ * @author sbegaudeau */ public class EStringIfDescriptionProvider { - private static final String IF_DESCRIPTION_ID = "EString"; //$NON-NLS-1$ + private static final String IF_DESCRIPTION_ID = "EString"; - private static final String TEXTAREA_DESCRIPTION_ID = "Textarea"; //$NON-NLS-1$ + private static final String TEXTAREA_DESCRIPTION_ID = "Textarea"; private final ComposedAdapterFactory composedAdapterFactory; @@ -102,7 +102,7 @@ private Function getValueProvider() { } } - return ""; //$NON-NLS-1$ + return ""; }; } @@ -119,7 +119,7 @@ private BiFunction getNewValueHandler() { return new Success(); } - return new Failure(""); //$NON-NLS-1$ + return new Failure(""); }; } } diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/EStructuralFeatureLabelProvider.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/EStructuralFeatureLabelProvider.java index 7e7c718e48..69df4030df 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/EStructuralFeatureLabelProvider.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/EStructuralFeatureLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -58,7 +58,7 @@ public String apply(VariableManager variableManager) { } } } - return ""; //$NON-NLS-1$ + return ""; } } diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/MonoValuedNonContainmentReferenceIfDescriptionProvider.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/MonoValuedNonContainmentReferenceIfDescriptionProvider.java index e46c6e32e2..e065c6467f 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/MonoValuedNonContainmentReferenceIfDescriptionProvider.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/MonoValuedNonContainmentReferenceIfDescriptionProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -41,9 +41,9 @@ */ public class MonoValuedNonContainmentReferenceIfDescriptionProvider { - private static final String ID_DESCRIPTION_ID = "MonoValued NonContainment Reference"; //$NON-NLS-1$ + private static final String ID_DESCRIPTION_ID = "MonoValued NonContainment Reference"; - private static final String SELECT_DESCRIPTION_ID = "Select"; //$NON-NLS-1$ + private static final String SELECT_DESCRIPTION_ID = "Select"; private final ComposedAdapterFactory composedAdapterFactory; @@ -104,7 +104,7 @@ private BiFunction getNewValueHandler() { var optionalEReference = variableManager.get(PropertiesDefaultDescriptionProvider.ESTRUCTURAL_FEATURE, EReference.class); var optionalEditingContext = variableManager.get(IEditingContext.EDITING_CONTEXT, IEditingContext.class); - IStatus result = new Failure(""); //$NON-NLS-1$ + IStatus result = new Failure(""); if (optionalEObject.isPresent() && optionalEReference.isPresent()) { EObject eObject = optionalEObject.get(); EReference eReference = optionalEReference.get(); diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/MultiValuedNonContainmentReferenceIfDescriptionProvider.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/MultiValuedNonContainmentReferenceIfDescriptionProvider.java index fccdc12937..c051fef1d5 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/MultiValuedNonContainmentReferenceIfDescriptionProvider.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/MultiValuedNonContainmentReferenceIfDescriptionProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -44,9 +44,9 @@ */ public class MultiValuedNonContainmentReferenceIfDescriptionProvider { - private static final String ID_DESCRIPTION_ID = "MultiValued NonContainment Reference"; //$NON-NLS-1$ + private static final String ID_DESCRIPTION_ID = "MultiValued NonContainment Reference"; - private static final String MULTI_SELECT_DESCRIPTION_ID = "MultiSelect"; //$NON-NLS-1$ + private static final String MULTI_SELECT_DESCRIPTION_ID = "MultiSelect"; private final ComposedAdapterFactory composedAdapterFactory; @@ -103,7 +103,7 @@ private MultiSelectDescription getMultiSelectDescription() { private BiFunction, IStatus> getNewValuesHandler() { return (variableManager, newValues) -> { - IStatus status = new Failure(""); //$NON-NLS-1$ + IStatus status = new Failure(""); var optionalEObject = variableManager.get(VariableManager.SELF, EObject.class); var optionalEReference = variableManager.get(PropertiesDefaultDescriptionProvider.ESTRUCTURAL_FEATURE, EReference.class); var optionalEditingContext = variableManager.get(IEditingContext.EDITING_CONTEXT, IEditingContext.class); @@ -131,7 +131,7 @@ private BiFunction, IStatus> getNewValuesHandler() this.logger.warn(exception.getMessage(), exception); } } else { - this.logger.warn("The " + newValue + " cannot be retrieved and set to " + eReference.getName() + " of " + eObject.toString()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.logger.warn("The " + newValue + " cannot be retrieved and set to " + eReference.getName() + " of " + eObject.toString()); } } diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/NumberIfDescriptionProvider.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/NumberIfDescriptionProvider.java index 8979df6012..da790b2bbd 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/NumberIfDescriptionProvider.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/NumberIfDescriptionProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -38,7 +38,7 @@ */ public class NumberIfDescriptionProvider { - private static final String TEXTFIELD_DESCRIPTION_ID = "Textfield"; //$NON-NLS-1$ + private static final String TEXTFIELD_DESCRIPTION_ID = "Textfield"; private final EDataType eDataType; @@ -98,7 +98,7 @@ private String getEObjectId(Optional potentialEObject) { // @formatter:off return potentialEObject.map(EcoreUtil::getURI) .map(Object::toString) - .orElse(""); //$NON-NLS-1$ + .orElse(""); // @formatter:on } @@ -118,7 +118,7 @@ private Function getValueProvider() { return EcoreUtil.convertToString(this.eDataType, value); } - return ""; //$NON-NLS-1$ + return ""; }; } @@ -127,7 +127,7 @@ private BiFunction getNewValueHandler() { var optionalEObject = variableManager.get(VariableManager.SELF, EObject.class); var optionalEAttribute = variableManager.get(PropertiesDefaultDescriptionProvider.ESTRUCTURAL_FEATURE, EAttribute.class); - IStatus result = new Failure(""); //$NON-NLS-1$ + IStatus result = new Failure(""); if (optionalEObject.isPresent() && optionalEAttribute.isPresent()) { EObject eObject = optionalEObject.get(); EAttribute eAttribute = optionalEAttribute.get(); diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/PropertiesDefaultDescriptionProvider.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/PropertiesDefaultDescriptionProvider.java index 6e1f4a945c..b1d9994525 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/PropertiesDefaultDescriptionProvider.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/PropertiesDefaultDescriptionProvider.java @@ -49,7 +49,7 @@ @Service public class PropertiesDefaultDescriptionProvider implements IPropertiesDefaultDescriptionProvider { - public static final String ESTRUCTURAL_FEATURE = "eStructuralFeature"; //$NON-NLS-1$ + public static final String ESTRUCTURAL_FEATURE = "eStructuralFeature"; private final IObjectService objectService; @@ -79,7 +79,7 @@ public FormDescription getFormDescription() { pageDescriptions.add(firstPageDescription); // @formatter:off - Function labelProvider = variableManager -> "Properties"; //$NON-NLS-1$ + Function labelProvider = variableManager -> "Properties"; // @formatter:on // @formatter:off @@ -91,7 +91,7 @@ public FormDescription getFormDescription() { .orElse(null); return FormDescription.newFormDescription(PropertiesEventProcessorFactory.DETAILS_VIEW_ID) - .label("Default form description") //$NON-NLS-1$ + .label("Default form description") .idProvider(new GetOrCreateRandomIdProvider()) .labelProvider(labelProvider) .targetObjectIdProvider(targetObjectIdProvider) @@ -122,7 +122,7 @@ private PageDescription getPageDescription(List groupDescripti }; // @formatter:off - return PageDescription.newPageDescription("firstPageId") //$NON-NLS-1$ + return PageDescription.newPageDescription("firstPageId") .idProvider(idProvider) .labelProvider(labelProvider) .semanticElementsProvider(variableManager -> Collections.singletonList(variableManager.getVariables().get(VariableManager.SELF))) @@ -186,7 +186,7 @@ private GroupDescription getGroupDescription() { } // @formatter:off - ForDescription forDescription = ForDescription.newForDescription("forId") //$NON-NLS-1$ + ForDescription forDescription = ForDescription.newForDescription("forId") .iterator(ESTRUCTURAL_FEATURE) .iterableProvider(iterableProvider) .ifDescriptions(ifDescriptions) @@ -196,9 +196,9 @@ private GroupDescription getGroupDescription() { controlDescriptions.add(forDescription); // @formatter:off - return GroupDescription.newGroupDescription("groupId") //$NON-NLS-1$ - .idProvider(variableManager -> "Core Properties") //$NON-NLS-1$ - .labelProvider(variableManager -> "Core Properties") //$NON-NLS-1$ + return GroupDescription.newGroupDescription("groupId") + .idProvider(variableManager -> "Core Properties") + .labelProvider(variableManager -> "Core Properties") .semanticElementsProvider(variableManager -> Collections.singletonList(variableManager.getVariables().get(VariableManager.SELF))) .controlDescriptions(controlDescriptions) .build(); diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/PropertiesValidationProvider.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/PropertiesValidationProvider.java index 4c582d7ef3..fc8ccf23a9 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/PropertiesValidationProvider.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/PropertiesValidationProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -54,21 +54,21 @@ public Function> getDiagnosticsProvider() { @Override public Function getKindProvider() { return object -> { - String kind = "Unknown"; //$NON-NLS-1$ + String kind = "Unknown"; if (object instanceof Diagnostic) { Diagnostic diagnostic = (Diagnostic) object; switch (diagnostic.getSeverity()) { case org.eclipse.emf.common.util.Diagnostic.ERROR: - kind = "Error"; //$NON-NLS-1$ + kind = "Error"; break; case org.eclipse.emf.common.util.Diagnostic.WARNING: - kind = "Warning"; //$NON-NLS-1$ + kind = "Warning"; break; case org.eclipse.emf.common.util.Diagnostic.INFO: - kind = "Info"; //$NON-NLS-1$ + kind = "Info"; break; default: - kind = "Unknown"; //$NON-NLS-1$ + kind = "Unknown"; break; } } @@ -83,7 +83,7 @@ public Function getMessageProvider() { Diagnostic diagnostic = (Diagnostic) object; return diagnostic.getMessage(); } - return ""; //$NON-NLS-1$ + return ""; }; } } diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/api/IPropertiesValidationProvider.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/api/IPropertiesValidationProvider.java index 630f07d71d..0d1478d36d 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/api/IPropertiesValidationProvider.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/main/java/org/eclipse/sirius/components/compatibility/emf/properties/api/IPropertiesValidationProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -43,12 +43,12 @@ public Function> getDiagnosticsProvider() { @Override public Function getKindProvider() { - return object -> ""; //$NON-NLS-1$ + return object -> ""; } @Override public Function getMessageProvider() { - return object -> ""; //$NON-NLS-1$ + return object -> ""; } } diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/architecture/ArchitectureConstants.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/architecture/ArchitectureConstants.java index 15e248cfe1..4afb447b00 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/architecture/ArchitectureConstants.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/architecture/ArchitectureConstants.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -22,7 +22,7 @@ * @author sbegaudeau */ public final class ArchitectureConstants { - public static final String SIRIUS_COMPONENTS_COMPATIBILITY_EMF_ROOT_PACKAGE = "org.eclipse.sirius.components.compatibility.emf.."; //$NON-NLS-1$ + public static final String SIRIUS_COMPONENTS_COMPATIBILITY_EMF_ROOT_PACKAGE = "org.eclipse.sirius.components.compatibility.emf.."; // @formatter:off public static final JavaClasses CLASSES = new ClassFileImporter() diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/DomainClassPredicateTests.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/DomainClassPredicateTests.java index 5ed4eaeb5f..d8e3541411 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/DomainClassPredicateTests.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/DomainClassPredicateTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -26,31 +26,31 @@ public class DomainClassPredicateTests { @Test public void testValidDomainClass() { - DomainClassPredicate domainClassPredicate = new DomainClassPredicate("ecore::EClass"); //$NON-NLS-1$ + DomainClassPredicate domainClassPredicate = new DomainClassPredicate("ecore::EClass"); assertThat(domainClassPredicate.test(EcorePackage.Literals.ECLASS)).isTrue(); } @Test public void testInvalidDomainClass() { - DomainClassPredicate domainClassPredicate = new DomainClassPredicate("foo::Bar"); //$NON-NLS-1$ + DomainClassPredicate domainClassPredicate = new DomainClassPredicate("foo::Bar"); assertThat(domainClassPredicate.test(EcorePackage.Literals.ECLASS)).isFalse(); } @Test public void testSuperClass() { - DomainClassPredicate domainClassPredicate = new DomainClassPredicate("ecore::EClassifier"); //$NON-NLS-1$ + DomainClassPredicate domainClassPredicate = new DomainClassPredicate("ecore::EClassifier"); assertThat(domainClassPredicate.test(EcorePackage.Literals.ECLASS)).isTrue(); } @Test public void testSuperSuperClass() { - DomainClassPredicate domainClassPredicate = new DomainClassPredicate("ecore::ENamedElement"); //$NON-NLS-1$ + DomainClassPredicate domainClassPredicate = new DomainClassPredicate("ecore::ENamedElement"); assertThat(domainClassPredicate.test(EcorePackage.Literals.ECLASS)).isTrue(); } @Test public void testBlankDomainClass() { - DomainClassPredicate domainClassPredicate = new DomainClassPredicate(""); //$NON-NLS-1$ + DomainClassPredicate domainClassPredicate = new DomainClassPredicate(""); assertThat(domainClassPredicate.test(EcorePackage.Literals.ECLASS)).isTrue(); } } diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/diagrams/EdgeMappingConverterTests.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/diagrams/EdgeMappingConverterTests.java index f6d12a3153..e8e4ffe5a3 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/diagrams/EdgeMappingConverterTests.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/diagrams/EdgeMappingConverterTests.java @@ -57,9 +57,9 @@ public class EdgeMappingConverterTests { public void testEdgeFromNodeToContainer() { EdgeMapping edgeMapping = DescriptionFactory.eINSTANCE.createEdgeMapping(); NodeMapping nodeMapping = DescriptionFactory.eINSTANCE.createNodeMapping(); - nodeMapping.setName("nodeMapping"); //$NON-NLS-1$ + nodeMapping.setName("nodeMapping"); ContainerMapping containerMapping = DescriptionFactory.eINSTANCE.createContainerMapping(); - containerMapping.setName("containerMapping"); //$NON-NLS-1$ + containerMapping.setName("containerMapping"); edgeMapping.getSourceMapping().add(nodeMapping); edgeMapping.getTargetMapping().add(containerMapping); @@ -93,26 +93,26 @@ public String getIdentifier(Object element) { private NodeDescription createNodeDescription(UUID id) { // @formatter:off LabelStyleDescription styleDescription = LabelStyleDescription.newLabelStyleDescription() - .colorProvider(variableManager -> "") //$NON-NLS-1$ + .colorProvider(variableManager -> "") .fontSizeProvider(variableManager -> 0) .boldProvider(variableManager -> false) .italicProvider(variableManager -> false) .underlineProvider(variableManager -> false) .strikeThroughProvider(variableManager -> false) - .iconURLProvider(variableManager -> "") //$NON-NLS-1$ + .iconURLProvider(variableManager -> "") .build(); LabelDescription labelDescription = LabelDescription.newLabelDescription(id.toString()) - .idProvider(variableManager -> "") //$NON-NLS-1$ - .textProvider(variableManager -> "") //$NON-NLS-1$ + .idProvider(variableManager -> "") + .textProvider(variableManager -> "") .styleDescriptionProvider(variableManager -> styleDescription) .build(); return NodeDescription.newNodeDescription(id) - .typeProvider(variableManager -> "") //$NON-NLS-1$ - .targetObjectIdProvider(variableManager -> "") //$NON-NLS-1$ - .targetObjectKindProvider(variableManager -> "") //$NON-NLS-1$ - .targetObjectLabelProvider(variableManager -> "")//$NON-NLS-1$ + .typeProvider(variableManager -> "") + .targetObjectIdProvider(variableManager -> "") + .targetObjectKindProvider(variableManager -> "") + .targetObjectLabelProvider(variableManager -> "") .semanticElementsProvider(variableManager -> List.of()) .labelDescription(labelDescription) .styleProvider(variableManager -> null) @@ -134,9 +134,9 @@ private NodeDescription createNodeDescription(UUID id) { public void testEdgeFromContainerToNode() { EdgeMapping edgeMapping = DescriptionFactory.eINSTANCE.createEdgeMapping(); NodeMapping nodeMapping = DescriptionFactory.eINSTANCE.createNodeMapping(); - nodeMapping.setName("nodeMapping"); //$NON-NLS-1$ + nodeMapping.setName("nodeMapping"); ContainerMapping containerMapping = DescriptionFactory.eINSTANCE.createContainerMapping(); - containerMapping.setName("containerMapping"); //$NON-NLS-1$ + containerMapping.setName("containerMapping"); edgeMapping.getSourceMapping().add(containerMapping); edgeMapping.getTargetMapping().add(nodeMapping); @@ -175,9 +175,9 @@ public String getIdentifier(Object element) { public void testEdgeFromContainerToContainer() { EdgeMapping edgeMapping = DescriptionFactory.eINSTANCE.createEdgeMapping(); ContainerMapping sourceContainerMapping = DescriptionFactory.eINSTANCE.createContainerMapping(); - sourceContainerMapping.setName("sourceContainerMapping"); //$NON-NLS-1$ + sourceContainerMapping.setName("sourceContainerMapping"); ContainerMapping targetContainerMapping = DescriptionFactory.eINSTANCE.createContainerMapping(); - targetContainerMapping.setName("targetContainerMapping"); //$NON-NLS-1$ + targetContainerMapping.setName("targetContainerMapping"); edgeMapping.getSourceMapping().add(sourceContainerMapping); edgeMapping.getTargetMapping().add(targetContainerMapping); diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/diagrams/SemanticCandidatesProviderTests.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/diagrams/SemanticCandidatesProviderTests.java index a3452dca77..6fd82060b5 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/diagrams/SemanticCandidatesProviderTests.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/diagrams/SemanticCandidatesProviderTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -53,9 +53,9 @@ public SemanticCandidatesProviderTests() { */ @Test public void testDomainClassAndSemanticCandidatesExpression() { - String domainClass = "ecore::EClass"; //$NON-NLS-1$ - String semanticCandidatesExpression = "aql:self.eClassifiers"; //$NON-NLS-1$ - String preconditionExpression = ""; //$NON-NLS-1$ + String domainClass = "ecore::EClass"; + String semanticCandidatesExpression = "aql:self.eClassifiers"; + String preconditionExpression = ""; SemanticCandidatesProvider semanticCandidatesProvider = new SemanticCandidatesProvider(this.interpreter, domainClass, semanticCandidatesExpression, preconditionExpression); @@ -78,9 +78,9 @@ public void testDomainClassAndSemanticCandidatesExpression() { */ @Test public void testDomainClassSemanticCandidatesExpressionAndPreconditionExpression() { - String domainClass = "ecore::EClass"; //$NON-NLS-1$ - String semanticCandidatesExpression = "aql:self.eClassifiers"; //$NON-NLS-1$ - String preconditionExpression = "aql:self.name.startsWith('EEnum')"; //$NON-NLS-1$ + String domainClass = "ecore::EClass"; + String semanticCandidatesExpression = "aql:self.eClassifiers"; + String preconditionExpression = "aql:self.name.startsWith('EEnum')"; SemanticCandidatesProvider semanticCandidatesProvider = new SemanticCandidatesProvider(this.interpreter, domainClass, semanticCandidatesExpression, preconditionExpression); @@ -98,6 +98,6 @@ public void testDomainClassSemanticCandidatesExpressionAndPreconditionExpression // @formatter:on assertThat(semanticCandidates).hasSize(2); - assertThat(eClasses).extracting(ENamedElement::getName).containsExactly("EEnum", "EEnumLiteral"); //$NON-NLS-1$//$NON-NLS-2$ + assertThat(eClasses).extracting(ENamedElement::getName).containsExactly("EEnum", "EEnumLiteral"); } } diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/diagrams/ToolImageProviderTests.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/diagrams/ToolImageProviderTests.java index c6c87f7794..3118af5203 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/diagrams/ToolImageProviderTests.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/diagrams/ToolImageProviderTests.java @@ -29,7 +29,7 @@ */ public class ToolImageProviderTests { - private static final String ICON_PATH = "/org.eclipse.sirius.components.diagrams/path"; //$NON-NLS-1$ + private static final String ICON_PATH = "/org.eclipse.sirius.components.diagrams/path"; @Test public void testIconPathNormalization() { diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/ChangeContextOperationHandlerTests.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/ChangeContextOperationHandlerTests.java index 19c021b8c4..f06ec9af49 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/ChangeContextOperationHandlerTests.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/ChangeContextOperationHandlerTests.java @@ -55,8 +55,8 @@ public void initialize() { @Test public void changeContextHandlerNominalCaseTest() { // check the nominal case - String newName = "newName"; //$NON-NLS-1$ - this.changeContext.setBrowseExpression("aql:self.renameENamedElementService('" + newName + "')"); //$NON-NLS-1$//$NON-NLS-2$ + String newName = "newName"; + this.changeContext.setBrowseExpression("aql:self.renameENamedElementService('" + newName + "')"); IStatus handleResult = this.changeContextOperationHandler.handle(this.operationTestContext.getVariables()); @@ -68,7 +68,7 @@ public void changeContextHandlerNominalCaseTest() { ChangeContext subChangeContext = ToolFactory.eINSTANCE.createChangeContext(); this.changeContext.getSubModelOperations().add(subChangeContext); - this.handleAndCheckExecution("aql:self.eClassifiers->first()", this.operationTestContext.getClass1()); //$NON-NLS-1$ + this.handleAndCheckExecution("aql:self.eClassifiers->first()", this.operationTestContext.getClass1()); } /** @@ -85,7 +85,7 @@ public void changeContextHandlerErrorCasesTest() { this.handleAndCheckExecution(null, this.operationTestContext.getRootPackage()); // Check empty expression case - this.handleAndCheckExecution("", this.operationTestContext.getRootPackage()); //$NON-NLS-1$ + this.handleAndCheckExecution("", this.operationTestContext.getRootPackage()); // Check expression with exception case this.handleAndCheckExecution(ModelOperationServices.AQL_THROW_ERROR_EXPRESSION, this.operationTestContext.getRootPackage()); diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/ChildModelOperationHandlerTests.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/ChildModelOperationHandlerTests.java index 909f209a31..a532047f91 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/ChildModelOperationHandlerTests.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/ChildModelOperationHandlerTests.java @@ -44,28 +44,28 @@ public class ChildModelOperationHandlerTests { @Test public void testChildModelOperationWithoutSelection() { CreateView createView = ToolFactory.eINSTANCE.createCreateView(); - createView.setContainerViewExpression(""); //$NON-NLS-1$ - createView.setVariableName(""); //$NON-NLS-1$ + createView.setContainerViewExpression(""); + createView.setVariableName(""); createView.setMapping(DescriptionFactory.eINSTANCE.createNodeMapping()); IObjectService objectService = new IObjectService.NoOp() { @Override public String getId(Object object) { - return ""; //$NON-NLS-1$ + return ""; } }; IIdentifierProvider identifierProvider = new IIdentifierProvider.NoOp() { @Override public String getIdentifier(Object element) { - return UUID.nameUUIDFromBytes("node".getBytes()).toString(); //$NON-NLS-1$ + return UUID.nameUUIDFromBytes("node".getBytes()).toString(); } }; AQLInterpreter interpreter = new AQLInterpreter(List.of(), List.of()) { @Override public Result evaluateExpression(Map variables, String expressionBody) { - Object value = new TestDiagramBuilder().getDiagram("diagramId"); //$NON-NLS-1$ + Object value = new TestDiagramBuilder().getDiagram("diagramId"); return new Result(Optional.of(value), Status.OK); } }; diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/CreateInstanceOperationHandlerTests.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/CreateInstanceOperationHandlerTests.java index 2800d94b32..2aceab9a61 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/CreateInstanceOperationHandlerTests.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/CreateInstanceOperationHandlerTests.java @@ -41,11 +41,11 @@ * @author lfasani */ public class CreateInstanceOperationHandlerTests { - private static final String VARIABLE_NAME = "myVariableName"; //$NON-NLS-1$ + private static final String VARIABLE_NAME = "myVariableName"; - private static final String REFERENCE_NAME = "eClassifiers"; //$NON-NLS-1$ + private static final String REFERENCE_NAME = "eClassifiers"; - private static final String TYPE_NAME = "ecore::EClass"; //$NON-NLS-1$ + private static final String TYPE_NAME = "ecore::EClass"; private CreateInstanceOperationHandler createInstanceOperationHandler; @@ -71,9 +71,9 @@ public void initialize() { @Test public void createInstanceOperationHandlerNominalCaseTest() { // used to check that the variable name is added in variable scope - String className = "newClass"; //$NON-NLS-1$ + String className = "newClass"; ChangeContext subChangeContext = ToolFactory.eINSTANCE.createChangeContext(); - subChangeContext.setBrowseExpression("aql:" + VARIABLE_NAME + ".renameENamedElementService('" + className + "'))"); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ + subChangeContext.setBrowseExpression("aql:" + VARIABLE_NAME + ".renameENamedElementService('" + className + "'))"); this.createInstanceOperation.getSubModelOperations().add(subChangeContext); // check the nominal case @@ -88,7 +88,7 @@ public void createInstanceOperationHandlerNominalCaseTest() { assertEquals(className, this.operationTestContext.getRootPackage().getEClassifiers().get(1).getName()); // check that an empty variable name is a valid case - this.createInstanceOperation.setVariableName(""); //$NON-NLS-1$ + this.createInstanceOperation.setVariableName(""); handleResult = this.createInstanceOperationHandler.handle(this.operationTestContext.getVariables()); @@ -100,9 +100,9 @@ public void createInstanceOperationHandlerNominalCaseTest() { @Test public void createInstanceOperationHandlerChangeSelfCaseTest() { // used to check that the variable name is added in variable scope - String className = "newClass"; //$NON-NLS-1$ + String className = "newClass"; ChangeContext subChangeContext = ToolFactory.eINSTANCE.createChangeContext(); - subChangeContext.setBrowseExpression("aql:self.renameENamedElementService('" + className + "'))"); //$NON-NLS-1$//$NON-NLS-2$ + subChangeContext.setBrowseExpression("aql:self.renameENamedElementService('" + className + "'))"); this.createInstanceOperation.getSubModelOperations().add(subChangeContext); // check the nominal case @@ -117,7 +117,7 @@ public void createInstanceOperationHandlerChangeSelfCaseTest() { assertEquals(className, this.operationTestContext.getRootPackage().getEClassifiers().get(1).getName()); // check that an empty variable name is a valid case - this.createInstanceOperation.setVariableName(""); //$NON-NLS-1$ + this.createInstanceOperation.setVariableName(""); handleResult = this.createInstanceOperationHandler.handle(this.operationTestContext.getVariables()); @@ -139,9 +139,9 @@ public void createInstanceOperationHandlerErrorCasesTest() { this.handleAndCheckExecution(null, null, null, this.operationTestContext.getRootPackage()); // Check empty expression case - this.handleAndCheckExecution("", "", "", this.operationTestContext.getRootPackage()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.handleAndCheckExecution("", "", "", this.operationTestContext.getRootPackage()); - this.handleAndCheckExecution(REFERENCE_NAME, "UnknownClass", VARIABLE_NAME, this.operationTestContext.getRootPackage()); //$NON-NLS-1$ + this.handleAndCheckExecution(REFERENCE_NAME, "UnknownClass", VARIABLE_NAME, this.operationTestContext.getRootPackage()); } /** diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/CreateViewOperationHandlerTests.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/CreateViewOperationHandlerTests.java index 063afacd26..ef74674f26 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/CreateViewOperationHandlerTests.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/CreateViewOperationHandlerTests.java @@ -61,11 +61,11 @@ */ public class CreateViewOperationHandlerTests { - private static final String AQL = "aql:"; //$NON-NLS-1$ + private static final String AQL = "aql:"; - private static final String VARIABLE_NAME = "myVariableName"; //$NON-NLS-1$ + private static final String VARIABLE_NAME = "myVariableName"; - private static final String CONTAINER_VIEW = "containerView"; //$NON-NLS-1$ + private static final String CONTAINER_VIEW = "containerView"; private CreateViewOperationHandler createViewOperationHandler; @@ -79,21 +79,21 @@ public void initialize() { // @formatter:off DiagramDescription diagramDescription = DiagramDescription.newDiagramDescription(UUID.randomUUID().toString()) - .label("DiagramDescriptionTest") //$NON-NLS-1$ - .targetObjectIdProvider(variableManager -> "diagramTargetObjectId") //$NON-NLS-1$ + .label("DiagramDescriptionTest") + .targetObjectIdProvider(variableManager -> "diagramTargetObjectId") .canCreatePredicate(variableManager -> true) - .labelProvider(variableManager -> "Diagram") //$NON-NLS-1$ + .labelProvider(variableManager -> "Diagram") .toolSections(List.of()) .tools(List.of()) .nodeDescriptions(List.of(this.getNodeDescription(UUID.randomUUID()))) .edgeDescriptions(List.of()) - .dropHandler(variableManager -> new Failure("")) //$NON-NLS-1$ + .dropHandler(variableManager -> new Failure("")) .build(); Diagram diagram = Diagram.newDiagram(UUID.randomUUID().toString()) .descriptionId(diagramDescription.getId()) .targetObjectId(UUID.randomUUID().toString()) - .label("DiagramTest") //$NON-NLS-1$ + .label("DiagramTest") .position(Position.at(0, 0)) .size(Size.of(100, 100)) .nodes(new ArrayList<>()) @@ -121,9 +121,9 @@ public List getViewCreationRequests() { @Test public void createViewOperationHandlerNominalCaseTest() { // used to check that the variable name is added in variable scope - String className = "newClass"; //$NON-NLS-1$ + String className = "newClass"; ChangeContext subChangeContext = ToolFactory.eINSTANCE.createChangeContext(); - subChangeContext.setBrowseExpression(AQL + VARIABLE_NAME + ".renameENamedElementService('" + className + "'))"); //$NON-NLS-1$ //$NON-NLS-2$ + subChangeContext.setBrowseExpression(AQL + VARIABLE_NAME + ".renameENamedElementService('" + className + "'))"); this.createViewOperation.getSubModelOperations().add(subChangeContext); // check the nominal case @@ -138,7 +138,7 @@ public void createViewOperationHandlerNominalCaseTest() { assertTrue(handleResult instanceof Success); // check that an empty variable name is a valid case - this.createViewOperation.setVariableName(""); //$NON-NLS-1$ + this.createViewOperation.setVariableName(""); handleResult = this.createViewOperationHandler.handle(this.operationTestContext.getVariables()); @@ -158,8 +158,7 @@ public void createViewOperationHandlerErrorCasesTest() { this.handleAndCheckExecution(null, this.operationTestContext.getRootPackage()); // Check empty expression case - this.handleAndCheckExecution("", this.operationTestContext.getRootPackage()); //$NON-NLS-1$ - // $NON-NLS-3$ + this.handleAndCheckExecution("", this.operationTestContext.getRootPackage()); this.handleAndCheckExecution(VARIABLE_NAME, this.operationTestContext.getRootPackage()); } @@ -188,25 +187,25 @@ private void handleAndCheckExecution(String variableName, ENamedElement renamedE private NodeDescription getNodeDescription(UUID nodeDescriptionId) { // @formatter:off LabelStyleDescription labelStyleDescription = LabelStyleDescription.newLabelStyleDescription() - .colorProvider(variableManager -> "#000000") //$NON-NLS-1$ + .colorProvider(variableManager -> "#000000") .fontSizeProvider(variableManager -> 16) .boldProvider(variableManager -> false) .italicProvider(variableManager -> false) .underlineProvider(variableManager -> false) .strikeThroughProvider(variableManager -> false) - .iconURLProvider(variableManager -> "") //$NON-NLS-1$ + .iconURLProvider(variableManager -> "") .build(); - LabelDescription labelDescription = LabelDescription.newLabelDescription("labelDescriptionId") //$NON-NLS-1$ - .idProvider(variableManager -> "labelId") //$NON-NLS-1$ - .textProvider(variableManager -> "Node") //$NON-NLS-1$ + LabelDescription labelDescription = LabelDescription.newLabelDescription("labelDescriptionId") + .idProvider(variableManager -> "labelId") + .textProvider(variableManager -> "Node") .styleDescriptionProvider(variableManager -> labelStyleDescription) .build(); Function nodeStyleProvider = variableManager -> { return RectangularNodeStyle.newRectangularNodeStyle() - .color("") //$NON-NLS-1$ - .borderColor("") //$NON-NLS-1$ + .color("") + .borderColor("") .borderSize(0) .borderStyle(LineStyle.Solid) .build(); @@ -215,18 +214,18 @@ private NodeDescription getNodeDescription(UUID nodeDescriptionId) { Function targetObjectIdProvider = variableManager -> { Object object = variableManager.getVariables().get(VariableManager.SELF); if (object instanceof String) { - return nodeDescriptionId + "__" + object; //$NON-NLS-1$ + return nodeDescriptionId + "__" + object; } return null; }; return NodeDescription.newNodeDescription(nodeDescriptionId) .synchronizationPolicy(SynchronizationPolicy.UNSYNCHRONIZED) - .typeProvider(variableManager -> "") //$NON-NLS-1$ + .typeProvider(variableManager -> "") .semanticElementsProvider(variableManager -> List.of()) .targetObjectIdProvider(targetObjectIdProvider) - .targetObjectKindProvider(variableManager -> "") //$NON-NLS-1$ - .targetObjectLabelProvider(variableManager -> "")//$NON-NLS-1$ + .targetObjectKindProvider(variableManager -> "") + .targetObjectLabelProvider(variableManager -> "") .labelDescription(labelDescription) .styleProvider(nodeStyleProvider) .childrenLayoutStrategyProvider(variableManager -> new FreeFormLayoutStrategy()) diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/DeleteViewOperationHandlerTests.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/DeleteViewOperationHandlerTests.java index 5d4080e901..49cc3b479b 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/DeleteViewOperationHandlerTests.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/DeleteViewOperationHandlerTests.java @@ -61,11 +61,11 @@ * @author arichard */ public class DeleteViewOperationHandlerTests { - private static final String AQL = "aql:"; //$NON-NLS-1$ + private static final String AQL = "aql:"; - private static final String VARIABLE_NAME = "myVariableName"; //$NON-NLS-1$ + private static final String VARIABLE_NAME = "myVariableName"; - private static final String CONTAINER_VIEW = "containerView"; //$NON-NLS-1$ + private static final String CONTAINER_VIEW = "containerView"; private DeleteViewOperationHandler deleteViewOperationHandler; @@ -79,32 +79,32 @@ public void initialize() { // @formatter:off DiagramDescription diagramDescription = DiagramDescription.newDiagramDescription(UUID.randomUUID().toString()) - .label("DiagramDescriptionTest") //$NON-NLS-1$ - .targetObjectIdProvider(variableManager -> "diagramTargetObjectId") //$NON-NLS-1$ + .label("DiagramDescriptionTest") + .targetObjectIdProvider(variableManager -> "diagramTargetObjectId") .canCreatePredicate(variableManager -> true) - .labelProvider(variableManager -> "Diagram") //$NON-NLS-1$ + .labelProvider(variableManager -> "Diagram") .toolSections(List.of()) .tools(List.of()) .nodeDescriptions(List.of(this.getNodeDescription(UUID.randomUUID()))) .edgeDescriptions(List.of()) - .dropHandler(variableManager -> new Failure("")) //$NON-NLS-1$ + .dropHandler(variableManager -> new Failure("")) .build(); Node node = Node.newNode(UUID.randomUUID().toString()) .descriptionId(UUID.randomUUID()) - .type("Node") //$NON-NLS-1$ + .type("Node") .targetObjectId(UUID.randomUUID().toString()) - .targetObjectKind("ecore::EPackage") //$NON-NLS-1$ + .targetObjectKind("ecore::EPackage") .targetObjectLabel(OperationTestContext.ROOT_PACKAGE_NAME) .label(Label.newLabel(UUID.randomUUID().toString()) - .type("Label") //$NON-NLS-1$ + .type("Label") .text(OperationTestContext.ROOT_PACKAGE_NAME) .position(Position.at(0, 0)) .size(Size.of(10, 10)) .alignment(Position.at(0, 0)) - .style(LabelStyle.newLabelStyle().color("").fontSize(0).iconURL("").build()) //$NON-NLS-1$ //$NON-NLS-2$ + .style(LabelStyle.newLabelStyle().color("").fontSize(0).iconURL("").build()) .build()) - .style(ImageNodeStyle.newImageNodeStyle().imageURL("").scalingFactor(0).build()) //$NON-NLS-1$ + .style(ImageNodeStyle.newImageNodeStyle().imageURL("").scalingFactor(0).build()) .position(Position.at(0, 0)) .size(Size.of(10, 10)) .borderNodes(List.of()) @@ -116,7 +116,7 @@ public void initialize() { Diagram diagram = Diagram.newDiagram(UUID.randomUUID().toString()) .descriptionId(diagramDescription.getId()) .targetObjectId(UUID.randomUUID().toString()) - .label("DiagramTest") //$NON-NLS-1$ + .label("DiagramTest") .position(Position.at(0, 0)) .size(Size.of(100, 100)) .nodes(List.of(node)) @@ -145,9 +145,9 @@ public List getViewDeletionRequests() { @Test public void deleteViewOperationHandlerNominalCaseTest() { // used to check that the variable name is added in variable scope - String className = "newClass"; //$NON-NLS-1$ + String className = "newClass"; ChangeContext subChangeContext = ToolFactory.eINSTANCE.createChangeContext(); - subChangeContext.setBrowseExpression(AQL + VARIABLE_NAME + ".renameENamedElementService('" + className + "'))"); //$NON-NLS-1$ //$NON-NLS-2$ + subChangeContext.setBrowseExpression(AQL + VARIABLE_NAME + ".renameENamedElementService('" + className + "'))"); this.deleteViewOperation.getSubModelOperations().add(subChangeContext); // check the nominal case @@ -159,25 +159,25 @@ public void deleteViewOperationHandlerNominalCaseTest() { private NodeDescription getNodeDescription(UUID nodeDescriptionId) { // @formatter:off LabelStyleDescription labelStyleDescription = LabelStyleDescription.newLabelStyleDescription() - .colorProvider(variableManager -> "#000000") //$NON-NLS-1$ + .colorProvider(variableManager -> "#000000") .fontSizeProvider(variableManager -> 16) .boldProvider(variableManager -> false) .italicProvider(variableManager -> false) .underlineProvider(variableManager -> false) .strikeThroughProvider(variableManager -> false) - .iconURLProvider(variableManager -> "") //$NON-NLS-1$ + .iconURLProvider(variableManager -> "") .build(); - LabelDescription labelDescription = LabelDescription.newLabelDescription("labelDescriptionId") //$NON-NLS-1$ - .idProvider(variableManager -> "labelId") //$NON-NLS-1$ - .textProvider(variableManager -> "Node") //$NON-NLS-1$ + LabelDescription labelDescription = LabelDescription.newLabelDescription("labelDescriptionId") + .idProvider(variableManager -> "labelId") + .textProvider(variableManager -> "Node") .styleDescriptionProvider(variableManager -> labelStyleDescription) .build(); Function nodeStyleProvider = variableManager -> { return RectangularNodeStyle.newRectangularNodeStyle() - .color("") //$NON-NLS-1$ - .borderColor("") //$NON-NLS-1$ + .color("") + .borderColor("") .borderSize(0) .borderStyle(LineStyle.Solid) .build(); @@ -186,18 +186,18 @@ private NodeDescription getNodeDescription(UUID nodeDescriptionId) { Function targetObjectIdProvider = variableManager -> { Object object = variableManager.getVariables().get(VariableManager.SELF); if (object instanceof String) { - return nodeDescriptionId + "__" + object; //$NON-NLS-1$ + return nodeDescriptionId + "__" + object; } return null; }; return NodeDescription.newNodeDescription(nodeDescriptionId) .synchronizationPolicy(SynchronizationPolicy.UNSYNCHRONIZED) - .typeProvider(variableManager -> "") //$NON-NLS-1$ + .typeProvider(variableManager -> "") .semanticElementsProvider(variableManager -> List.of()) .targetObjectIdProvider(targetObjectIdProvider) - .targetObjectKindProvider(variableManager -> "") //$NON-NLS-1$ - .targetObjectLabelProvider(variableManager -> "")//$NON-NLS-1$ + .targetObjectKindProvider(variableManager -> "") + .targetObjectLabelProvider(variableManager -> "") .labelDescription(labelDescription) .styleProvider(nodeStyleProvider) .childrenLayoutStrategyProvider(variableManager -> new FreeFormLayoutStrategy()) diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/ForOperationHandlerTests.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/ForOperationHandlerTests.java index 6453e9c049..2f6dd77481 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/ForOperationHandlerTests.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/ForOperationHandlerTests.java @@ -36,9 +36,9 @@ * @author lfasani */ public class ForOperationHandlerTests { - private static final String ITERATOR_VARIABLE_NAME = "i"; //$NON-NLS-1$ + private static final String ITERATOR_VARIABLE_NAME = "i"; - private static final String EXPRESSION = "aql:Sequence{'a', 'b', 'c'}"; //$NON-NLS-1$ + private static final String EXPRESSION = "aql:Sequence{'a', 'b', 'c'}"; private ForOperationHandler forOperationHandler; @@ -64,13 +64,13 @@ public void forOperationHandlerNominalCaseTest() { // used to check that the for operation succeeded ChangeContext subChangeContext = ToolFactory.eINSTANCE.createChangeContext(); - subChangeContext.setBrowseExpression("aql:self.renameENamedElementService(self.name+" + ITERATOR_VARIABLE_NAME + "))"); //$NON-NLS-1$//$NON-NLS-2$ + subChangeContext.setBrowseExpression("aql:self.renameENamedElementService(self.name+" + ITERATOR_VARIABLE_NAME + "))"); this.forOperation.getSubModelOperations().add(subChangeContext); IStatus handleResult = this.forOperationHandler.handle(this.operationTestContext.getVariables()); assertTrue(handleResult instanceof Success); - assertEquals(OperationTestContext.ROOT_PACKAGE_NAME + "abc", this.operationTestContext.getRootPackage().getName()); //$NON-NLS-1$ + assertEquals(OperationTestContext.ROOT_PACKAGE_NAME + "abc", this.operationTestContext.getRootPackage().getName()); } @@ -89,8 +89,8 @@ public void forOperationHandlerErrorCasesTest() { this.handleAndCheckExecution(null, EXPRESSION, this.operationTestContext.getRootPackage()); // Check empty expression case - this.handleAndCheckExecution(ITERATOR_VARIABLE_NAME, "", this.operationTestContext.getRootPackage()); //$NON-NLS-1$ - this.handleAndCheckExecution("", EXPRESSION, this.operationTestContext.getRootPackage()); //$NON-NLS-1$ + this.handleAndCheckExecution(ITERATOR_VARIABLE_NAME, "", this.operationTestContext.getRootPackage()); + this.handleAndCheckExecution("", EXPRESSION, this.operationTestContext.getRootPackage()); // Check expression with exception case this.handleAndCheckExecution(ITERATOR_VARIABLE_NAME, ModelOperationServices.AQL_THROW_ERROR_EXPRESSION, this.operationTestContext.getRootPackage()); diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/IfOperationHandlerTests.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/IfOperationHandlerTests.java index e5930bbbfe..dfadcd5eaf 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/IfOperationHandlerTests.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/IfOperationHandlerTests.java @@ -36,7 +36,7 @@ * @author lfasani */ public class IfOperationHandlerTests { - private static final String AQL_TRUE = "true"; //$NON-NLS-1$ + private static final String AQL_TRUE = "true"; private IfOperationHandler ifOperationHandler; @@ -57,9 +57,9 @@ public void initialize() { @Test public void ifOperationHandlerNominalCaseTest() { // used to check that the if operation succeeded - String newName = "newName"; //$NON-NLS-1$ + String newName = "newName"; ChangeContext subChangeContext = ToolFactory.eINSTANCE.createChangeContext(); - subChangeContext.setBrowseExpression("aql:self.renameENamedElementService('" + newName + "'))"); //$NON-NLS-1$//$NON-NLS-2$ + subChangeContext.setBrowseExpression("aql:self.renameENamedElementService('" + newName + "'))"); this.ifOperation.getSubModelOperations().add(subChangeContext); // check the nominal case @@ -86,7 +86,7 @@ public void ifOperationHandlerErrorCasesTest() { this.handleAndCheckExecution(null, this.operationTestContext.getRootPackage()); // Check empty expression case - this.handleAndCheckExecution("", this.operationTestContext.getRootPackage()); //$NON-NLS-1$ + this.handleAndCheckExecution("", this.operationTestContext.getRootPackage()); // Check expression with exception case this.handleAndCheckExecution(ModelOperationServices.AQL_THROW_ERROR_EXPRESSION, this.operationTestContext.getRootPackage()); diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/LetOperationHandlerTests.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/LetOperationHandlerTests.java index 2ee3425527..be8ffadbe6 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/LetOperationHandlerTests.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/LetOperationHandlerTests.java @@ -36,7 +36,7 @@ * @author lfasani */ public class LetOperationHandlerTests { - private static final String VARIABLE_NAME = "myVariableName"; //$NON-NLS-1$ + private static final String VARIABLE_NAME = "myVariableName"; private LetOperationHandler letOperationHandler; @@ -56,14 +56,14 @@ public void initialize() { @Test public void letOperationHandlerNominalCaseTest() { // used to check that the let operation succeeded - String newName = "newClass"; //$NON-NLS-1$ + String newName = "newClass"; ChangeContext subChangeContext = ToolFactory.eINSTANCE.createChangeContext(); - subChangeContext.setBrowseExpression("aql:" + VARIABLE_NAME + ".renameENamedElementService('" + newName + "'))"); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ + subChangeContext.setBrowseExpression("aql:" + VARIABLE_NAME + ".renameENamedElementService('" + newName + "'))"); this.letOperation.getSubModelOperations().add(subChangeContext); // check the nominal case this.letOperation.setVariableName(VARIABLE_NAME); - this.letOperation.setValueExpression("aql:self"); //$NON-NLS-1$ + this.letOperation.setValueExpression("aql:self"); IStatus handleResult = this.letOperationHandler.handle(this.operationTestContext.getVariables()); @@ -86,7 +86,7 @@ public void letOperationHandlerErrorCasesTest() { this.handleAndCheckExecution(null, null, this.operationTestContext.getRootPackage()); // Check empty expression case - this.handleAndCheckExecution("", "", this.operationTestContext.getRootPackage()); //$NON-NLS-1$ //$NON-NLS-2$ + this.handleAndCheckExecution("", "", this.operationTestContext.getRootPackage()); // Check expression with exception case this.handleAndCheckExecution(VARIABLE_NAME, ModelOperationServices.AQL_THROW_ERROR_EXPRESSION, this.operationTestContext.getRootPackage()); diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/ModelOperationServices.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/ModelOperationServices.java index c0a550fcfe..03d51be634 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/ModelOperationServices.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/ModelOperationServices.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -22,16 +22,16 @@ */ public class ModelOperationServices { - public static final String AQL_RENAME_EXPRESSION = "aql:self.renameENamedElementService(''{0}'')"; //$NON-NLS-1$ + public static final String AQL_RENAME_EXPRESSION = "aql:self.renameENamedElementService(''{0}'')"; - public static final String AQL_THROW_ERROR_EXPRESSION = "aql:self.throwErrorService()"; //$NON-NLS-1$ + public static final String AQL_THROW_ERROR_EXPRESSION = "aql:self.throwErrorService()"; public void renameENamedElementService(ENamedElement eNamedElement, String newName) { eNamedElement.setName(newName); } public void throwErrorService(EObject eObject) { - String[] anyString = { "oneString" }; //$NON-NLS-1$ + String[] anyString = { "oneString" }; String value = anyString[10]; // raise an exception value.length(); } diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/MoveElementOperationHandlerTests.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/MoveElementOperationHandlerTests.java index 20f25a047e..bbd54e8c9d 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/MoveElementOperationHandlerTests.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/MoveElementOperationHandlerTests.java @@ -39,11 +39,11 @@ * @author lfasani */ public class MoveElementOperationHandlerTests { - private static final String SUBPACKAGE1_VARIABLE_NAME = "subPackage1"; //$NON-NLS-1$ + private static final String SUBPACKAGE1_VARIABLE_NAME = "subPackage1"; - private static final String AQL_NEWCONTAINER_EXPRESSION = "aql:" + SUBPACKAGE1_VARIABLE_NAME; //$NON-NLS-1$ + private static final String AQL_NEWCONTAINER_EXPRESSION = "aql:" + SUBPACKAGE1_VARIABLE_NAME; - private static final String NAME_FEATURE = "eClassifiers"; //$NON-NLS-1$ + private static final String NAME_FEATURE = "eClassifiers"; private MoveElementOperationHandler moveElementOperationHandler; @@ -96,12 +96,12 @@ public void moveElementOperationHandlerErrorCasesTest() { this.handleAndCheckExecution(null, null, this.operationTestContext.getClass1()); // Check empty expression case - this.handleAndCheckExecution("", "", this.operationTestContext.getClass1()); //$NON-NLS-1$ //$NON-NLS-2$ + this.handleAndCheckExecution("", "", this.operationTestContext.getClass1()); - this.handleAndCheckExecution(NAME_FEATURE, "UnknownExpression", this.operationTestContext.getClass1()); //$NON-NLS-1$ + this.handleAndCheckExecution(NAME_FEATURE, "UnknownExpression", this.operationTestContext.getClass1()); this.handleAndCheckExecution(NAME_FEATURE, ModelOperationServices.AQL_THROW_ERROR_EXPRESSION, this.operationTestContext.getClass1()); this.handleAndCheckExecution(NAME_FEATURE, null, this.operationTestContext.getClass1()); - this.handleAndCheckExecution("unknownFeature", AQL_NEWCONTAINER_EXPRESSION, this.operationTestContext.getClass1()); //$NON-NLS-1$ + this.handleAndCheckExecution("unknownFeature", AQL_NEWCONTAINER_EXPRESSION, this.operationTestContext.getClass1()); this.handleAndCheckExecution(null, AQL_NEWCONTAINER_EXPRESSION, this.operationTestContext.getClass1()); } diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/NavigationOperationHandlerTests.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/NavigationOperationHandlerTests.java index b937cd1824..f89f2d5893 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/NavigationOperationHandlerTests.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/NavigationOperationHandlerTests.java @@ -43,17 +43,17 @@ */ public class NavigationOperationHandlerTests { - private static final String FIRST_DIAGRAM_ID = "First id"; //$NON-NLS-1$ + private static final String FIRST_DIAGRAM_ID = "First id"; - private static final String FIRST_DIAGRAM_LABEL = "First label"; //$NON-NLS-1$ + private static final String FIRST_DIAGRAM_LABEL = "First label"; - private static final String SECOND_DIAGRAM_ID = "Second id"; //$NON-NLS-1$ + private static final String SECOND_DIAGRAM_ID = "Second id"; - private static final String SECOND_DIAGRAM_LABEL = "Second label"; //$NON-NLS-1$ + private static final String SECOND_DIAGRAM_LABEL = "Second label"; - private static final String THIRD_DIAGRAM_ID = "Third id"; //$NON-NLS-1$ + private static final String THIRD_DIAGRAM_ID = "Third id"; - private static final String THIRD_DIAGRAM_LABEL = "Third label"; //$NON-NLS-1$ + private static final String THIRD_DIAGRAM_LABEL = "Third label"; private static final String FIRST_DIAGRAM_DESCRIPTION_ID = UUID.randomUUID().toString(); diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/OperationTestContext.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/OperationTestContext.java index 0d1b0d6a62..33bccdefed 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/OperationTestContext.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/OperationTestContext.java @@ -34,9 +34,9 @@ */ public class OperationTestContext { - public static final String CLASS1_NAME = "class1Name"; //$NON-NLS-1$ + public static final String CLASS1_NAME = "class1Name"; - public static final String ROOT_PACKAGE_NAME = "rootPackageName"; //$NON-NLS-1$ + public static final String ROOT_PACKAGE_NAME = "rootPackageName"; private EPackage rootPackage; diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/SetValueOperationHandlerTests.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/SetValueOperationHandlerTests.java index 1c37040859..75732b248d 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/SetValueOperationHandlerTests.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/SetValueOperationHandlerTests.java @@ -36,7 +36,7 @@ * @author lfasani */ public class SetValueOperationHandlerTests { - private static final String NAME_FEATURE = "name"; //$NON-NLS-1$ + private static final String NAME_FEATURE = "name"; private SetValueOperationHandler setValueOperationHandler; @@ -57,9 +57,9 @@ public void initialize() { @Test public void setValueOperationHandlerNominalCaseTest() { // check the nominal case - String newName = "newName"; //$NON-NLS-1$ + String newName = "newName"; this.setValue.setFeatureName(NAME_FEATURE); - this.setValue.setValueExpression("aql:'" + newName + "'"); //$NON-NLS-1$//$NON-NLS-2$ + this.setValue.setValueExpression("aql:'" + newName + "'"); IStatus handleResult = this.setValueOperationHandler.handle(this.operationTestContext.getVariables()); @@ -81,7 +81,7 @@ public void setValueOperationHandlerErrorCasesTest() { this.handleAndCheckExecution(null, null, this.operationTestContext.getRootPackage()); // Check empty expression case - this.handleAndCheckExecution("", "", this.operationTestContext.getRootPackage()); //$NON-NLS-1$ //$NON-NLS-2$ + this.handleAndCheckExecution("", "", this.operationTestContext.getRootPackage()); // Check expression with exception case this.handleAndCheckExecution(NAME_FEATURE, ModelOperationServices.AQL_THROW_ERROR_EXPRESSION, this.operationTestContext.getRootPackage()); diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/SwitchOperationHandlerTests.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/SwitchOperationHandlerTests.java index 4261e8b3bb..07f509ca7b 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/SwitchOperationHandlerTests.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/SwitchOperationHandlerTests.java @@ -36,15 +36,15 @@ * @author lfasani */ public class SwitchOperationHandlerTests { - private static final String NAME_CASE1 = "nameCase1"; //$NON-NLS-1$ + private static final String NAME_CASE1 = "nameCase1"; - private static final String NAME_CASE2 = "nameCase2"; //$NON-NLS-1$ + private static final String NAME_CASE2 = "nameCase2"; - private static final String NAME_DEFAULT = "nameDefault"; //$NON-NLS-1$ + private static final String NAME_DEFAULT = "nameDefault"; - private static final String AQL_TRUE = "aql:true"; //$NON-NLS-1$ + private static final String AQL_TRUE = "aql:true"; - private static final String AQL_FALSE = "aql:false"; //$NON-NLS-1$ + private static final String AQL_FALSE = "aql:false"; private SwitchOperationHandler switchOperationHandler; @@ -105,9 +105,9 @@ private void testSwitchCase(String expressionCase1, String expressionCase2, Stri public void switchOperationHandlerErrorCasesTest() { // The behavior of the two following cases is strange because "" and "UnknownExpression" are considered as // true but it is the behavior in Sirius - this.testSwitchCase("", AQL_TRUE, NAME_CASE1); //$NON-NLS-1$ - this.testSwitchCase("UnknownExpression", AQL_TRUE, NAME_CASE1); //$NON-NLS-1$ - this.testSwitchCase("aql:UnknownExpression", AQL_TRUE, NAME_CASE2); //$NON-NLS-1$ + this.testSwitchCase("", AQL_TRUE, NAME_CASE1); + this.testSwitchCase("UnknownExpression", AQL_TRUE, NAME_CASE1); + this.testSwitchCase("aql:UnknownExpression", AQL_TRUE, NAME_CASE2); this.testSwitchCase(null, AQL_TRUE, NAME_CASE2); this.testSwitchCase(ModelOperationServices.AQL_THROW_ERROR_EXPRESSION, AQL_FALSE, NAME_DEFAULT); } diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/UnsetOperationHandlerTests.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/UnsetOperationHandlerTests.java index 61c54333ed..36d86b5509 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/UnsetOperationHandlerTests.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/operations/UnsetOperationHandlerTests.java @@ -40,11 +40,11 @@ */ public class UnsetOperationHandlerTests { - private static final String NAME_FEATURE = "name"; //$NON-NLS-1$ + private static final String NAME_FEATURE = "name"; - private static final String EFACTORYINSTANCE_FEATURE = "eFactoryInstance"; //$NON-NLS-1$ + private static final String EFACTORYINSTANCE_FEATURE = "eFactoryInstance"; - private static final String ECLASSIFIERS_FEATURE = "eClassifiers"; //$NON-NLS-1$ + private static final String ECLASSIFIERS_FEATURE = "eClassifiers"; private UnsetOperationHandler unsetOperationHandler; @@ -93,7 +93,7 @@ public void unsetMonoValueFeatureTests() { public void unsetMultiValuedFeatureTests() { // check that class1 has been removed from rootPackage this.unset.setFeatureName(ECLASSIFIERS_FEATURE); - this.unset.setElementExpression("aql:self.eClassifiers->first()"); //$NON-NLS-1$ + this.unset.setElementExpression("aql:self.eClassifiers->first()"); EClassifier secondClass = this.operationTestContext.getRootPackage().getEClassifiers().get(1); IStatus handleResult = this.unsetOperationHandler.handle(this.operationTestContext.getVariables()); @@ -127,7 +127,7 @@ public void unsetOperationHandlerErrorCasesTest() { this.handleAndCheckExecution(null, null, this.operationTestContext.getRootPackage()); // Check empty expression case - this.handleAndCheckExecution("", "", this.operationTestContext.getRootPackage()); //$NON-NLS-1$ //$NON-NLS-2$ + this.handleAndCheckExecution("", "", this.operationTestContext.getRootPackage()); // Check expression with exception case this.handleAndCheckExecution(NAME_FEATURE, ModelOperationServices.AQL_THROW_ERROR_EXPRESSION, this.operationTestContext.getRootPackage()); @@ -138,7 +138,7 @@ public void unsetOperationHandlerErrorCasesTest() { */ @Test public void unsetFromDynamicFeatureName() { - this.unset.setFeatureName("aql:'na' + 'me'"); //$NON-NLS-1$ + this.unset.setFeatureName("aql:'na' + 'me'"); this.unset.setElementExpression(null); IStatus handleResult = this.unsetOperationHandler.handle(this.operationTestContext.getVariables()); diff --git a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/properties/FormRendererTests.java b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/properties/FormRendererTests.java index 16261d55b4..4937211728 100644 --- a/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/properties/FormRendererTests.java +++ b/packages/compatibility/backend/sirius-components-compatibility-emf/src/test/java/org/eclipse/sirius/components/compatibility/emf/compatibility/properties/FormRendererTests.java @@ -57,9 +57,9 @@ */ public class FormRendererTests { - private static final String AQL_TRUE = "aql:true"; //$NON-NLS-1$ + private static final String AQL_TRUE = "aql:true"; - private static final String AQL_SELF_EPACKAGE_ECLASSIFIERS = "aql:self.ePackage.eClassifiers"; //$NON-NLS-1$ + private static final String AQL_SELF_EPACKAGE_ECLASSIFIERS = "aql:self.ePackage.eClassifiers"; @Test public void testEcoreModel() { @@ -133,7 +133,7 @@ private ViewExtensionDescription createSiriusProperties() { private org.eclipse.sirius.properties.DynamicMappingIfDescription createIfDescription(org.eclipse.sirius.properties.CheckboxDescription checkboxDescription) { org.eclipse.sirius.properties.DynamicMappingIfDescription ifDescription = PropertiesFactory.eINSTANCE.createDynamicMappingIfDescription(); - ifDescription.setName("myIf"); //$NON-NLS-1$ + ifDescription.setName("myIf"); ifDescription.setPredicateExpression(AQL_TRUE); ifDescription.setWidget(checkboxDescription); return ifDescription; @@ -141,26 +141,26 @@ private org.eclipse.sirius.properties.DynamicMappingIfDescription createIfDescri private org.eclipse.sirius.properties.DynamicMappingForDescription createForDescription() { org.eclipse.sirius.properties.DynamicMappingForDescription forDescription = PropertiesFactory.eINSTANCE.createDynamicMappingForDescription(); - forDescription.setName("myFor"); //$NON-NLS-1$ - forDescription.setIterator("element"); //$NON-NLS-1$ + forDescription.setName("myFor"); + forDescription.setIterator("element"); forDescription.setIterableExpression(AQL_SELF_EPACKAGE_ECLASSIFIERS); return forDescription; } private org.eclipse.sirius.properties.SelectDescription createSelect() { org.eclipse.sirius.properties.SelectDescription selectDescription = PropertiesFactory.eINSTANCE.createSelectDescription(); - selectDescription.setName("myRadio"); //$NON-NLS-1$ - selectDescription.setLabelExpression("my select"); //$NON-NLS-1$ - selectDescription.setValueExpression("EClassifier"); //$NON-NLS-1$ + selectDescription.setName("myRadio"); + selectDescription.setLabelExpression("my select"); + selectDescription.setValueExpression("EClassifier"); selectDescription.setCandidatesExpression(AQL_SELF_EPACKAGE_ECLASSIFIERS); return selectDescription; } private org.eclipse.sirius.properties.RadioDescription createRadio() { org.eclipse.sirius.properties.RadioDescription radioDescription = PropertiesFactory.eINSTANCE.createRadioDescription(); - radioDescription.setName("myRadio"); //$NON-NLS-1$ - radioDescription.setLabelExpression("my radio"); //$NON-NLS-1$ - radioDescription.setValueExpression("EClass"); //$NON-NLS-1$ + radioDescription.setName("myRadio"); + radioDescription.setLabelExpression("my radio"); + radioDescription.setValueExpression("EClass"); radioDescription.setCandidatesExpression(AQL_SELF_EPACKAGE_ECLASSIFIERS); radioDescription.setValueExpression(AQL_TRUE); return radioDescription; @@ -168,43 +168,43 @@ private org.eclipse.sirius.properties.RadioDescription createRadio() { private org.eclipse.sirius.properties.CheckboxDescription createCheckbox() { org.eclipse.sirius.properties.CheckboxDescription checkboxDescription = PropertiesFactory.eINSTANCE.createCheckboxDescription(); - checkboxDescription.setName("myCheckbox"); //$NON-NLS-1$ - checkboxDescription.setLabelExpression("my checkbox"); //$NON-NLS-1$ + checkboxDescription.setName("myCheckbox"); + checkboxDescription.setLabelExpression("my checkbox"); checkboxDescription.setValueExpression(AQL_TRUE); return checkboxDescription; } private org.eclipse.sirius.properties.TextAreaDescription createTextArea() { org.eclipse.sirius.properties.TextAreaDescription textAreaDescription = PropertiesFactory.eINSTANCE.createTextAreaDescription(); - textAreaDescription.setName("myTextArea"); //$NON-NLS-1$ - textAreaDescription.setLabelExpression("my TextField"); //$NON-NLS-1$ - textAreaDescription.setValueExpression("aql:self.name"); //$NON-NLS-1$ + textAreaDescription.setName("myTextArea"); + textAreaDescription.setLabelExpression("my TextField"); + textAreaDescription.setValueExpression("aql:self.name"); return textAreaDescription; } private org.eclipse.sirius.properties.TextDescription createTextfield() { org.eclipse.sirius.properties.TextDescription textDescription = PropertiesFactory.eINSTANCE.createTextDescription(); - textDescription.setName("myTextfield"); //$NON-NLS-1$ - textDescription.setLabelExpression("my TextField"); //$NON-NLS-1$ - textDescription.setValueExpression("aql:self.name"); //$NON-NLS-1$ + textDescription.setName("myTextfield"); + textDescription.setLabelExpression("my TextField"); + textDescription.setValueExpression("aql:self.name"); return textDescription; } private org.eclipse.sirius.properties.PageDescription createPageDescription(org.eclipse.sirius.properties.GroupDescription groupDescription) { org.eclipse.sirius.properties.PageDescription pageDescription = PropertiesFactory.eINSTANCE.createPageDescription(); pageDescription.getGroups().add(groupDescription); - pageDescription.setName("myPage"); //$NON-NLS-1$ - pageDescription.setSemanticCandidateExpression("var:self"); //$NON-NLS-1$ - pageDescription.setLabelExpression("Page"); //$NON-NLS-1$ + pageDescription.setName("myPage"); + pageDescription.setSemanticCandidateExpression("var:self"); + pageDescription.setLabelExpression("Page"); return pageDescription; } private org.eclipse.sirius.properties.GroupDescription createGroupDescription() { org.eclipse.sirius.properties.GroupDescription groupDescription = PropertiesFactory.eINSTANCE.createGroupDescription(); - groupDescription.setName("myGroup"); //$NON-NLS-1$ - groupDescription.setLabelExpression("Group"); //$NON-NLS-1$ - groupDescription.setSemanticCandidateExpression("var:self"); //$NON-NLS-1$ - groupDescription.setDomainClass("EPackage"); //$NON-NLS-1$ + groupDescription.setName("myGroup"); + groupDescription.setLabelExpression("Group"); + groupDescription.setSemanticCandidateExpression("var:self"); + groupDescription.setDomainClass("EPackage"); return groupDescription; } @@ -256,7 +256,7 @@ private void checkIdsInGroups(List groups) { List widgets = group.getWidgets(); for (int i = 0; i < widgets.size(); i++) { AbstractWidget abstractWidget = widgets.get(i); - assertThat(abstractWidget.getId()).endsWith("#" + i); //$NON-NLS-1$ + assertThat(abstractWidget.getId()).endsWith("#" + i); } } } diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/api/IIdentifierProvider.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/api/IIdentifierProvider.java index 63c4b0911e..4f8009d44a 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/api/IIdentifierProvider.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/api/IIdentifierProvider.java @@ -33,7 +33,7 @@ class NoOp implements IIdentifierProvider { @Override public String getIdentifier(Object element) { - return ""; //$NON-NLS-1$ + return ""; } @Override diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/configuration/CompatibilityMessageServiceConfiguration.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/configuration/CompatibilityMessageServiceConfiguration.java index a3ddb37ad8..819814128b 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/configuration/CompatibilityMessageServiceConfiguration.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/configuration/CompatibilityMessageServiceConfiguration.java @@ -24,7 +24,7 @@ */ @Configuration public class CompatibilityMessageServiceConfiguration { - private static final String PATH = "messages/sirius-components-compatibility"; //$NON-NLS-1$ + private static final String PATH = "messages/sirius-components-compatibility"; @Bean MessageSourceAccessor compatibilityMessageAccessor() { diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/AbstractNodeMappingConverter.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/AbstractNodeMappingConverter.java index 966e766082..dcccfb28e9 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/AbstractNodeMappingConverter.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/AbstractNodeMappingConverter.java @@ -173,7 +173,7 @@ private Function getLabelExpressionProvider(AQLInterpre Function abstractNodeMappingDescriptionProvider) { return variableManager -> { org.eclipse.sirius.viewpoint.description.style.LabelStyleDescription styleDescription = abstractNodeMappingDescriptionProvider.apply(variableManager); - String labelExpression = Optional.ofNullable(styleDescription).map(BasicLabelStyleDescription::getLabelExpression).orElse(""); //$NON-NLS-1$ + String labelExpression = Optional.ofNullable(styleDescription).map(BasicLabelStyleDescription::getLabelExpression).orElse(""); return new StringValueProvider(interpreter, labelExpression).apply(variableManager); }; } @@ -210,7 +210,7 @@ private List getChildNodeDescriptions(AbstractNodeMapping abstr private BasicLabelStyleDescription getDefaultLabelStyle() { var labelStyle = StyleFactory.eINSTANCE.createBasicLabelStyleDescription(); - labelStyle.setLabelExpression(""); //$NON-NLS-1$ + labelStyle.setLabelExpression(""); labelStyle.setShowIcon(true); labelStyle.setLabelSize(16); return labelStyle; diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/AbstractNodeMappingStyleProvider.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/AbstractNodeMappingStyleProvider.java index e874371c9d..e842c7441d 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/AbstractNodeMappingStyleProvider.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/AbstractNodeMappingStyleProvider.java @@ -82,8 +82,8 @@ private INodeStyle getNodeStyle(VariableManager variableManager, LabelStyleDescr // @formatter:off style = RectangularNodeStyle.newRectangularNodeStyle() - .color("rgb(200, 200, 200)") //$NON-NLS-1$ - .borderColor("rgb(0, 0, 0)") //$NON-NLS-1$ + .color("rgb(200, 200, 200)") + .borderColor("rgb(0, 0, 0)") .borderSize(1) .borderStyle(LineStyle.Solid) .build(); @@ -114,7 +114,7 @@ private boolean shouldBeConsideredAsListItemNodeStyle(VariableManager variableMa private INodeStyle createListItemNodeStyle(VariableManager variableManager, LabelStyleDescription nodeStyleDescription) { // @formatter:off return IconLabelNodeStyle.newIconLabelNodeStyle() - .backgroundColor("transparent") //$NON-NLS-1$ + .backgroundColor("transparent") .build(); // @formatter:on } diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/ColorDescriptionConverter.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/ColorDescriptionConverter.java index 30689c2280..3c3dba3316 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/ColorDescriptionConverter.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/ColorDescriptionConverter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -27,7 +27,7 @@ */ public class ColorDescriptionConverter { - private static final String DEFAULT_COLOR = "#000000"; //$NON-NLS-1$ + private static final String DEFAULT_COLOR = "#000000"; private final AQLInterpreter interpreter; @@ -55,6 +55,6 @@ public String convert(ColorDescription colorDescription) { } private String toHex(int r, int g, int b) { - return String.format("#%02x%02x%02x", r, g, b); //$NON-NLS-1$ + return String.format("#%02x%02x%02x", r, g, b); } } diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/DiagramLabelProvider.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/DiagramLabelProvider.java index 56fb592105..275368a851 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/DiagramLabelProvider.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/DiagramLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -40,7 +40,7 @@ public DiagramLabelProvider(AQLInterpreter interpreter, org.eclipse.sirius.diagr String titleExpression = diagramDescription.getTitleExpression(); if (titleExpression.isBlank()) { String defaultName = Optional.ofNullable(diagramDescription.getLabel()).orElse(diagramDescription.getName()); - titleExpression = MessageFormat.format("aql:''new {0}''", defaultName.replace("'", "''")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + titleExpression = MessageFormat.format("aql:''new {0}''", defaultName.replace("'", "''")); } this.labelExpression = titleExpression; } @@ -57,7 +57,7 @@ public String apply(VariableManager variableManager) { return optionalLabel.orElseGet(() -> { Result result = this.interpreter.evaluateExpression(variableManager.getVariables(), this.labelExpression); - return result.asString().orElse(""); //$NON-NLS-1$ + return result.asString().orElse(""); }); } diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/EdgeMappingConverter.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/EdgeMappingConverter.java index 43f856ec0c..409281b6b9 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/EdgeMappingConverter.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/EdgeMappingConverter.java @@ -102,15 +102,15 @@ public EdgeDescription convert(EdgeMapping edgeMapping, AQLInterpreter interpret Optional optionalBeginLabelDescription = Optional.ofNullable(style) .map(EdgeStyleDescription::getBeginLabelStyleDescription) - .map(labelDescription -> this.createLabelDescription(interpreter, labelStyleDescriptionConverter, labelDescription, "_beginlabel", edgeMapping)); //$NON-NLS-1$ + .map(labelDescription -> this.createLabelDescription(interpreter, labelStyleDescriptionConverter, labelDescription, "_beginlabel", edgeMapping)); Optional optionalCenterLabelDescription = Optional.ofNullable(style) .map(EdgeStyleDescription::getCenterLabelStyleDescription) - .map(labelDescription -> this.createLabelDescription(interpreter, labelStyleDescriptionConverter, labelDescription, "_centerlabel", edgeMapping)); //$NON-NLS-1$ + .map(labelDescription -> this.createLabelDescription(interpreter, labelStyleDescriptionConverter, labelDescription, "_centerlabel", edgeMapping)); Optional optionalEndLabelDescription = Optional.ofNullable(style) .map(EdgeStyleDescription::getEndLabelStyleDescription) - .map(labelDescription -> this.createLabelDescription(interpreter, labelStyleDescriptionConverter, labelDescription, "_endlabel", edgeMapping)); //$NON-NLS-1$ + .map(labelDescription -> this.createLabelDescription(interpreter, labelStyleDescriptionConverter, labelDescription, "_endlabel", edgeMapping)); ToolConverter toolConverter = new ToolConverter(interpreter, this.editService, this.modelOperationHandlerSwitchProvider); var deleteHandler = toolConverter.createDeleteToolHandler(edgeMapping.getDeletionDescription()); @@ -185,7 +185,7 @@ private Function> getSemanticElementsProvider(AQLInterp if (edgeMapping.isUseDomainElement()) { String semanticCandidatesExpression = edgeMapping.getSemanticCandidatesExpression(); String preconditionExpression = edgeMapping.getPreconditionExpression(); - String domainClass = Optional.ofNullable(edgeMapping.getDomainClass()).orElse(""); //$NON-NLS-1$ + String domainClass = Optional.ofNullable(edgeMapping.getDomainClass()).orElse(""); semanticElementsProvider = this.semanticCandidatesProviderFactory.getSemanticCandidatesProvider(interpreter, domainClass, semanticCandidatesExpression, preconditionExpression); } else { // @formatter:off diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/LabelStyleDescriptionConverter.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/LabelStyleDescriptionConverter.java index 64db7749fe..0c33abf3f5 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/LabelStyleDescriptionConverter.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/LabelStyleDescriptionConverter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -41,7 +41,7 @@ public LabelStyleDescription convert(org.eclipse.sirius.viewpoint.description.st List fontFormats = labelStyleDescription.getLabelFormat(); Function iconURLProvider = (variableManager) -> { - String iconURL = ""; //$NON-NLS-1$ + String iconURL = ""; if (labelStyleDescription.isShowIcon()) { // @formatter:off String iconPath = labelStyleDescription.getIconPath(); @@ -53,7 +53,7 @@ public LabelStyleDescription convert(org.eclipse.sirius.viewpoint.description.st } else { iconURL = variableManager.get(VariableManager.SELF, Object.class) .map(this.objectService::getImagePath) - .orElse(""); //$NON-NLS-1$ + .orElse(""); } // @formatter:on } diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/SelectModelElementVariableConverter.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/SelectModelElementVariableConverter.java index 7f41374829..43584cf4dc 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/SelectModelElementVariableConverter.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/SelectModelElementVariableConverter.java @@ -64,7 +64,7 @@ public SelectionDescription convert(SelectModelElementVariable selectModelElemen .messageProvider(variableManager -> { String message = selectModelElementVariable.getMessage(); if (message == null) { - message = ""; //$NON-NLS-1$ + message = ""; } return message; }) @@ -73,7 +73,7 @@ public SelectionDescription convert(SelectModelElementVariable selectModelElemen .iconURLProvider(variableManager -> variableManager.get(VariableManager.SELF, Object.class).map(this.objectService::getImagePath).orElse(null)) .targetObjectIdProvider(variableManager -> variableManager.get(VariableManager.SELF, Object.class).map(this.objectService::getId).orElse(null)) .selectionObjectsIdProvider(variableManager -> variableManager.get(VariableManager.SELF, Object.class).map(this.objectService::getId).orElse(null)) - .label("Selection Description") //$NON-NLS-1$ + .label("Selection Description") .canCreatePredicate(variableManager -> false) .build(); // @formatter:on diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/ToolConverter.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/ToolConverter.java index c2baba8b59..8b4ef104b6 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/ToolConverter.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/ToolConverter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -46,9 +46,9 @@ */ public class ToolConverter { - public static final String ELEMENT_VIEW = "elementView"; //$NON-NLS-1$ + public static final String ELEMENT_VIEW = "elementView"; - public static final String CONTAINER_VIEW = "containerView"; //$NON-NLS-1$ + public static final String CONTAINER_VIEW = "containerView"; private final AQLInterpreter interpreter; @@ -68,11 +68,11 @@ public BiFunction createDirectEditToolHandler( InitialOperation initialOperation = optionalInitialOperation.get(); return (variableManager, newText) -> { Map variables = variableManager.getVariables(); - variables.put("arg0", newText); //$NON-NLS-1$ + variables.put("arg0", newText); var modelOperationHandlerSwitch = this.modelOperationHandlerSwitchProvider.getModelOperationHandlerSwitch(this.interpreter); return modelOperationHandlerSwitch.apply(initialOperation.getFirstModelOperations()).map(handler -> { return handler.handle(variables); - }).orElse(new Failure("")); //$NON-NLS-1$ + }).orElse(new Failure("")); }; } else { // If no direct edit tool is defined, nothing to do but consider this OK. @@ -88,7 +88,7 @@ public Function createDeleteToolHandler(DeleteElementD Map variables = variableManager.getVariables(); // Sirius Desktop Delete Tools expect an "element" variable to be available with the value // of the initial invocation context (self). - variables.put("element", variables.get(VariableManager.SELF)); //$NON-NLS-1$ + variables.put("element", variables.get(VariableManager.SELF)); var selectedNode = variableManager.get(Node.SELECTED_NODE, Node.class); if (selectedNode.isPresent()) { variables.put(ELEMENT_VIEW, selectedNode.get()); @@ -100,7 +100,7 @@ public Function createDeleteToolHandler(DeleteElementD var modelOperationHandlerSwitch = this.modelOperationHandlerSwitchProvider.getModelOperationHandlerSwitch(this.interpreter); return modelOperationHandlerSwitch.apply(initialOperation.getFirstModelOperations()).map(handler -> { return handler.handle(variables); - }).orElse(new Failure("")); //$NON-NLS-1$ + }).orElse(new Failure("")); }; } else { // If no delete tool is defined, execute the default behavior: delete the underlying semantic element. @@ -129,7 +129,7 @@ public Function createDeleteToolHandler(DeleteElementD return new Success(); } - return new Failure(""); //$NON-NLS-1$ + return new Failure(""); }; } } @@ -142,11 +142,11 @@ public Function createDropToolHandler(ContainerDropDes var modelOperationHandlerSwitch = this.modelOperationHandlerSwitchProvider.getModelOperationHandlerSwitch(this.interpreter); return modelOperationHandlerSwitch.apply(initialOperation.getFirstModelOperations()).map(handler -> { return handler.handle(variableManager.getVariables()); - }).orElse(new Failure("")); //$NON-NLS-1$ + }).orElse(new Failure("")); }; } - return variableManager -> new Failure(""); //$NON-NLS-1$ + return variableManager -> new Failure(""); } private Object getParentNode(Node node, Diagram diagram) { diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/WorkspaceImageDescriptionConverter.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/WorkspaceImageDescriptionConverter.java index 6137a3feb8..b5d6da260e 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/WorkspaceImageDescriptionConverter.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/diagrams/WorkspaceImageDescriptionConverter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -31,7 +31,7 @@ */ public class WorkspaceImageDescriptionConverter { - private static final String WORKSPACE_PATH = "workspacePath"; //$NON-NLS-1$ + private static final String WORKSPACE_PATH = "workspacePath"; private static final int DEFAULT_SCALING_FACTOR = 1; diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/ControlDescriptionConverter.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/ControlDescriptionConverter.java index 31b2ba0935..b42abc743b 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/ControlDescriptionConverter.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/ControlDescriptionConverter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -58,7 +58,7 @@ public Optional convert(ControlDescription controlDe } else if (controlDescription instanceof DynamicMappingForDescription) { optionalControlDescription = this.convertFor((DynamicMappingForDescription) controlDescription); } else { - this.logger.warn("The provided type {} is not yet handled", controlDescription.getClass().getName()); //$NON-NLS-1$ + this.logger.warn("The provided type {} is not yet handled", controlDescription.getClass().getName()); } return optionalControlDescription; } diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/GroupDescriptionConverter.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/GroupDescriptionConverter.java index 9e5f5c1481..7f5f7b18b3 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/GroupDescriptionConverter.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/GroupDescriptionConverter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -58,7 +58,7 @@ public GroupDescription convert(org.eclipse.sirius.properties.GroupDescription s this.modelOperationHandlerSwitchProvider); Function idProvider = variableManager -> String.valueOf(siriusGroup2SiriusWebGroup.size()); - StringValueProvider labelProvider = new StringValueProvider(this.interpreter, Optional.ofNullable(siriusGroupDescription.getLabelExpression()).orElse("")); //$NON-NLS-1$ + StringValueProvider labelProvider = new StringValueProvider(this.interpreter, Optional.ofNullable(siriusGroupDescription.getLabelExpression()).orElse("")); // @formatter:off List controlDescriptions = siriusGroupDescription.getControls().stream() diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/PageDescriptionConverter.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/PageDescriptionConverter.java index 5d2319c52d..6cd722a727 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/PageDescriptionConverter.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/PageDescriptionConverter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -50,9 +50,9 @@ public PageDescription convert(org.eclipse.sirius.properties.PageDescription sir Map siriusGroup2SiriusWebGroup) { StringValueProvider labelProvider = new StringValueProvider(this.interpreter, siriusPageDescription.getLabelExpression()); - String domainClass = Optional.ofNullable(siriusPageDescription.getDomainClass()).orElse(""); //$NON-NLS-1$ - String semanticCandidatesExpression = Optional.ofNullable(siriusPageDescription.getSemanticCandidateExpression()).orElse(""); //$NON-NLS-1$ - String preconditionExpression = Optional.ofNullable(siriusPageDescription.getPreconditionExpression()).orElse(""); //$NON-NLS-1$ + String domainClass = Optional.ofNullable(siriusPageDescription.getDomainClass()).orElse(""); + String semanticCandidatesExpression = Optional.ofNullable(siriusPageDescription.getSemanticCandidateExpression()).orElse(""); + String preconditionExpression = Optional.ofNullable(siriusPageDescription.getPreconditionExpression()).orElse(""); var semanticCandidatesProvider = this.semanticCandidatesProviderFactory.getSemanticCandidatesProvider(this.interpreter, domainClass, semanticCandidatesExpression, preconditionExpression); Predicate canCreatePredicate = (variableManager) -> { diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/ViewExtensionDescriptionConverter.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/ViewExtensionDescriptionConverter.java index d0c08cf474..7e4f60e215 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/ViewExtensionDescriptionConverter.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/ViewExtensionDescriptionConverter.java @@ -91,7 +91,7 @@ public FormDescription convert(ViewExtensionDescription viewExtensionDescription .map(self -> (List) self) .flatMap(self -> self.stream().findFirst()) .map(this.objectService::getFullLabel) - .orElse("Properties"); //$NON-NLS-1$ + .orElse("Properties"); Function targetObjectIdProvider = variableManager -> variableManager.get(VariableManager.SELF, Object.class) .filter(self -> self instanceof List) diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/WidgetDescriptionConverter.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/WidgetDescriptionConverter.java index 12be8d2ffe..01696bbe53 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/WidgetDescriptionConverter.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/WidgetDescriptionConverter.java @@ -53,7 +53,7 @@ */ public class WidgetDescriptionConverter { - private static final String NEW_VALUE = "newValue"; //$NON-NLS-1$ + private static final String NEW_VALUE = "newValue"; private final Logger logger = LoggerFactory.getLogger(WidgetDescriptionConverter.class); @@ -86,16 +86,16 @@ public Optional convert(WidgetDescription controlDesc } else if (controlDescription instanceof org.eclipse.sirius.properties.SelectDescription) { optionalWidgetDescription = Optional.of(this.convertSelect((org.eclipse.sirius.properties.SelectDescription) controlDescription)); } else if (controlDescription != null) { - this.logger.warn("The provided type {} is not yet handled", controlDescription.getClass().getName()); //$NON-NLS-1$ + this.logger.warn("The provided type {} is not yet handled", controlDescription.getClass().getName()); } return optionalWidgetDescription; } private TextfieldDescription convertTextfield(org.eclipse.sirius.properties.TextDescription textDescription) { - String labelExpression = Optional.ofNullable(textDescription.getLabelExpression()).orElse(""); //$NON-NLS-1$ + String labelExpression = Optional.ofNullable(textDescription.getLabelExpression()).orElse(""); StringValueProvider labelProvider = new StringValueProvider(this.interpreter, labelExpression); - String valueExpression = Optional.ofNullable(textDescription.getValueExpression()).orElse(""); //$NON-NLS-1$ + String valueExpression = Optional.ofNullable(textDescription.getValueExpression()).orElse(""); StringValueProvider valueProvider = new StringValueProvider(this.interpreter, valueExpression); BiFunction newValueHandler = this.getNewValueHandler(textDescription.getInitialOperation()); @@ -107,8 +107,8 @@ private TextfieldDescription convertTextfield(org.eclipse.sirius.properties.Text .valueProvider(valueProvider) .newValueHandler(newValueHandler) .diagnosticsProvider(this.getDiagnosticsProvider()) - .kindProvider(object -> "") //$NON-NLS-1$ - .messageProvider(object -> "") //$NON-NLS-1$ + .kindProvider(object -> "") + .messageProvider(object -> "") .build(); // @formatter:on @@ -121,10 +121,10 @@ private Function> getDiagnosticsProvider() { } private TextareaDescription convertTextarea(org.eclipse.sirius.properties.TextAreaDescription textAreaDescription) { - String labelExpression = Optional.ofNullable(textAreaDescription.getLabelExpression()).orElse(""); //$NON-NLS-1$ + String labelExpression = Optional.ofNullable(textAreaDescription.getLabelExpression()).orElse(""); StringValueProvider labelProvider = new StringValueProvider(this.interpreter, labelExpression); - String valueExpression = Optional.ofNullable(textAreaDescription.getValueExpression()).orElse(""); //$NON-NLS-1$ + String valueExpression = Optional.ofNullable(textAreaDescription.getValueExpression()).orElse(""); StringValueProvider valueProvider = new StringValueProvider(this.interpreter, valueExpression); BiFunction newValueHandler = this.getNewValueHandler(textAreaDescription.getInitialOperation()); @@ -136,8 +136,8 @@ private TextareaDescription convertTextarea(org.eclipse.sirius.properties.TextAr .valueProvider(valueProvider) .newValueHandler(newValueHandler) .diagnosticsProvider(variableManager -> List.of()) - .kindProvider(object -> "") //$NON-NLS-1$ - .messageProvider(object -> "") //$NON-NLS-1$ + .kindProvider(object -> "") + .messageProvider(object -> "") .build(); // @formatter:on @@ -152,12 +152,12 @@ private BiFunction getNewValueHandler(InitialO var modelOperationHandlerSwitch = this.modelOperationHandlerSwitchProvider.getModelOperationHandlerSwitch(this.interpreter); Optional optionalModelOperationHandler = modelOperationHandlerSwitch.apply(modelOperation); - return optionalModelOperationHandler.map(handler -> handler.handle(childVariableManager.getVariables())).orElse(new Failure("")); //$NON-NLS-1$ + return optionalModelOperationHandler.map(handler -> handler.handle(childVariableManager.getVariables())).orElse(new Failure("")); }; } private RadioDescription convertRadio(org.eclipse.sirius.properties.RadioDescription radioDescription) { - String labelExpression = Optional.ofNullable(radioDescription.getLabelExpression()).orElse(""); //$NON-NLS-1$ + String labelExpression = Optional.ofNullable(radioDescription.getLabelExpression()).orElse(""); StringValueProvider labelProvider = new StringValueProvider(this.interpreter, labelExpression); Function optionIdProvider = variableManager -> { @@ -177,7 +177,7 @@ private RadioDescription convertRadio(org.eclipse.sirius.properties.RadioDescrip return optional.orElse(Collections.emptyList()); }; - String candidateDisplayExpression = Optional.ofNullable(radioDescription.getCandidateDisplayExpression()).orElse(""); //$NON-NLS-1$ + String candidateDisplayExpression = Optional.ofNullable(radioDescription.getCandidateDisplayExpression()).orElse(""); StringValueProvider optionLabelProvider = new StringValueProvider(this.interpreter, candidateDisplayExpression); BiFunction newValueHandler = (variableManager, newValue) -> { @@ -198,7 +198,7 @@ private RadioDescription convertRadio(org.eclipse.sirius.properties.RadioDescrip Optional optionalModelOperationHandler = modelOperationHandlerSwitch.apply(modelOperation); return optionalModelOperationHandler.map(handler -> { return handler.handle(childVariableManager.getVariables()); - }).orElse(new Failure("")); //$NON-NLS-1$ + }).orElse(new Failure("")); }; // @formatter:off @@ -211,8 +211,8 @@ private RadioDescription convertRadio(org.eclipse.sirius.properties.RadioDescrip .optionsProvider(optionsProvider) .newValueHandler(newValueHandler) .diagnosticsProvider(variableManager -> List.of()) - .kindProvider(object -> "") //$NON-NLS-1$ - .messageProvider(object -> "") //$NON-NLS-1$ + .kindProvider(object -> "") + .messageProvider(object -> "") .build(); // @formatter:on @@ -232,7 +232,7 @@ private SelectDescription convertSelect(org.eclipse.sirius.properties.SelectDesc return this.interpreter.evaluateExpression(variableManager.getVariables(), candidateExpression).asObjects().orElse(new ArrayList<>()); }; - String candidateDisplayExpression = Optional.ofNullable(selectDescription.getCandidateDisplayExpression()).orElse(""); //$NON-NLS-1$ + String candidateDisplayExpression = Optional.ofNullable(selectDescription.getCandidateDisplayExpression()).orElse(""); StringValueProvider optionLabelProvider = new StringValueProvider(this.interpreter, candidateDisplayExpression); Function optionIdProvider = variableManager -> { @@ -249,7 +249,7 @@ private SelectDescription convertSelect(org.eclipse.sirius.properties.SelectDesc var modelOperationHandlerSwitch = this.modelOperationHandlerSwitchProvider.getModelOperationHandlerSwitch(this.interpreter); Optional optionalModelOperationHandler = modelOperationHandlerSwitch.apply(modelOperation); - return optionalModelOperationHandler.map(handler -> handler.handle(variables)).orElse(new Failure("")); //$NON-NLS-1$ + return optionalModelOperationHandler.map(handler -> handler.handle(variables)).orElse(new Failure("")); }; // @formatter:off @@ -262,8 +262,8 @@ private SelectDescription convertSelect(org.eclipse.sirius.properties.SelectDesc .optionLabelProvider(optionLabelProvider) .newValueHandler(newValueHandler) .diagnosticsProvider(variableManager -> List.of()) - .kindProvider(object -> "") //$NON-NLS-1$ - .messageProvider(object -> "") //$NON-NLS-1$ + .kindProvider(object -> "") + .messageProvider(object -> "") .build(); // @formatter:on @@ -281,10 +281,10 @@ private CheckboxDescription convertCheckbox(org.eclipse.sirius.properties.Checkb var modelOperationHandlerSwitch = this.modelOperationHandlerSwitchProvider.getModelOperationHandlerSwitch(this.interpreter); Optional optionalModelOperationHandler = modelOperationHandlerSwitch.apply(modelOperation); - return optionalModelOperationHandler.map(handler -> handler.handle(variables)).orElse(new Failure("")); //$NON-NLS-1$ + return optionalModelOperationHandler.map(handler -> handler.handle(variables)).orElse(new Failure("")); }; - String valueExpression = Optional.ofNullable(checkboxDescription.getValueExpression()).orElse(""); //$NON-NLS-1$ + String valueExpression = Optional.ofNullable(checkboxDescription.getValueExpression()).orElse(""); Function valueProvider = new BooleanValueProvider(this.interpreter, valueExpression); //@formatter:off @@ -294,8 +294,8 @@ private CheckboxDescription convertCheckbox(org.eclipse.sirius.properties.Checkb .valueProvider(valueProvider) .newValueHandler(newValueHandler) .diagnosticsProvider(variableManager -> List.of()) - .kindProvider(object -> "") //$NON-NLS-1$ - .messageProvider(object -> "") //$NON-NLS-1$ + .kindProvider(object -> "") + .messageProvider(object -> "") .build(); // @formatter:on } diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/WidgetIdProvider.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/WidgetIdProvider.java index 2db8096692..0f23cb852c 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/WidgetIdProvider.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/forms/WidgetIdProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -43,11 +43,11 @@ public String apply(VariableManager variableManager) { if (optionalCounter.isPresent() && optionalEObject.isPresent()) { WidgetIdCounter counter = optionalCounter.get(); EObject eObject = optionalEObject.get(); - String id = EcoreUtil.getURI(eObject).toString() + "#" + counter.getCounter(); //$NON-NLS-1$ + String id = EcoreUtil.getURI(eObject).toString() + "#" + counter.getCounter(); counter.increment(); return id; } - return ""; //$NON-NLS-1$ + return ""; } } diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/messages/ICompatibilityMessageService.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/messages/ICompatibilityMessageService.java index 447b400d6e..77f1490d99 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/messages/ICompatibilityMessageService.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/messages/ICompatibilityMessageService.java @@ -34,17 +34,17 @@ class NoOp implements ICompatibilityMessageService { @Override public String noReconnectionToolDefined() { - return ""; //$NON-NLS-1$ + return ""; } @Override public String toolExecutionError() { - return ""; //$NON-NLS-1$ + return ""; } @Override public String reconnectionToolCannotBeHandled() { - return ""; //$NON-NLS-1$ + return ""; } } diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/messages/MessageConstants.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/messages/MessageConstants.java index 81f60704db..19197410f9 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/messages/MessageConstants.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/messages/MessageConstants.java @@ -19,11 +19,11 @@ */ public final class MessageConstants { - public static final String NO_RECONNECTION_TOOL_DEFINED = "NO_RECONNECTION_TOOL_DEFINED"; //$NON-NLS-1$ + public static final String NO_RECONNECTION_TOOL_DEFINED = "NO_RECONNECTION_TOOL_DEFINED"; - public static final String TOOL_EXECUTION_ERROR = "TOOL_EXECUTION_ERROR"; //$NON-NLS-1$ + public static final String TOOL_EXECUTION_ERROR = "TOOL_EXECUTION_ERROR"; - public static final String TOOL_CANNOT_BE_HANDLED = "TOOL_CANNOT_BE_HANDLED"; //$NON-NLS-1$ + public static final String TOOL_CANNOT_BE_HANDLED = "TOOL_CANNOT_BE_HANDLED"; private MessageConstants() { // Prevent instantiation diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/ImageConstants.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/ImageConstants.java index 16acd40228..6c970b75ab 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/ImageConstants.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/ImageConstants.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -18,11 +18,11 @@ * @author lfasani */ public final class ImageConstants { - public static final String IMAGES_ROOT_FOLDER = "/icons/svg"; //$NON-NLS-1$ + public static final String IMAGES_ROOT_FOLDER = "/icons/svg"; - public static final String RESOURCE_SVG = IMAGES_ROOT_FOLDER + "/Resource.svg"; //$NON-NLS-1$ + public static final String RESOURCE_SVG = IMAGES_ROOT_FOLDER + "/Resource.svg"; - public static final String DEFAULT_SVG = IMAGES_ROOT_FOLDER + "/Default.svg"; //$NON-NLS-1$ + public static final String DEFAULT_SVG = IMAGES_ROOT_FOLDER + "/Default.svg"; private ImageConstants() { // Prevent instantiation diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/CompatibilityInitialDirectEditElementLabelProvider.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/CompatibilityInitialDirectEditElementLabelProvider.java index 6a006e808a..6dfd9c08ea 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/CompatibilityInitialDirectEditElementLabelProvider.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/CompatibilityInitialDirectEditElementLabelProvider.java @@ -48,7 +48,7 @@ public String getInitialDirectEditElementLabel(Object graphicalElement, Diagram // @formatter:off return this.mapDiagramElementToLabel(graphicalElement) - .orElse(""); //$NON-NLS-1$ + .orElse(""); // @formatter:on } diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/CompatibilityReconnectionToolsExecutor.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/CompatibilityReconnectionToolsExecutor.java index 3ecb668c40..71707115be 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/CompatibilityReconnectionToolsExecutor.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/CompatibilityReconnectionToolsExecutor.java @@ -131,7 +131,7 @@ private IStatus executeReconnectionTool(InitialOperation initialOperation, AQLIn .map(handler -> { return handler.handle(variableManager.getVariables()); }) - .orElse(new Failure("")); //$NON-NLS-1$ + .orElse(new Failure("")); // @formatter:on } @@ -192,9 +192,9 @@ private VariableManager createVariableManager(ReconnectionToolInterpreterData to variableManager.put(IInterpreterSiriusVariables.TARGET, toolInterpreterData.getSemanticReconnectionTarget()); variableManager.put(IInterpreterSiriusVariables.TARGET_VIEW, toolInterpreterData.getReconnectionTargetView()); variableManager.put(IInterpreterSiriusVariables.ELEMENT, toolInterpreterData.getSemanticElement()); - variableManager.put("semanticOtherEnd", toolInterpreterData.getOtherEdgeEnd()); //$NON-NLS-1$ - variableManager.put("otherEnd", toolInterpreterData.getSemanticOtherEdgeEnd()); //$NON-NLS-1$ - variableManager.put("edgeView", toolInterpreterData.getEdgeView()); //$NON-NLS-1$ + variableManager.put("semanticOtherEnd", toolInterpreterData.getOtherEdgeEnd()); + variableManager.put("otherEnd", toolInterpreterData.getSemanticOtherEdgeEnd()); + variableManager.put("edgeView", toolInterpreterData.getEdgeView()); variableManager.put(IEditingContext.EDITING_CONTEXT, editingContext); variableManager.put(Environment.ENVIRONMENT, new Environment(Environment.SIRIUS_COMPONENTS)); return variableManager; diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/CompatibilityToolSectionsProvider.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/CompatibilityToolSectionsProvider.java index 1f029fae0c..953fc6f08d 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/CompatibilityToolSectionsProvider.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/CompatibilityToolSectionsProvider.java @@ -275,47 +275,47 @@ private List createExtraToolSections(Object diagramElementDescripti // Graphical Delete Tool for unsynchronized mapping only (the handler is never called) if (diagramElementDescription instanceof NodeDescription || diagramElementDescription instanceof EdgeDescription) { // Edit Tool (the handler is never called) - SingleClickOnDiagramElementTool editTool = SingleClickOnDiagramElementTool.newSingleClickOnDiagramElementTool("edit") //$NON-NLS-1$ - .label("Edit") //$NON-NLS-1$ + SingleClickOnDiagramElementTool editTool = SingleClickOnDiagramElementTool.newSingleClickOnDiagramElementTool("edit") + .label("Edit") .imageURL(DiagramImageConstants.EDIT_SVG) .targetDescriptions(targetDescriptions) .handler(fakeHandler) .appliesToDiagramRoot(false) .build(); - var editToolSection = ToolSection.newToolSection("edit-section") //$NON-NLS-1$ - .label("") //$NON-NLS-1$ - .imageURL("") //$NON-NLS-1$ + var editToolSection = ToolSection.newToolSection("edit-section") + .label("") + .imageURL("") .tools(List.of(editTool)) .build(); extraToolSections.add(editToolSection); if (unsynchronizedMapping) { - SingleClickOnDiagramElementTool graphicalDeleteTool = SingleClickOnDiagramElementTool.newSingleClickOnDiagramElementTool("graphical-delete") //$NON-NLS-1$ - .label("Delete from diagram") //$NON-NLS-1$ + SingleClickOnDiagramElementTool graphicalDeleteTool = SingleClickOnDiagramElementTool.newSingleClickOnDiagramElementTool("graphical-delete") + .label("Delete from diagram") .imageURL(DiagramImageConstants.GRAPHICAL_DELETE_SVG) .targetDescriptions(targetDescriptions) .handler(fakeHandler) .appliesToDiagramRoot(false) .build(); - var graphicalDeleteToolSection = ToolSection.newToolSection("graphical-delete-section") //$NON-NLS-1$ - .label("") //$NON-NLS-1$ - .imageURL("") //$NON-NLS-1$ + var graphicalDeleteToolSection = ToolSection.newToolSection("graphical-delete-section") + .label("") + .imageURL("") .tools(List.of(graphicalDeleteTool)) .build(); extraToolSections.add(graphicalDeleteToolSection); } // Semantic Delete Tool (the handler is never called) - SingleClickOnDiagramElementTool semanticDeleteTool = SingleClickOnDiagramElementTool.newSingleClickOnDiagramElementTool("semantic-delete") //$NON-NLS-1$ - .label("Delete from model") //$NON-NLS-1$ + SingleClickOnDiagramElementTool semanticDeleteTool = SingleClickOnDiagramElementTool.newSingleClickOnDiagramElementTool("semantic-delete") + .label("Delete from model") .imageURL(DiagramImageConstants.SEMANTIC_DELETE_SVG) .targetDescriptions(targetDescriptions) .handler(fakeHandler) .appliesToDiagramRoot(false) .build(); - var semanticDeleteToolSection = ToolSection.newToolSection("semantic-delete-section") //$NON-NLS-1$ - .label("") //$NON-NLS-1$ - .imageURL("") //$NON-NLS-1$ + var semanticDeleteToolSection = ToolSection.newToolSection("semantic-delete-section") + .label("") + .imageURL("") .tools(List.of(semanticDeleteTool)) .build(); extraToolSections.add(semanticDeleteToolSection); diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/DiagramDescriptionConverter.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/DiagramDescriptionConverter.java index f5d5a9f2fb..700f3b0bef 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/DiagramDescriptionConverter.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/DiagramDescriptionConverter.java @@ -38,7 +38,7 @@ @Service public class DiagramDescriptionConverter implements IDiagramDescriptionConverter { - private static final String FORCE_AUTO_LAYOUT = "FORCE_AUTO_LAYOUT"; //$NON-NLS-1$ + private static final String FORCE_AUTO_LAYOUT = "FORCE_AUTO_LAYOUT"; private final List diagramDescriptionPopulators; diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/DiagramDescriptionNodeAndEdgeDescriptionsPopulator.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/DiagramDescriptionNodeAndEdgeDescriptionsPopulator.java index f593c689bb..6090fcd31d 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/DiagramDescriptionNodeAndEdgeDescriptionsPopulator.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/DiagramDescriptionNodeAndEdgeDescriptionsPopulator.java @@ -59,9 +59,9 @@ @Service public class DiagramDescriptionNodeAndEdgeDescriptionsPopulator implements IDiagramDescriptionPopulator { - private static final String NEW_VIEW_CONTAINER = "newViewContainer"; //$NON-NLS-1$ + private static final String NEW_VIEW_CONTAINER = "newViewContainer"; - private static final String NEW_CONTAINER = "newContainer"; //$NON-NLS-1$ + private static final String NEW_CONTAINER = "newContainer"; private final IToolProvider toolProvider; @@ -186,7 +186,7 @@ private Function getDropHandler(DiagramDescription sir } } } - return new Failure(""); //$NON-NLS-1$ + return new Failure(""); }; } diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/ToolProvider.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/ToolProvider.java index ae80894f00..20886fd138 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/ToolProvider.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/ToolProvider.java @@ -75,36 +75,36 @@ public class ToolProvider implements IToolProvider { /** * The name of the compatibility variable used to store and retrieve the edge source from a variable manager. */ - public static final String EDGE_SOURCE = "source"; //$NON-NLS-1$ + public static final String EDGE_SOURCE = "source"; /** * The name of the compatibility variable used to store and retrieve the edge target from a variable manager. */ - public static final String EDGE_TARGET = "target"; //$NON-NLS-1$ + public static final String EDGE_TARGET = "target"; /** * The name of the compatibility variable used to store and retrieve the semantic element on which a node or * container creation tool has been invoked. */ - public static final String CONTAINER = "container"; //$NON-NLS-1$ + public static final String CONTAINER = "container"; /** * The name of the compatibility variable used to store and retrieve the graphical element on which a node or * container creation tool has been invoked. */ - public static final String CONTAINER_VIEW = "containerView"; //$NON-NLS-1$ + public static final String CONTAINER_VIEW = "containerView"; /** * The name of the compatibility variable used to store and retrieve the graphical element on which a delete element * tool has been invoked. */ - public static final String ELEMENT_VIEW = "elementView"; //$NON-NLS-1$ + public static final String ELEMENT_VIEW = "elementView"; /** * The name of the compatibility variable used to store and retrieve the semantic element on which a generic tool * has been invoked. */ - public static final String ELEMENT = "element"; //$NON-NLS-1$ + public static final String ELEMENT = "element"; private final IAQLInterpreterFactory interpreterFactory; @@ -167,7 +167,7 @@ private ToolSection convertToolSection(org.eclipse.sirius.diagram.description.to return ToolSection.newToolSection(toolSectionLabel) .tools(tools) .label(toolSectionLabel) - .imageURL(this.getImagePathFromIconPath(siriusToolSection).orElse("")) //$NON-NLS-1$ + .imageURL(this.getImagePathFromIconPath(siriusToolSection).orElse("")) .build(); // @formatter:on } @@ -446,7 +446,7 @@ private Function createContainerCreationHandler(AQLInt var modelOperationHandlerSwitch = this.modelOperationHandlerSwitchProvider.getModelOperationHandlerSwitch(interpreter); return modelOperationHandlerSwitch.apply(initialOperation.getFirstModelOperations()).map(handler -> { return handler.handle(variables); - }).orElse(new Failure("")); //$NON-NLS-1$ + }).orElse(new Failure("")); }; } else { return variableManager -> new Success(); @@ -480,7 +480,7 @@ private Function createNodeCreationHandler(AQLInterpre var modelOperationHandlerSwitch = this.modelOperationHandlerSwitchProvider.getModelOperationHandlerSwitch(interpreter); return modelOperationHandlerSwitch.apply(initialOperation.getFirstModelOperations()).map(handler -> { return handler.handle(variables); - }).orElse(new Failure("")); //$NON-NLS-1$ + }).orElse(new Failure("")); }; } else { return variableManager -> new Success(); @@ -497,7 +497,7 @@ private Function createGenericToolHandler(AQLInterpret var modelOperationHandlerSwitch = this.modelOperationHandlerSwitchProvider.getModelOperationHandlerSwitch(interpreter); return modelOperationHandlerSwitch.apply(initialOperation.getFirstModelOperations()).map(handler -> { return handler.handle(variables); - }).orElse(new Failure("")); //$NON-NLS-1$ + }).orElse(new Failure("")); }; } else { return variableManager -> new Success(); @@ -514,7 +514,7 @@ private Function createOperationActionHandler(AQLInter var modelOperationHandlerSwitch = this.modelOperationHandlerSwitchProvider.getModelOperationHandlerSwitch(interpreter); return modelOperationHandlerSwitch.apply(initialOperation.getFirstModelOperations()).map(handler -> { return handler.handle(variables); - }).orElse(new Failure("")); //$NON-NLS-1$ + }).orElse(new Failure("")); }; } else { return variableManager -> new Success(); @@ -533,7 +533,7 @@ private Function createEdgeCreationHandler(AQLInterpre var modelOperationHandlerSwitch = this.modelOperationHandlerSwitchProvider.getModelOperationHandlerSwitch(interpreter); return modelOperationHandlerSwitch.apply(initialOperation.getFirstModelOperations()).map(handler -> { return handler.handle(variables); - }).orElse(new Failure("")); //$NON-NLS-1$ + }).orElse(new Failure("")); }; } else { return variableManager -> new Success(); @@ -562,7 +562,7 @@ private Function createDeleteToolHandler(AQLInterprete var modelOperationHandlerSwitch = this.modelOperationHandlerSwitchProvider.getModelOperationHandlerSwitch(interpreter); return modelOperationHandlerSwitch.apply(initialOperation.getFirstModelOperations()).map(handler -> { return handler.handle(variables); - }).orElse(new Failure("")); //$NON-NLS-1$ + }).orElse(new Failure("")); }; } else { return variableManager -> new Success(); @@ -616,8 +616,8 @@ private Optional getImagePathFromIconPath(org.eclipse.sirius.diagram.des private String normalize(String iconPath) { String path = iconPath; - if (!iconPath.startsWith("/")) { //$NON-NLS-1$ - path = "/" + iconPath; //$NON-NLS-1$ + if (!iconPath.startsWith("/")) { + path = "/" + iconPath; } int index = path.indexOf('/', 1); diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/representations/ODesignReader.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/representations/ODesignReader.java index 42c0308d1c..f76ea5ee50 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/representations/ODesignReader.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/representations/ODesignReader.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -45,9 +45,9 @@ @Service public class ODesignReader { - private static final String ENVIRONMENT_ODESIGN_PATH = "model/Environment.odesign"; //$NON-NLS-1$ + private static final String ENVIRONMENT_ODESIGN_PATH = "model/Environment.odesign"; - private static final String ENVIRONMENT_ODESIGN_URI = "environment:/viewpoint"; //$NON-NLS-1$ + private static final String ENVIRONMENT_ODESIGN_URI = "environment:/viewpoint"; private final Logger logger = LoggerFactory.getLogger(ODesignReader.class); @@ -78,7 +78,7 @@ private Optional read(String fileName, InputStream inputStream) { resourceSet.getPackageRegistry().put(PropertiesPackage.eNS_URI, PropertiesPackage.eINSTANCE); resourceSet.getPackageRegistry().put(PropertiesExtWidgetsReferencePackage.eNS_URI, PropertiesExtWidgetsReferencePackage.eINSTANCE); - resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("odesign", new XMIResourceFactoryImpl()); //$NON-NLS-1$ + resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("odesign", new XMIResourceFactoryImpl()); ClassPathResource environmentClassPathResource = new ClassPathResource(ENVIRONMENT_ODESIGN_PATH); Resource environmentResource = new XMIResourceFactoryImpl().createResource(URI.createURI(ENVIRONMENT_ODESIGN_URI)); diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/utils/StringValueProvider.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/utils/StringValueProvider.java index 558e17192a..123e7171b4 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/utils/StringValueProvider.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/utils/StringValueProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -26,7 +26,7 @@ */ public class StringValueProvider implements Function { - private static final String EMPTY_STRING = ""; //$NON-NLS-1$ + private static final String EMPTY_STRING = ""; private AQLInterpreter interpreter; diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/architecture/ArchitectureConstants.java b/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/architecture/ArchitectureConstants.java index 006f455293..5c04738126 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/architecture/ArchitectureConstants.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/architecture/ArchitectureConstants.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -22,7 +22,7 @@ * @author sbegaudeau */ public final class ArchitectureConstants { - public static final String SIRIUS_COMPONENTS_COMPATIBILITY_ROOT_PACKAGE = "org.eclipse.sirius.components.compatibility.."; //$NON-NLS-1$ + public static final String SIRIUS_COMPONENTS_COMPATIBILITY_ROOT_PACKAGE = "org.eclipse.sirius.components.compatibility.."; // @formatter:off public static final JavaClasses CLASSES = new ClassFileImporter() diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/ColorDescriptionConverterTests.java b/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/ColorDescriptionConverterTests.java index a09fc6121b..f378ea1c2e 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/ColorDescriptionConverterTests.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/ColorDescriptionConverterTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -40,6 +40,6 @@ public void testConvertFixedColor() { AQLInterpreter interpreter = new AQLInterpreter(List.of(), List.of(EcorePackage.eINSTANCE)); ColorDescriptionConverter colorProvider = new ColorDescriptionConverter(interpreter, Collections.emptyMap()); String color = colorProvider.convert(fixedColor); - assertThat(color).isEqualTo("#0f0110"); //$NON-NLS-1$ + assertThat(color).isEqualTo("#0f0110"); } } diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/ContainerMappingSizeProviderTests.java b/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/ContainerMappingSizeProviderTests.java index f5f1d0bf79..97a8f24e52 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/ContainerMappingSizeProviderTests.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/ContainerMappingSizeProviderTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 THALES GLOBAL SERVICES. + * Copyright (c) 2021, 2022 THALES GLOBAL SERVICES. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -34,9 +34,9 @@ */ public class ContainerMappingSizeProviderTests { - private static final String AQL_20 = "aql:20"; //$NON-NLS-1$ + private static final String AQL_20 = "aql:20"; - private static final String AQL_10 = "aql:10"; //$NON-NLS-1$ + private static final String AQL_10 = "aql:10"; @Test public void testSizeProviderWithNoProvidedSizeFromVSM() { diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/ContainerMappingStyleProviderTests.java b/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/ContainerMappingStyleProviderTests.java index 95d0c523d3..fb6168070f 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/ContainerMappingStyleProviderTests.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/ContainerMappingStyleProviderTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo and others. + * Copyright (c) 2019, 2022 Obeo and others. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -40,9 +40,9 @@ */ public class ContainerMappingStyleProviderTests { - private static final String EXPRESSION_FALSE = "aql:false"; //$NON-NLS-1$ + private static final String EXPRESSION_FALSE = "aql:false"; - private static final String EXPRESSION_TRUE = "aql:true"; //$NON-NLS-1$ + private static final String EXPRESSION_TRUE = "aql:true"; /** * Non-regression test for Conditional styles issue on containers. @@ -66,7 +66,7 @@ public void testFirstMatchingConditionalStyleIsUsed() { assertThat(nodeStyle).isInstanceOf(RectangularNodeStyle.class); RectangularNodeStyle rectangularNodeStyle = (RectangularNodeStyle) nodeStyle; - assertThat(rectangularNodeStyle.getBorderColor()).isEqualTo("#020202"); //$NON-NLS-1$ + assertThat(rectangularNodeStyle.getBorderColor()).isEqualTo("#020202"); } private ConditionalContainerStyleDescription createConditionalStyle(String predicateExpression, ContainerStyleDescription containerStyleDescription) { diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/DiagramLabelProviderTests.java b/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/DiagramLabelProviderTests.java index 5416c687eb..675b4d80b5 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/DiagramLabelProviderTests.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/DiagramLabelProviderTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -36,7 +36,7 @@ public void testUseDiagramNameFromUser() { DiagramLabelProvider labelProvider = new DiagramLabelProvider(interpreter, diagramDescription); VariableManager variableManager = new VariableManager(); - String userProvidedDiagramName = "diagram name from the user"; //$NON-NLS-1$ + String userProvidedDiagramName = "diagram name from the user"; variableManager.put(DiagramDescription.LABEL, userProvidedDiagramName); String result = labelProvider.apply(variableManager); @@ -47,39 +47,39 @@ public void testUseDiagramNameFromUser() { public void testFallbackToTitleExpression() { AQLInterpreter interpreter = new AQLInterpreter(List.of(), List.of(EcorePackage.eINSTANCE)); org.eclipse.sirius.diagram.description.DiagramDescription diagramDescription = DescriptionFactory.eINSTANCE.createDiagramDescription(); - diagramDescription.setTitleExpression("aql:'NewLabel'"); //$NON-NLS-1$ + diagramDescription.setTitleExpression("aql:'NewLabel'"); DiagramLabelProvider labelProvider = new DiagramLabelProvider(interpreter, diagramDescription); VariableManager variableManager = new VariableManager(); String result = labelProvider.apply(variableManager); - assertThat(result).isEqualTo("NewLabel"); //$NON-NLS-1$ + assertThat(result).isEqualTo("NewLabel"); } @Test public void testUseDefaultTitleExpressionWithLabel() { AQLInterpreter interpreter = new AQLInterpreter(List.of(), List.of(EcorePackage.eINSTANCE)); org.eclipse.sirius.diagram.description.DiagramDescription diagramDescription = DescriptionFactory.eINSTANCE.createDiagramDescription(); - diagramDescription.setLabel("DefaultLabel"); //$NON-NLS-1$ + diagramDescription.setLabel("DefaultLabel"); DiagramLabelProvider labelProvider = new DiagramLabelProvider(interpreter, diagramDescription); VariableManager variableManager = new VariableManager(); String result = labelProvider.apply(variableManager); - assertThat(result).isEqualTo("new DefaultLabel"); //$NON-NLS-1$ + assertThat(result).isEqualTo("new DefaultLabel"); } @Test public void testUseDefaultTitleExpressionWithName() { AQLInterpreter interpreter = new AQLInterpreter(List.of(), List.of(EcorePackage.eINSTANCE)); org.eclipse.sirius.diagram.description.DiagramDescription diagramDescription = DescriptionFactory.eINSTANCE.createDiagramDescription(); - diagramDescription.setName("DefaultName"); //$NON-NLS-1$ + diagramDescription.setName("DefaultName"); DiagramLabelProvider labelProvider = new DiagramLabelProvider(interpreter, diagramDescription); VariableManager variableManager = new VariableManager(); String result = labelProvider.apply(variableManager); - assertThat(result).isEqualTo("new DefaultName"); //$NON-NLS-1$ + assertThat(result).isEqualTo("new DefaultName"); } } diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/DomainBasedSourceNodesProviderTests.java b/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/DomainBasedSourceNodesProviderTests.java index 28d88a2c1e..7144d2cf0d 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/DomainBasedSourceNodesProviderTests.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/DomainBasedSourceNodesProviderTests.java @@ -46,9 +46,9 @@ public class DomainBasedSourceNodesProviderTests { @Test public void testComputeSourceNodes() { EdgeMapping edgeMapping = DescriptionFactory.eINSTANCE.createEdgeMapping(); - edgeMapping.setSourceFinderExpression("aql:self"); //$NON-NLS-1$ + edgeMapping.setSourceFinderExpression("aql:self"); NodeMapping nodeMapping = DescriptionFactory.eINSTANCE.createNodeMapping(); - nodeMapping.setName("3b0c8a37-b19c-4978-8a85-ba283d45d22d"); //$NON-NLS-1$ + nodeMapping.setName("3b0c8a37-b19c-4978-8a85-ba283d45d22d"); edgeMapping.getSourceMapping().add(nodeMapping); Object object = new Object(); @@ -77,15 +77,15 @@ public String getIdentifier(Object element) { private Element createNodeElement(UUID descriptionId) { // @formatter:off INodeStyle style = ImageNodeStyle.newImageNodeStyle() - .imageURL("") //$NON-NLS-1$ + .imageURL("") .scalingFactor(42) .build(); NodeElementProps nodeElementProps = NodeElementProps.newNodeElementProps(UUID.randomUUID().toString()) - .type("type") //$NON-NLS-1$ - .targetObjectId("targetObjectId") //$NON-NLS-1$ - .targetObjectKind("targetObjectKind") //$NON-NLS-1$ - .targetObjectLabel("targetObjectLabel") //$NON-NLS-1$ + .type("type") + .targetObjectId("targetObjectId") + .targetObjectKind("targetObjectKind") + .targetObjectLabel("targetObjectLabel") .descriptionId(descriptionId) .style(style) .position(Position.UNDEFINED) diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/EdgeMappingStyleProviderTests.java b/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/EdgeMappingStyleProviderTests.java index de2c50aa5e..cf27925d08 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/EdgeMappingStyleProviderTests.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/EdgeMappingStyleProviderTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -35,9 +35,9 @@ * @author sbegaudeau */ public class EdgeMappingStyleProviderTests { - private static final String EXPRESSION_FALSE = "aql:false"; //$NON-NLS-1$ + private static final String EXPRESSION_FALSE = "aql:false"; - private static final String EXPRESSION_TRUE = "aql:true"; //$NON-NLS-1$ + private static final String EXPRESSION_TRUE = "aql:true"; /** * Non-regression test for Conditional styles on edges. @@ -59,7 +59,7 @@ public void testFirstMatchingConditionalStyleIsUsed() { AQLInterpreter interpreter = new AQLInterpreter(List.of(), List.of(EcorePackage.eINSTANCE)); EdgeStyle edgeStyle = new EdgeMappingStyleProvider(interpreter, edgeMapping).apply(variableManager); - assertThat(edgeStyle.getColor()).isEqualTo("#020202"); //$NON-NLS-1$ + assertThat(edgeStyle.getColor()).isEqualTo("#020202"); } private ConditionalEdgeStyleDescription createConditionalStyle(String predicateExpression, EdgeStyleDescription edgeStyleDescription) { diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/LabelStyleDescriptionConverterTests.java b/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/LabelStyleDescriptionConverterTests.java index 076e505995..138ccf246b 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/LabelStyleDescriptionConverterTests.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/LabelStyleDescriptionConverterTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -35,8 +35,8 @@ public class LabelStyleDescriptionConverterTests { @Test public void testConvertIconPath() { - String pluginName = "my.sirius.plugin"; //$NON-NLS-1$ - String iconPath = "/my/icon/path/MyIcon.gif"; //$NON-NLS-1$ + String pluginName = "my.sirius.plugin"; + String iconPath = "/my/icon/path/MyIcon.gif"; String iconFullPath = pluginName + iconPath; ShapeContainerStyleDescription styleDescription = StyleFactory.eINSTANCE.createShapeContainerStyleDescription(); diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/MappingConverterTests.java b/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/MappingConverterTests.java index f94fa82ab5..318a40a5fe 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/MappingConverterTests.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/MappingConverterTests.java @@ -54,36 +54,36 @@ */ public class MappingConverterTests { - private static final String EXPRESSION_FALSE = "aql:false"; //$NON-NLS-1$ + private static final String EXPRESSION_FALSE = "aql:false"; - private static final String EXPRESSION_TRUE = "aql:true"; //$NON-NLS-1$ + private static final String EXPRESSION_TRUE = "aql:true"; - private static final String PLUGIN_ID = "my.sirius.plugin"; //$NON-NLS-1$ + private static final String PLUGIN_ID = "my.sirius.plugin"; - private static final String ICON_PATH = "/my/icon/path/MyIcon.gif"; //$NON-NLS-1$ + private static final String ICON_PATH = "/my/icon/path/MyIcon.gif"; @Test public void testContainerStylePropertiesFromConditionalStyle() { ContainerMapping containerMapping = DescriptionFactory.eINSTANCE.createContainerMapping(); - String mappingName = "TestMapping"; //$NON-NLS-1$ + String mappingName = "TestMapping"; containerMapping.setName(mappingName); // @formatter:off ContainerStyleDescription defaultStyle = StyleFactory.eINSTANCE.createFlatContainerStyleDescription(); new BasicLabelStyleDescriptionPopulator(defaultStyle) - .labelExpression("aql: defaultStyle") //$NON-NLS-1$ + .labelExpression("aql: defaultStyle") .labelSize(10) .labelColor(this.getColor(1, 1, 1)); ContainerStyleDescription firstConditionalStyle = StyleFactory.eINSTANCE.createFlatContainerStyleDescription(); new BasicLabelStyleDescriptionPopulator(firstConditionalStyle) - .labelExpression("aql:'firstConditionalStyle'") //$NON-NLS-1$ + .labelExpression("aql:'firstConditionalStyle'") .labelSize(4) .labelColor(this.getColor(3, 3, 3)); ContainerStyleDescription secondConditionalStyle = StyleFactory.eINSTANCE.createFlatContainerStyleDescription(); new BasicLabelStyleDescriptionPopulator(secondConditionalStyle) - .labelExpression("aql:'secondConditionalStyle'") //$NON-NLS-1$ + .labelExpression("aql:'secondConditionalStyle'") .labelSize(6) .bold() .italic() @@ -94,7 +94,7 @@ public void testContainerStylePropertiesFromConditionalStyle() { ContainerStyleDescription thirdConditionalStyle = StyleFactory.eINSTANCE.createFlatContainerStyleDescription(); new BasicLabelStyleDescriptionPopulator(thirdConditionalStyle) - .labelExpression("aql:'thirdConditionalStyle'") //$NON-NLS-1$ + .labelExpression("aql:'thirdConditionalStyle'") .labelSize(8) .labelColor(this.getColor(4, 4, 4)); // @formatter:on @@ -131,13 +131,13 @@ public String getIdentifier(Object element) { String color = labelStyleDescription.getColorProvider().apply(variableManager); String iconURL = labelStyleDescription.getIconURLProvider().apply(variableManager); - assertThat(text).isEqualTo("secondConditionalStyle"); //$NON-NLS-1$ + assertThat(text).isEqualTo("secondConditionalStyle"); assertThat(fontSize).isEqualTo(6); assertThat(isBold).isTrue(); assertThat(isItalic).isTrue(); assertThat(isUnderline).isTrue(); assertThat(isStrikeThrough).isTrue(); - assertThat(color).isEqualTo("#020202"); //$NON-NLS-1$ + assertThat(color).isEqualTo("#020202"); assertThat(iconURL).isEqualTo(ICON_PATH); } @@ -148,20 +148,20 @@ public String getIdentifier(Object element) { @Test public void testContainerWithImageSubNode() { ContainerMapping containerMapping = DescriptionFactory.eINSTANCE.createContainerMapping(); - containerMapping.setName("EClass"); //$NON-NLS-1$ - containerMapping.setDomainClass("ecore::EClass"); //$NON-NLS-1$ - containerMapping.setSemanticCandidatesExpression("aql:self.eClassifiers"); //$NON-NLS-1$ + containerMapping.setName("EClass"); + containerMapping.setDomainClass("ecore::EClass"); + containerMapping.setSemanticCandidatesExpression("aql:self.eClassifiers"); containerMapping.setChildrenPresentation(ContainerLayout.LIST); ContainerStyleDescription containerStyle = StyleFactory.eINSTANCE.createFlatContainerStyleDescription(); - containerStyle.setLabelExpression("aql:self.name"); //$NON-NLS-1$ + containerStyle.setLabelExpression("aql:self.name"); containerMapping.setStyle(containerStyle); NodeMapping itemMapping = DescriptionFactory.eINSTANCE.createNodeMapping(); - itemMapping.setDomainClass("ecore::EAttribute"); //$NON-NLS-1$ - itemMapping.setSemanticCandidatesExpression("aql:self.eStructuralFeatures"); //$NON-NLS-1$ + itemMapping.setDomainClass("ecore::EAttribute"); + itemMapping.setSemanticCandidatesExpression("aql:self.eStructuralFeatures"); WorkspaceImageDescription imageStyle = StyleFactory.eINSTANCE.createWorkspaceImageDescription(); - imageStyle.setLabelExpression("aql:self.name"); //$NON-NLS-1$ - imageStyle.setWorkspacePath("path/to/image.svg"); //$NON-NLS-1$ + imageStyle.setLabelExpression("aql:self.name"); + imageStyle.setWorkspacePath("path/to/image.svg"); itemMapping.setStyle(imageStyle); containerMapping.getSubNodeMappings().add(itemMapping); @@ -197,25 +197,25 @@ public String getIdentifier(Object element) { @Test public void testNodeStylePropertiesFromConditionalStyle() { NodeMapping nodeMapping = DescriptionFactory.eINSTANCE.createNodeMapping(); - String mappingName = "TestMapping"; //$NON-NLS-1$ + String mappingName = "TestMapping"; nodeMapping.setName(mappingName); // @formatter:off NodeStyleDescription defaultStyle = StyleFactory.eINSTANCE.createSquareDescription(); new BasicLabelStyleDescriptionPopulator(defaultStyle) - .labelExpression("aql:'defaultStyle'") //$NON-NLS-1$ + .labelExpression("aql:'defaultStyle'") .labelSize(10) .labelColor(this.getColor(1, 1, 1)); NodeStyleDescription firstConditionalStyle = StyleFactory.eINSTANCE.createSquareDescription(); new BasicLabelStyleDescriptionPopulator(firstConditionalStyle) - .labelExpression("aql:'firstConditionalStyle'") //$NON-NLS-1$ + .labelExpression("aql:'firstConditionalStyle'") .labelSize(4) .labelColor(this.getColor(3, 3, 3)); NodeStyleDescription secondConditionalStyle = StyleFactory.eINSTANCE.createSquareDescription(); new BasicLabelStyleDescriptionPopulator(secondConditionalStyle) - .labelExpression("aql:'secondConditionalStyle'") //$NON-NLS-1$ + .labelExpression("aql:'secondConditionalStyle'") .labelSize(6) .bold() .italic() @@ -226,7 +226,7 @@ public void testNodeStylePropertiesFromConditionalStyle() { NodeStyleDescription thirdConditionalStyle = StyleFactory.eINSTANCE.createSquareDescription(); new BasicLabelStyleDescriptionPopulator(thirdConditionalStyle) - .labelExpression("aql:'thirdConditionalStyle'") //$NON-NLS-1$ + .labelExpression("aql:'thirdConditionalStyle'") .labelSize(8) .labelColor(this.getColor(4, 4, 4)); // @formatter:on @@ -263,13 +263,13 @@ public String getIdentifier(Object element) { String color = labelStyleDescription.getColorProvider().apply(variableManager); String iconURL = labelStyleDescription.getIconURLProvider().apply(variableManager); - assertThat(text).isEqualTo("secondConditionalStyle"); //$NON-NLS-1$ + assertThat(text).isEqualTo("secondConditionalStyle"); assertThat(fontSize).isEqualTo(6); assertThat(isBold).isTrue(); assertThat(isItalic).isTrue(); assertThat(isUnderline).isTrue(); assertThat(isStrikeThrough).isTrue(); - assertThat(color).isEqualTo("#020202"); //$NON-NLS-1$ + assertThat(color).isEqualTo("#020202"); assertThat(iconURL).isEqualTo(ICON_PATH); } diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/NodeMappingSizeProviderTests.java b/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/NodeMappingSizeProviderTests.java index 03f7ee7b9f..3d298c89c8 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/NodeMappingSizeProviderTests.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/NodeMappingSizeProviderTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 THALES GLOBAL SERVICES. + * Copyright (c) 2021, 2022 THALES GLOBAL SERVICES. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -34,7 +34,7 @@ */ public class NodeMappingSizeProviderTests { - private static final String AQL_10 = "aql:10"; //$NON-NLS-1$ + private static final String AQL_10 = "aql:10"; @Test public void testSizeProviderWithNoProvidedSizeFromVSM() { diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/NodeMappingStyleProviderTests.java b/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/NodeMappingStyleProviderTests.java index e623baa954..edcb7a33cb 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/NodeMappingStyleProviderTests.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/NodeMappingStyleProviderTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -38,9 +38,9 @@ * @author sbegaudeau */ public class NodeMappingStyleProviderTests { - private static final String EXPRESSION_FALSE = "aql:false"; //$NON-NLS-1$ + private static final String EXPRESSION_FALSE = "aql:false"; - private static final String EXPRESSION_TRUE = "aql:true"; //$NON-NLS-1$ + private static final String EXPRESSION_TRUE = "aql:true"; /** * Non-regression test for Conditional styles issue on nodes. @@ -64,7 +64,7 @@ public void testFirstMatchingConditionalStyleIsUsed() { assertThat(nodeStyle).isInstanceOf(RectangularNodeStyle.class); RectangularNodeStyle rectangularNodeStyle = (RectangularNodeStyle) nodeStyle; - assertThat(rectangularNodeStyle.getBorderColor()).isEqualTo("#020202"); //$NON-NLS-1$ + assertThat(rectangularNodeStyle.getBorderColor()).isEqualTo("#020202"); } private ConditionalNodeStyleDescription createConditionalStyle(String predicateExpression, NodeStyleDescription nodeStyleDescription) { diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/RelationBasedSourceNodesProviderTests.java b/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/RelationBasedSourceNodesProviderTests.java index ee6846887c..399cfed903 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/RelationBasedSourceNodesProviderTests.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/RelationBasedSourceNodesProviderTests.java @@ -45,7 +45,7 @@ public class RelationBasedSourceNodesProviderTests { public void testComputeSourceNodes() { EdgeMapping edgeMapping = DescriptionFactory.eINSTANCE.createEdgeMapping(); NodeMapping nodeMapping = DescriptionFactory.eINSTANCE.createNodeMapping(); - nodeMapping.setName("54af6e49-9792-4fbd-a40e-dfa90055bcc2"); //$NON-NLS-1$ + nodeMapping.setName("54af6e49-9792-4fbd-a40e-dfa90055bcc2"); edgeMapping.getSourceMapping().add(nodeMapping); Object object = new Object(); @@ -71,14 +71,14 @@ public String getIdentifier(Object element) { private Element createNodeElement(UUID descriptionId) { // @formatter:off INodeStyle style = ImageNodeStyle.newImageNodeStyle() - .imageURL("") //$NON-NLS-1$ + .imageURL("") .build(); NodeElementProps nodeElementProps = NodeElementProps.newNodeElementProps(UUID.randomUUID().toString()) - .type("type") //$NON-NLS-1$ - .targetObjectId("targetObjectId") //$NON-NLS-1$ - .targetObjectKind("targetObjectKind") //$NON-NLS-1$ - .targetObjectLabel("targetObjectLabel") //$NON-NLS-1$ + .type("type") + .targetObjectId("targetObjectId") + .targetObjectKind("targetObjectKind") + .targetObjectLabel("targetObjectLabel") .descriptionId(descriptionId) .style(style) .position(Position.UNDEFINED) diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/WorkspaceImageDescriptionConverterTests.java b/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/WorkspaceImageDescriptionConverterTests.java index 95274b2ad2..da91e392f4 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/WorkspaceImageDescriptionConverterTests.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/test/java/org/eclipse/sirius/components/compatibility/diagrams/WorkspaceImageDescriptionConverterTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -31,7 +31,7 @@ */ public class WorkspaceImageDescriptionConverterTests { - private static final String WORKSPACE_IMAGE_PATH = "/org.eclipse.sirius.components.diagrams/path"; //$NON-NLS-1$ + private static final String WORKSPACE_IMAGE_PATH = "/org.eclipse.sirius.components.diagrams/path"; /** * Test the default value of the scalingFactor according to an unset sizeComputationExpression.
@@ -73,7 +73,7 @@ public void testBasicScalingFactorExp10() { WorkspaceImageDescription workspaceImageDescription = StyleFactory.eINSTANCE.createWorkspaceImageDescription(); workspaceImageDescription.setWorkspacePath(WORKSPACE_IMAGE_PATH); - workspaceImageDescription.setSizeComputationExpression("aql:" + expectedSize); //$NON-NLS-1$ + workspaceImageDescription.setSizeComputationExpression("aql:" + expectedSize); ImageNodeStyle imageNodeStyle = new WorkspaceImageDescriptionConverter(interpreter, variableManager, workspaceImageDescription).convert(); assertThat(imageNodeStyle.getScalingFactor()).isEqualTo(expectedSize); diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/api/ChangeDescription.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/api/ChangeDescription.java index 84554b4496..151420e799 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/api/ChangeDescription.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/api/ChangeDescription.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -65,7 +65,7 @@ public Map getParameters() { @Override public String toString() { - String pattern = "{0} '{'kind: {1}, sourceId: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'kind: {1}, sourceId: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.kind, this.sourceId); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/api/ChangeKind.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/api/ChangeKind.java index 4f9136d54c..aecdc8d671 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/api/ChangeKind.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/api/ChangeKind.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -19,23 +19,23 @@ */ public final class ChangeKind { - public static final String NOTHING = "NOTHING"; //$NON-NLS-1$ + public static final String NOTHING = "NOTHING"; - public static final String REPRESENTATION_CREATION = "REPRESENTATION_CREATION"; //$NON-NLS-1$ + public static final String REPRESENTATION_CREATION = "REPRESENTATION_CREATION"; - public static final String REPRESENTATION_DELETION = "REPRESENTATION_DELETION"; //$NON-NLS-1$ + public static final String REPRESENTATION_DELETION = "REPRESENTATION_DELETION"; - public static final String REPRESENTATION_RENAMING = "REPRESENTATION_RENAMING"; //$NON-NLS-1$ + public static final String REPRESENTATION_RENAMING = "REPRESENTATION_RENAMING"; - public static final String PROJECT_RENAMING = "PROJECT_RENAMING"; //$NON-NLS-1$ + public static final String PROJECT_RENAMING = "PROJECT_RENAMING"; - public static final String SEMANTIC_CHANGE = "SEMANTIC_CHANGE"; //$NON-NLS-1$ + public static final String SEMANTIC_CHANGE = "SEMANTIC_CHANGE"; - public static final String FOCUS_CHANGE = "FOCUS_CHANGE"; //$NON-NLS-1$ + public static final String FOCUS_CHANGE = "FOCUS_CHANGE"; - public static final String REPRESENTATION_TO_DELETE = "REPRESENTATION_TO_DELETE"; //$NON-NLS-1$ + public static final String REPRESENTATION_TO_DELETE = "REPRESENTATION_TO_DELETE"; - public static final String REPRESENTATION_TO_RENAME = "REPRESENTATION_TO_RENAME"; //$NON-NLS-1$ + public static final String REPRESENTATION_TO_RENAME = "REPRESENTATION_TO_RENAME"; private ChangeKind() { // Prevent instantiation diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/api/Monitoring.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/api/Monitoring.java index df588d51ca..06070124f9 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/api/Monitoring.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/api/Monitoring.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -19,11 +19,11 @@ */ public final class Monitoring { - public static final String EVENT_HANDLER = "siriusweb_eventhandlers"; //$NON-NLS-1$ + public static final String EVENT_HANDLER = "siriusweb_eventhandlers"; - public static final String REPRESENTATION_EVENT_PROCESSOR_REFRESH = "siriusweb_representationeventprocessor_refresh"; //$NON-NLS-1$ + public static final String REPRESENTATION_EVENT_PROCESSOR_REFRESH = "siriusweb_representationeventprocessor_refresh"; - public static final String NAME = "name"; //$NON-NLS-1$ + public static final String NAME = "name"; private Monitoring() { // Prevent instantiation diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/configuration/CollaborativeMessageServiceConfiguration.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/configuration/CollaborativeMessageServiceConfiguration.java index 975034e5b6..c6d174ef94 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/configuration/CollaborativeMessageServiceConfiguration.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/configuration/CollaborativeMessageServiceConfiguration.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -24,7 +24,7 @@ */ @Configuration public class CollaborativeMessageServiceConfiguration { - private static final String PATH = "messages/sirius-web-spring-collaborative"; //$NON-NLS-1$ + private static final String PATH = "messages/sirius-web-spring-collaborative"; @Bean public MessageSourceAccessor collaborativeMessageSourceAccessor() { diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/CreateChildInput.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/CreateChildInput.java index 7cb0837d18..0900089cfd 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/CreateChildInput.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/CreateChildInput.java @@ -62,7 +62,7 @@ public String getChildCreationDescriptionId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, objectId: {3}, childCreationDescriptionId: {4}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, objectId: {3}, childCreationDescriptionId: {4}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.objectId, this.childCreationDescriptionId); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/CreateChildSuccessPayload.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/CreateChildSuccessPayload.java index 8c7be37301..e0ecb11d23 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/CreateChildSuccessPayload.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/CreateChildSuccessPayload.java @@ -45,7 +45,7 @@ public Object getObject() { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/CreateDocumentInput.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/CreateDocumentInput.java index 4c7777ef38..70832a9cde 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/CreateDocumentInput.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/CreateDocumentInput.java @@ -62,7 +62,7 @@ public UUID getStereotypeDescriptionId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, name: {3}, stereotypeDescriptionId: {4}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, name: {3}, stereotypeDescriptionId: {4}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.name, this.stereotypeDescriptionId); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/CreateDocumentSuccessPayload.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/CreateDocumentSuccessPayload.java index 611050001f..7f1be74c99 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/CreateDocumentSuccessPayload.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/CreateDocumentSuccessPayload.java @@ -38,7 +38,7 @@ public UUID getId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/CreateRepresentationInput.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/CreateRepresentationInput.java index 311272b9f7..37f8854292 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/CreateRepresentationInput.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/CreateRepresentationInput.java @@ -70,7 +70,7 @@ public String getRepresentationName() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationDescriptionId: {3}, objectId: {4}, representationName: {5}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationDescriptionId: {3}, objectId: {4}, representationName: {5}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.representationDescriptionId, this.objectId, this.representationName); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/CreateRepresentationSuccessPayload.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/CreateRepresentationSuccessPayload.java index 808bdd8951..c0e684d1ab 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/CreateRepresentationSuccessPayload.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/CreateRepresentationSuccessPayload.java @@ -46,7 +46,7 @@ public IRepresentation getRepresentation() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, representation: '{'id: {2}, type: {3}'}''}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, representation: '{'id: {2}, type: {3}'}''}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.representation.getId(), this.representation.getClass().getSimpleName()); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/CreateRootObjectInput.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/CreateRootObjectInput.java index a61990dae5..bb6b1ef5cf 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/CreateRootObjectInput.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/CreateRootObjectInput.java @@ -69,7 +69,7 @@ public String getRootObjectCreationDescriptionId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, documentId: {3}, domainId: {4}, rootObjectCreationDescriptionId: {5}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, documentId: {3}, domainId: {4}, rootObjectCreationDescriptionId: {5}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.documentId, this.domainId, this.rootObjectCreationDescriptionId); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/CreateRootObjectSuccessPayload.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/CreateRootObjectSuccessPayload.java index 742701af98..e992984631 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/CreateRootObjectSuccessPayload.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/CreateRootObjectSuccessPayload.java @@ -44,7 +44,7 @@ public Object getObject() { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/DeleteDocumentInput.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/DeleteDocumentInput.java index 3e9c5488c5..d408358591 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/DeleteDocumentInput.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/DeleteDocumentInput.java @@ -48,7 +48,7 @@ public UUID getDocumentId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, documentId: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, documentId: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.documentId); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/DeleteDocumentSuccessPayload.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/DeleteDocumentSuccessPayload.java index 4081665f3a..65387ae415 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/DeleteDocumentSuccessPayload.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/DeleteDocumentSuccessPayload.java @@ -38,7 +38,7 @@ public UUID getId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/DeleteObjectInput.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/DeleteObjectInput.java index d0e897fd43..0b2d810b12 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/DeleteObjectInput.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/DeleteObjectInput.java @@ -55,7 +55,7 @@ public String getObjectId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, objectId: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, objectId: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.objectId); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/DeleteObjectSuccessPayload.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/DeleteObjectSuccessPayload.java index 6b8a1b2142..562f4515bc 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/DeleteObjectSuccessPayload.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/DeleteObjectSuccessPayload.java @@ -37,7 +37,7 @@ public UUID getId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/DeleteRepresentationInput.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/DeleteRepresentationInput.java index 36b3b60f53..dc2547e5ed 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/DeleteRepresentationInput.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/DeleteRepresentationInput.java @@ -48,7 +48,7 @@ public String getRepresentationId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, representationId: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, representationId: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.representationId); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/DeleteRepresentationSuccessPayload.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/DeleteRepresentationSuccessPayload.java index b3238bf95d..4c00a62a10 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/DeleteRepresentationSuccessPayload.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/DeleteRepresentationSuccessPayload.java @@ -45,7 +45,7 @@ public String getRepresentationId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, representationId: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, representationId: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.representationId); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/EditingContextAction.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/EditingContextAction.java index 7f5e0a73c9..c2973a0b93 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/EditingContextAction.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/EditingContextAction.java @@ -40,7 +40,7 @@ public String getLabel() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/EditingContextEventInput.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/EditingContextEventInput.java index 0cec9bc3b5..e71920e2aa 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/EditingContextEventInput.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/EditingContextEventInput.java @@ -38,7 +38,7 @@ public String getEditingContextId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/EditingContextRepresentationDescriptionsInput.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/EditingContextRepresentationDescriptionsInput.java index 22844d66f3..8f9af3a0b4 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/EditingContextRepresentationDescriptionsInput.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/EditingContextRepresentationDescriptionsInput.java @@ -51,7 +51,7 @@ public String getObjectId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, objectId: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, objectId: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.objectId); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/GetEditingContextActionsInput.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/GetEditingContextActionsInput.java index f444e3223b..778ca3e028 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/GetEditingContextActionsInput.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/GetEditingContextActionsInput.java @@ -44,7 +44,7 @@ public String getEditingContextId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/GetEditingContextActionsSuccessPayload.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/GetEditingContextActionsSuccessPayload.java index 475503ee4b..0dd3732ffc 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/GetEditingContextActionsSuccessPayload.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/GetEditingContextActionsSuccessPayload.java @@ -45,7 +45,7 @@ public List getEditingContextActions() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextActions: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextActions: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextActions); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/InvokeEditingContextActionInput.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/InvokeEditingContextActionInput.java index 0d9f993fc1..e8132452f2 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/InvokeEditingContextActionInput.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/InvokeEditingContextActionInput.java @@ -56,7 +56,7 @@ public String getActionId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, actionId: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, actionId: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.actionId); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/InvokeEditingContextActionSuccessPayload.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/InvokeEditingContextActionSuccessPayload.java index 85e04422e8..09be595d7d 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/InvokeEditingContextActionSuccessPayload.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/InvokeEditingContextActionSuccessPayload.java @@ -37,7 +37,7 @@ public UUID getId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedBooleanInput.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedBooleanInput.java index ef113e0e27..8051d09126 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedBooleanInput.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedBooleanInput.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -54,7 +54,7 @@ public Map getVariables() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, query: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, query: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.query); } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedBooleanSuccessPayload.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedBooleanSuccessPayload.java index 1ebb2d4345..f6c974e7e8 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedBooleanSuccessPayload.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedBooleanSuccessPayload.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -45,7 +45,7 @@ public boolean getResult() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, result: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, result: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.result); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedIntInput.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedIntInput.java index c8ad6745bb..8788a8dbc2 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedIntInput.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedIntInput.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -54,7 +54,7 @@ public Map getVariables() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, query: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, query: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.query); } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedIntSuccessPayload.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedIntSuccessPayload.java index dcc7c7ce1d..abf023ee05 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedIntSuccessPayload.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedIntSuccessPayload.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -45,7 +45,7 @@ public int getResult() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, result: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, result: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.result); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedObjectInput.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedObjectInput.java index b2d10d5d40..65727f7df8 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedObjectInput.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedObjectInput.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -54,7 +54,7 @@ public Map getVariables() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, query: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, query: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.query); } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedObjectSuccessPayload.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedObjectSuccessPayload.java index c0fa792b97..27f7f7745c 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedObjectSuccessPayload.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedObjectSuccessPayload.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -45,7 +45,7 @@ public Object getResult() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, result: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, result: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.result); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedObjectsInput.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedObjectsInput.java index 6ea005c0fa..99ed787187 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedObjectsInput.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedObjectsInput.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -54,7 +54,7 @@ public Map getVariables() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, query: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, query: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.query); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedObjectsSuccessPayload.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedObjectsSuccessPayload.java index c6b14f6448..cbd8591c94 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedObjectsSuccessPayload.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedObjectsSuccessPayload.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -46,7 +46,7 @@ public List getResult() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, result: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, result: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.result); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedStringInput.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedStringInput.java index 65a9b7c901..d257e43875 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedStringInput.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedStringInput.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -54,7 +54,7 @@ public Map getVariables() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, query: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, query: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.query); } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedStringSuccessPayload.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedStringSuccessPayload.java index 67c244aeca..c0390d865e 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedStringSuccessPayload.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/QueryBasedStringSuccessPayload.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -45,7 +45,7 @@ public String getResult() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, result: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, result: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.result); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/RenameDocumentInput.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/RenameDocumentInput.java index 9d489bc65f..b0bb7eb115 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/RenameDocumentInput.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/RenameDocumentInput.java @@ -55,7 +55,7 @@ public String getNewName() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, documentId: {2}, newName: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, documentId: {2}, newName: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.documentId, this.newName); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/RenameDocumentSuccessPayload.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/RenameDocumentSuccessPayload.java index 50f374d63f..f5b2f8a379 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/RenameDocumentSuccessPayload.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/RenameDocumentSuccessPayload.java @@ -38,7 +38,7 @@ public UUID getId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/RenameObjectInput.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/RenameObjectInput.java index efb5a7c036..f99fa81cea 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/RenameObjectInput.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/RenameObjectInput.java @@ -63,7 +63,7 @@ public String getNewName() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, objectId: {3}, newName: {4}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, objectId: {3}, newName: {4}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.objectId, this.newName); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/RenameObjectSuccessPayload.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/RenameObjectSuccessPayload.java index 84ac3dd1cf..c57448e978 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/RenameObjectSuccessPayload.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/RenameObjectSuccessPayload.java @@ -52,7 +52,7 @@ public String getNewName() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, objectId: {2}, newName: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, objectId: {2}, newName: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.objectId, this.newName); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/RenameRepresentationInput.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/RenameRepresentationInput.java index ede0bb81b4..70b5fc637a 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/RenameRepresentationInput.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/RenameRepresentationInput.java @@ -63,7 +63,7 @@ public String getNewLabel() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, newLabel: {4}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, newLabel: {4}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.representationId, this.newLabel); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/RenameRepresentationSuccessPayload.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/RenameRepresentationSuccessPayload.java index 81660bf013..f020cad4d5 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/RenameRepresentationSuccessPayload.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/RenameRepresentationSuccessPayload.java @@ -45,7 +45,7 @@ public IRepresentation getRepresentation() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, representation: '{'id: {2}, label: {3}'}''}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, representation: '{'id: {2}, label: {3}'}''}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.representation.getId(), this.representation.getLabel()); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/RepresentationRenamedEventPayload.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/RepresentationRenamedEventPayload.java index 917ede084d..a59a6bb09d 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/RepresentationRenamedEventPayload.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/RepresentationRenamedEventPayload.java @@ -51,7 +51,7 @@ public String getNewLabel() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, representationId: {2}, newLabel: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, representationId: {2}, newLabel: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.representationId, this.newLabel); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/Subscriber.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/Subscriber.java index 4e4ddee801..ac17795104 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/Subscriber.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/Subscriber.java @@ -33,7 +33,7 @@ public String getUsername() { @Override public String toString() { - String pattern = "{0} '{'username: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'username: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.username); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/SubscribersUpdatedEventPayload.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/SubscribersUpdatedEventPayload.java index 106b3a0f08..bfbf5cc428 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/SubscribersUpdatedEventPayload.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/dto/SubscribersUpdatedEventPayload.java @@ -46,7 +46,7 @@ public List getSubscribers() { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/editingcontext/EditingContextEventProcessor.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/editingcontext/EditingContextEventProcessor.java index 7b7bc0b50c..b4d0c50b85 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/editingcontext/EditingContextEventProcessor.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/editingcontext/EditingContextEventProcessor.java @@ -71,9 +71,9 @@ */ public class EditingContextEventProcessor implements IEditingContextEventProcessor { - public static final String REPRESENTATION_ID = "representationId"; //$NON-NLS-1$ + public static final String REPRESENTATION_ID = "representationId"; - public static final String REPRESENTATION_LABEL = "representationLabel"; //$NON-NLS-1$ + public static final String REPRESENTATION_LABEL = "representationLabel"; private final Logger logger = LoggerFactory.getLogger(EditingContextEventProcessor.class); @@ -190,7 +190,7 @@ private void tryEmitRepresentationRenamedEvent(UUID correlationId, String repres if (this.sink.currentSubscriberCount() > 0) { EmitResult emitResult = this.sink.tryEmitNext(new RepresentationRenamedEventPayload(correlationId, representationId, newLabel)); if (emitResult.isFailure()) { - String pattern = "An error has occurred while emitting a RepresentationRenamedEventPayload: {}"; //$NON-NLS-1$ + String pattern = "An error has occurred while emitting a RepresentationRenamedEventPayload: {}"; this.logger.warn(pattern, emitResult); } } @@ -204,7 +204,7 @@ public String getEditingContextId() { @Override public Mono handle(IInput input) { if (this.executorService.isShutdown()) { - this.logger.warn("Handler for editing context {} is shutdown", this.editingContext.getId()); //$NON-NLS-1$ + this.logger.warn("Handler for editing context {} is shutdown", this.editingContext.getId()); return Mono.empty(); } @@ -221,7 +221,7 @@ public Mono handle(IInput input) { // @formatter:off var timeoutFallback = Mono.just(new ErrorPayload(input.getId(), this.messageService.timeout())) - .doOnSuccess(payload -> this.logger.warn("Timeout fallback for the input {}", input)); //$NON-NLS-1$ + .doOnSuccess(payload -> this.logger.warn("Timeout fallback for the input {}", input)); return payloadSink.asMono() .log(this.getClass().getName(), Level.FINEST, SignalType.ON_NEXT, SignalType.ON_ERROR) .timeout(Duration.ofSeconds(5), timeoutFallback) @@ -239,7 +239,7 @@ public Mono handle(IInput input) { * @return The response computed by the event handler */ private void doHandle(One payloadSink, IInput input) { - this.logger.trace("Input received: {}", input); //$NON-NLS-1$ + this.logger.trace("Input received: {}", input); if (input instanceof IRepresentationInput) { IRepresentationInput representationInput = (IRepresentationInput) input; @@ -314,7 +314,7 @@ private void handleInput(One payloadSink, IInput input) { IEditingContextEventHandler editingContextEventHandler = optionalEditingContextEventHandler.get(); editingContextEventHandler.handle(payloadSink, this.changeDescriptionSink, this.editingContext, input); } else { - this.logger.warn("No handler found for event: {}", input); //$NON-NLS-1$ + this.logger.warn("No handler found for event: {}", input); } } @@ -326,7 +326,7 @@ private void handleRepresentationInput(One payloadSink, IRepresentatio IRepresentationEventProcessor representationEventProcessor = optionalRepresentationEventProcessor.get(); representationEventProcessor.handle(payloadSink, this.changeDescriptionSink, representationInput); } else { - this.logger.warn("No representation event processor found for event: {}", representationInput); //$NON-NLS-1$ + this.logger.warn("No representation event processor found for event: {}", representationInput); } } @@ -354,7 +354,7 @@ public Optional acquireRepresentati if (canBeDisposed.booleanValue() && representationEventProcessor.getSubscriptionManager().isEmpty()) { this.disposeRepresentation(configuration.getId()); } else { - this.logger.trace("Stopping the disposal of the representation event processor {}", configuration.getId()); //$NON-NLS-1$ + this.logger.trace("Stopping the disposal of the representation event processor {}", configuration.getId()); } }, throwable -> this.logger.warn(throwable.getMessage(), throwable)); // @formatter:on @@ -362,11 +362,11 @@ public Optional acquireRepresentati var representationEventProcessorEntry = new RepresentationEventProcessorEntry(representationEventProcessor, subscription); this.representationEventProcessors.put(configuration.getId(), representationEventProcessorEntry); } else { - this.logger.warn("The representation with the id {} does not exist", configuration.getId()); //$NON-NLS-1$ + this.logger.warn("The representation with the id {} does not exist", configuration.getId()); } } - this.logger.trace("Representation event processors count: {}", this.representationEventProcessors.size()); //$NON-NLS-1$ + this.logger.trace("Representation event processors count: {}", this.representationEventProcessors.size()); return optionalRepresentationEventProcessor; } @@ -386,7 +386,7 @@ private void disposeRepresentation(String representationId) { if (this.representationEventProcessors.isEmpty()) { EmitResult emitResult = this.canBeDisposedSink.tryEmitNext(Boolean.TRUE); if (emitResult.isFailure()) { - String pattern = "An error has occurred while emitting that the processor can be disposed: {}"; //$NON-NLS-1$ + String pattern = "An error has occurred while emitting that the processor can be disposed: {}"; this.logger.warn(pattern, emitResult); } } @@ -404,11 +404,11 @@ public Flux canBeDisposed() { @Override public void dispose() { - this.logger.trace("Disposing the editing context event processor {}", this.editingContext.getId()); //$NON-NLS-1$ + this.logger.trace("Disposing the editing context event processor {}", this.editingContext.getId()); EmitResult changeDescriptionEmitResult = this.changeDescriptionSink.tryEmitComplete(); if (changeDescriptionEmitResult.isFailure()) { - String pattern = "An error has occurred while marking the publisher as complete: {}"; //$NON-NLS-1$ + String pattern = "An error has occurred while marking the publisher as complete: {}"; this.logger.warn(pattern, changeDescriptionEmitResult); } this.changeDescriptionDisposable.dispose(); @@ -422,7 +422,7 @@ public void dispose() { EmitResult emitResult = this.sink.tryEmitComplete(); if (emitResult.isFailure()) { - String pattern = "An error has occurred while marking the publisher as complete: {}"; //$NON-NLS-1$ + String pattern = "An error has occurred while marking the publisher as complete: {}"; this.logger.warn(pattern, emitResult); } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/editingcontext/EditingContextEventProcessorRegistry.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/editingcontext/EditingContextEventProcessorRegistry.java index 2901b58f66..6146c46245 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/editingcontext/EditingContextEventProcessorRegistry.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/editingcontext/EditingContextEventProcessorRegistry.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -94,7 +94,7 @@ public synchronized Optional getOrCreateEditingCo if (canBeDisposed.booleanValue() && editingContextEventProcessor.getRepresentationEventProcessors().isEmpty()) { this.disposeEditingContextEventProcessor(editingContextId); } else { - this.logger.trace("Stopping the disposal of the editing context"); //$NON-NLS-1$ + this.logger.trace("Stopping the disposal of the editing context"); } }); @@ -113,12 +113,12 @@ public synchronized Optional getOrCreateEditingCo public void disposeEditingContextEventProcessor(String editingContextId) { Optional.ofNullable(this.editingContextEventProcessors.remove(editingContextId)).ifPresent(EditingContextEventProcessorEntry::dispose); - this.logger.trace("Editing context event processors count: {}", this.editingContextEventProcessors.size()); //$NON-NLS-1$ + this.logger.trace("Editing context event processors count: {}", this.editingContextEventProcessors.size()); } @PreDestroy public void dispose() { - this.logger.debug("Shutting down all the editing context event processors"); //$NON-NLS-1$ + this.logger.debug("Shutting down all the editing context event processors"); this.editingContextEventProcessors.values().forEach(EditingContextEventProcessorEntry::dispose); this.editingContextEventProcessors.clear(); diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/handlers/DeleteObjectEventHandler.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/handlers/DeleteObjectEventHandler.java index 33e30fc293..23ec13119a 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/handlers/DeleteObjectEventHandler.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/handlers/DeleteObjectEventHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -91,7 +91,7 @@ public void handle(One payloadSink, Many changeDesc payload = new DeleteObjectSuccessPayload(input.getId()); changeDescription = new ChangeDescription(ChangeKind.SEMANTIC_CHANGE, editingContext.getId(), input); } else { - this.logger.warn("The object with the id {} does not exist", deleteObjectInput.getObjectId()); //$NON-NLS-1$ + this.logger.warn("The object with the id {} does not exist", deleteObjectInput.getObjectId()); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/handlers/InvokeEditingContextActionEventHandler.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/handlers/InvokeEditingContextActionEventHandler.java index 6f3ce3cb24..10e4d3b437 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/handlers/InvokeEditingContextActionEventHandler.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/handlers/InvokeEditingContextActionEventHandler.java @@ -87,14 +87,14 @@ public void handle(One payloadSink, Many changeDesc .filter(handler -> handler.canHandle(editingContext, invokeEditingContextActionInput.getActionId())) .findFirst() .map(handler -> handler.handle(editingContext, invokeEditingContextActionInput.getActionId())) - .orElse(new Failure("No handler could be found for action with id " + invokeEditingContextActionInput.getActionId())); //$NON-NLS-1$ + .orElse(new Failure("No handler could be found for action with id " + invokeEditingContextActionInput.getActionId())); // @formatter:on if (status instanceof Success) { payload = new InvokeEditingContextActionSuccessPayload(invokeEditingContextActionInput.getId()); changeDescription = new ChangeDescription(((Success) status).getChangeKind(), editingContext.getId(), input); } else if (status instanceof Failure) { - this.logger.warn("The action with id {} could not be executed", invokeEditingContextActionInput.getActionId()); //$NON-NLS-1$ + this.logger.warn("The action with id {} could not be executed", invokeEditingContextActionInput.getActionId()); payload = new ErrorPayload(input.getId(), ((Failure) status).getMessage()); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/messages/CollaborativeMessageService.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/messages/CollaborativeMessageService.java index 38dbe6b886..815e25a60a 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/messages/CollaborativeMessageService.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/messages/CollaborativeMessageService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -34,17 +34,17 @@ public CollaborativeMessageService(@Qualifier("collaborativeMessageSourceAccesso @Override public String invalidInput(String expectedInputTypeName, String receivedInputTypeName) { - return this.messageSourceAccessor.getMessage("INVALID_INPUT", new Object[] { expectedInputTypeName, receivedInputTypeName }); //$NON-NLS-1$ + return this.messageSourceAccessor.getMessage("INVALID_INPUT", new Object[] { expectedInputTypeName, receivedInputTypeName }); } @Override public String objectCreationFailed() { - return this.messageSourceAccessor.getMessage("OBJECT_CREATION_FAILED"); //$NON-NLS-1$ + return this.messageSourceAccessor.getMessage("OBJECT_CREATION_FAILED"); } @Override public String timeout() { - return this.messageSourceAccessor.getMessage("TIMEOUT"); //$NON-NLS-1$ + return this.messageSourceAccessor.getMessage("TIMEOUT"); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/messages/ICollaborativeMessageService.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/messages/ICollaborativeMessageService.java index 658dde270e..beb83c63c0 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/messages/ICollaborativeMessageService.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/messages/ICollaborativeMessageService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -33,17 +33,17 @@ class NoOp implements ICollaborativeMessageService { @Override public String invalidInput(String expectedInputTypeName, String receivedInputTypeName) { - return ""; //$NON-NLS-1$ + return ""; } @Override public String objectCreationFailed() { - return ""; //$NON-NLS-1$ + return ""; } @Override public String timeout() { - return ""; //$NON-NLS-1$ + return ""; } } diff --git a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/representations/SubscriptionManager.java b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/representations/SubscriptionManager.java index ca85ebfba1..726091bda2 100644 --- a/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/representations/SubscriptionManager.java +++ b/packages/core/backend/sirius-components-collaborative/src/main/java/org/eclipse/sirius/components/collaborative/representations/SubscriptionManager.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -44,15 +44,15 @@ public class SubscriptionManager implements ISubscriptionManager { public Flux getFlux(IInput input) { return this.sink.asFlux().doOnSubscribe(subscription -> { this.subscriptionCount.getAndIncrement(); - this.logger.trace("A new subscription to the representation has occurred {}", this.subscriptionCount.intValue()); //$NON-NLS-1$ + this.logger.trace("A new subscription to the representation has occurred {}", this.subscriptionCount.intValue()); }).doOnCancel(() -> { this.subscriptionCount.updateAndGet(current -> Math.max(0, current - 1)); - this.logger.trace("A new cancellation from the representation has occurred {}", this.subscriptionCount.intValue()); //$NON-NLS-1$ + this.logger.trace("A new cancellation from the representation has occurred {}", this.subscriptionCount.intValue()); if (this.subscriptionCount.get() == 0) { EmitResult emitResult = this.canBeDisposedSink.tryEmitNext(Boolean.TRUE); if (emitResult.isFailure()) { - String pattern = "An error has occurred while emitting that the processor can be disposed: {}"; //$NON-NLS-1$ + String pattern = "An error has occurred while emitting that the processor can be disposed: {}"; this.logger.warn(pattern, emitResult); } } @@ -73,7 +73,7 @@ public boolean isEmpty() { public void dispose() { EmitResult emitResult = this.sink.tryEmitComplete(); if (emitResult.isFailure()) { - String pattern = "An error has occurred while marking the publisher as complete: {}"; //$NON-NLS-1$ + String pattern = "An error has occurred while marking the publisher as complete: {}"; this.logger.warn(pattern, emitResult); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/architecture/ArchitectureConstants.java b/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/architecture/ArchitectureConstants.java index 97eba74d23..5440734ab3 100644 --- a/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/architecture/ArchitectureConstants.java +++ b/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/architecture/ArchitectureConstants.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -22,7 +22,7 @@ * @author sbegaudeau */ public final class ArchitectureConstants { - public static final String SIRIUS_COMPONENTS_COLLABORATIVE_ROOT_PACKAGE = "org.eclipse.sirius.components.collaborative.."; //$NON-NLS-1$ + public static final String SIRIUS_COMPONENTS_COLLABORATIVE_ROOT_PACKAGE = "org.eclipse.sirius.components.collaborative.."; // @formatter:off public static final JavaClasses CLASSES = new ClassFileImporter() diff --git a/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/CreateChildEventHandlerTests.java b/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/CreateChildEventHandlerTests.java index 27fbd9428b..cfa68ae11e 100644 --- a/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/CreateChildEventHandlerTests.java +++ b/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/CreateChildEventHandlerTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -94,7 +94,7 @@ public Optional getObject(IEditingContext editingContext, String objectI }; CreateChildEventHandler handler = new CreateChildEventHandler(objectService, editService, new ICollaborativeMessageService.NoOp(), new SimpleMeterRegistry()); - var input = new CreateChildInput(UUID.randomUUID(), UUID.randomUUID().toString(), "parentObjectId", "childCreationDescriptionId"); //$NON-NLS-1$//$NON-NLS-2$ + var input = new CreateChildInput(UUID.randomUUID(), UUID.randomUUID().toString(), "parentObjectId", "childCreationDescriptionId"); IEditingContext editingContext = () -> UUID.randomUUID().toString(); assertThat(handler.canHandle(editingContext, input)).isTrue(); diff --git a/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/CreateRootObjectEventHandlerTests.java b/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/CreateRootObjectEventHandlerTests.java index ceced4765f..d18d5586b0 100644 --- a/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/CreateRootObjectEventHandlerTests.java +++ b/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/CreateRootObjectEventHandlerTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -49,7 +49,7 @@ public Optional createRootObject(IEditingContext editingContext, UUID do }; CreateRootObjectEventHandler handler = new CreateRootObjectEventHandler(editService, new ICollaborativeMessageService.NoOp(), new SimpleMeterRegistry()); - var input = new CreateRootObjectInput(UUID.randomUUID(), UUID.randomUUID().toString(), UUID.randomUUID(), "domainId", "rootObjectCreationDescriptionId"); //$NON-NLS-1$//$NON-NLS-2$ + var input = new CreateRootObjectInput(UUID.randomUUID(), UUID.randomUUID().toString(), UUID.randomUUID(), "domainId", "rootObjectCreationDescriptionId"); IEditingContext editingContext = () -> UUID.randomUUID().toString(); Many changeDescriptionSink = Sinks.many().unicast().onBackpressureBuffer(); diff --git a/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/DeleteObjectEventHandlerTests.java b/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/DeleteObjectEventHandlerTests.java index c2b512e7bb..337f977cd6 100644 --- a/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/DeleteObjectEventHandlerTests.java +++ b/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/DeleteObjectEventHandlerTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -58,7 +58,7 @@ public void delete(Object object) { }; DeleteObjectEventHandler handler = new DeleteObjectEventHandler(objectService, editService, new ICollaborativeMessageService.NoOp(), new SimpleMeterRegistry()); - var input = new DeleteObjectInput(UUID.randomUUID(), UUID.randomUUID().toString(), "objectId"); //$NON-NLS-1$ + var input = new DeleteObjectInput(UUID.randomUUID(), UUID.randomUUID().toString(), "objectId"); IEditingContext editingContext = () -> UUID.randomUUID().toString(); Many changeDescriptionSink = Sinks.many().unicast().onBackpressureBuffer(); diff --git a/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/GetEditingContextActionsEventHandlerTests.java b/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/GetEditingContextActionsEventHandlerTests.java index 02aa2bdf6f..490452a3cb 100644 --- a/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/GetEditingContextActionsEventHandlerTests.java +++ b/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/GetEditingContextActionsEventHandlerTests.java @@ -40,8 +40,8 @@ public class GetEditingContextActionsEventHandlerTests { @Test public void testGetEditingContextActions() { var eventHandler = new GetEditingContextActionsEventHandler(new ICollaborativeMessageService.NoOp(), List.of(), new SimpleMeterRegistry()); - var input = new GetEditingContextActionsInput(UUID.randomUUID(), "editingContextId"); //$NON-NLS-1$ - IEditingContext editingContext = () -> "editingContextId"; //$NON-NLS-1$ + var input = new GetEditingContextActionsInput(UUID.randomUUID(), "editingContextId"); + IEditingContext editingContext = () -> "editingContextId"; Many changeDescriptionSink = Sinks.many().unicast().onBackpressureBuffer(); One payloadSink = Sinks.one(); diff --git a/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/InvokeEditingContextActionEventHandlerTests.java b/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/InvokeEditingContextActionEventHandlerTests.java index 917271cd94..f2154e832d 100644 --- a/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/InvokeEditingContextActionEventHandlerTests.java +++ b/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/InvokeEditingContextActionEventHandlerTests.java @@ -64,8 +64,8 @@ public boolean canHandle(IEditingContext editingContext, String actionId) { var eventHandler = new InvokeEditingContextActionEventHandler(List.of(handler), new ICollaborativeMessageService.NoOp(), new SimpleMeterRegistry()); - var input = new InvokeEditingContextActionInput(UUID.randomUUID(), "editingContextId", "actionId"); //$NON-NLS-1$//$NON-NLS-2$ - IEditingContext editingContext = () -> "editingContextId"; //$NON-NLS-1$ + var input = new InvokeEditingContextActionInput(UUID.randomUUID(), "editingContextId", "actionId"); + IEditingContext editingContext = () -> "editingContextId"; Many changeDescriptionSink = Sinks.many().unicast().onBackpressureBuffer(); One payloadSink = Sinks.one(); @@ -85,8 +85,8 @@ public boolean canHandle(IEditingContext editingContext, String actionId) { public void testErrorNoHandlerFound() { var eventHandler = new InvokeEditingContextActionEventHandler(List.of(), new ICollaborativeMessageService.NoOp(), new SimpleMeterRegistry()); - var input = new InvokeEditingContextActionInput(UUID.randomUUID(), "editingContextId", "actionId"); //$NON-NLS-1$//$NON-NLS-2$ - IEditingContext editingContext = () -> "editingContextId"; //$NON-NLS-1$ + var input = new InvokeEditingContextActionInput(UUID.randomUUID(), "editingContextId", "actionId"); + IEditingContext editingContext = () -> "editingContextId"; Many changeDescriptionSink = Sinks.many().unicast().onBackpressureBuffer(); One payloadSink = Sinks.one(); @@ -101,6 +101,6 @@ public void testErrorNoHandlerFound() { assertThat(payload).isInstanceOf(ErrorPayload.class); ErrorPayload errorPayload = (ErrorPayload) payload; - assertThat(errorPayload.getMessage()).isEqualTo("No handler could be found for action with id actionId"); //$NON-NLS-1$ + assertThat(errorPayload.getMessage()).isEqualTo("No handler could be found for action with id actionId"); } } diff --git a/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/QueryBasedBooleanEventHandlerTests.java b/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/QueryBasedBooleanEventHandlerTests.java index 6b3bd67f7a..44275ce447 100644 --- a/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/QueryBasedBooleanEventHandlerTests.java +++ b/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/QueryBasedBooleanEventHandlerTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -71,7 +71,7 @@ public void testQueryBasedBooleanFailed() { IQueryService queryService = new IQueryService.NoOp() { @Override public IPayload execute(IEditingContext editingContext, QueryBasedBooleanInput input) { - return new ErrorPayload(UUID.randomUUID(), "An error occured"); //$NON-NLS-1$ + return new ErrorPayload(UUID.randomUUID(), "An error occured"); } }; Many changeDescriptionSink = Sinks.many().unicast().onBackpressureBuffer(); @@ -88,7 +88,7 @@ public IPayload execute(IEditingContext editingContext, QueryBasedBooleanInput i private void handle(One payloadSink, Many changeDescriptionSink, IQueryService queryService) { QueryBasedBooleanEventHandler queryBasedBooleanEventHandler = new QueryBasedBooleanEventHandler(new ICollaborativeMessageService.NoOp(), new SimpleMeterRegistry(), queryService); - IInput input = new QueryBasedBooleanInput(UUID.randomUUID(), "", Map.of()); //$NON-NLS-1$ + IInput input = new QueryBasedBooleanInput(UUID.randomUUID(), "", Map.of()); assertThat(queryBasedBooleanEventHandler.canHandle(new IEditingContext.NoOp(), input)).isTrue(); IEditingContext editingContext = () -> UUID.randomUUID().toString(); diff --git a/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/QueryBasedIntEventHandlerTests.java b/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/QueryBasedIntEventHandlerTests.java index 35d944868b..068a4ab900 100644 --- a/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/QueryBasedIntEventHandlerTests.java +++ b/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/QueryBasedIntEventHandlerTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -71,7 +71,7 @@ public void testQueryBasedIntFailed() { IQueryService queryService = new IQueryService.NoOp() { @Override public IPayload execute(IEditingContext editingContext, QueryBasedIntInput input) { - return new ErrorPayload(UUID.randomUUID(), "An error occured"); //$NON-NLS-1$ + return new ErrorPayload(UUID.randomUUID(), "An error occured"); } }; @@ -89,7 +89,7 @@ public IPayload execute(IEditingContext editingContext, QueryBasedIntInput input private void handle(One payloadSink, Many changeDescriptionSink, IQueryService queryService) { QueryBasedIntEventHandler queryBasedIntEventHandler = new QueryBasedIntEventHandler(new ICollaborativeMessageService.NoOp(), new SimpleMeterRegistry(), queryService); - IInput input = new QueryBasedIntInput(UUID.randomUUID(), "", Map.of()); //$NON-NLS-1$ + IInput input = new QueryBasedIntInput(UUID.randomUUID(), "", Map.of()); assertThat(queryBasedIntEventHandler.canHandle(new IEditingContext.NoOp(), input)).isTrue(); IEditingContext editingContext = () -> UUID.randomUUID().toString(); diff --git a/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/QueryBasedObjectEventHandlerTests.java b/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/QueryBasedObjectEventHandlerTests.java index a74f9e6541..c475d7874e 100644 --- a/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/QueryBasedObjectEventHandlerTests.java +++ b/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/QueryBasedObjectEventHandlerTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -70,7 +70,7 @@ public void testQueryBasedObjectFailed() { IQueryService queryService = new IQueryService.NoOp() { @Override public IPayload execute(IEditingContext editingContext, QueryBasedObjectInput input) { - return new ErrorPayload(UUID.randomUUID(), "An error occured"); //$NON-NLS-1$ + return new ErrorPayload(UUID.randomUUID(), "An error occured"); } }; Many changeDescriptionSink = Sinks.many().unicast().onBackpressureBuffer(); @@ -87,7 +87,7 @@ public IPayload execute(IEditingContext editingContext, QueryBasedObjectInput in private void handle(One payloadSink, Many changeDescriptionSink, IQueryService queryService) { QueryBasedObjectEventHandler queryBasedObjectEventHandler = new QueryBasedObjectEventHandler(new ICollaborativeMessageService.NoOp(), new SimpleMeterRegistry(), queryService); - IInput input = new QueryBasedObjectInput(UUID.randomUUID(), "", Map.of()); //$NON-NLS-1$ + IInput input = new QueryBasedObjectInput(UUID.randomUUID(), "", Map.of()); assertThat(queryBasedObjectEventHandler.canHandle(new IEditingContext.NoOp(), input)).isTrue(); IEditingContext editingContext = () -> UUID.randomUUID().toString(); diff --git a/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/QueryBasedObjectsEventHandlerTests.java b/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/QueryBasedObjectsEventHandlerTests.java index 8c3a25f049..2440a19025 100644 --- a/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/QueryBasedObjectsEventHandlerTests.java +++ b/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/QueryBasedObjectsEventHandlerTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -71,7 +71,7 @@ public void testQueryBasedObjectsFailed() { IQueryService queryService = new IQueryService.NoOp() { @Override public IPayload execute(IEditingContext editingContext, QueryBasedObjectsInput input) { - return new ErrorPayload(UUID.randomUUID(), "An error occured"); //$NON-NLS-1$ + return new ErrorPayload(UUID.randomUUID(), "An error occured"); } }; Many changeDescriptionSink = Sinks.many().unicast().onBackpressureBuffer(); @@ -88,7 +88,7 @@ public IPayload execute(IEditingContext editingContext, QueryBasedObjectsInput i private void handle(One payloadSink, Many changeDescriptionSink, IQueryService queryService) { QueryBasedObjectsEventHandler queryBasedObjectsEventHandler = new QueryBasedObjectsEventHandler(new ICollaborativeMessageService.NoOp(), new SimpleMeterRegistry(), queryService); - IInput input = new QueryBasedObjectsInput(UUID.randomUUID(), "", Map.of()); //$NON-NLS-1$ + IInput input = new QueryBasedObjectsInput(UUID.randomUUID(), "", Map.of()); assertThat(queryBasedObjectsEventHandler.canHandle(new IEditingContext.NoOp(), input)).isTrue(); IEditingContext editingContext = () -> UUID.randomUUID().toString(); diff --git a/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/QueryBasedStringEventHandlerTests.java b/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/QueryBasedStringEventHandlerTests.java index f8c5b4c473..ec9a3b42bd 100644 --- a/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/QueryBasedStringEventHandlerTests.java +++ b/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/QueryBasedStringEventHandlerTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -40,7 +40,7 @@ * @author fbarbin */ public class QueryBasedStringEventHandlerTests { - private static final String EXPECTED_RESULT = "result"; //$NON-NLS-1$ + private static final String EXPECTED_RESULT = "result"; @Test public void testQueryBasedString() { @@ -69,7 +69,7 @@ public void testQueryBasedStringFailed() { IQueryService queryService = new IQueryService.NoOp() { @Override public IPayload execute(IEditingContext editingContext, QueryBasedStringInput input) { - return new ErrorPayload(UUID.randomUUID(), "An error occured"); //$NON-NLS-1$ + return new ErrorPayload(UUID.randomUUID(), "An error occured"); } }; Many changeDescriptionSink = Sinks.many().unicast().onBackpressureBuffer(); @@ -86,7 +86,7 @@ public IPayload execute(IEditingContext editingContext, QueryBasedStringInput in private void handle(One payloadSink, Many changeDescriptionSink, IQueryService queryService) { QueryBasedStringEventHandler queryBasedStringEventHandler = new QueryBasedStringEventHandler(new ICollaborativeMessageService.NoOp(), new SimpleMeterRegistry(), queryService); - IInput input = new QueryBasedStringInput(UUID.randomUUID(), "", Map.of()); //$NON-NLS-1$ + IInput input = new QueryBasedStringInput(UUID.randomUUID(), "", Map.of()); assertThat(queryBasedStringEventHandler.canHandle(new IEditingContext.NoOp(), input)).isTrue(); IEditingContext editingContext = () -> UUID.randomUUID().toString(); diff --git a/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/RenameObjectEventHandlerTests.java b/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/RenameObjectEventHandlerTests.java index 6b41297338..de2e7f89db 100644 --- a/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/RenameObjectEventHandlerTests.java +++ b/packages/core/backend/sirius-components-collaborative/src/test/java/org/eclipse/sirius/components/collaborative/handlers/RenameObjectEventHandlerTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -50,7 +50,7 @@ public Optional getObject(IEditingContext editingContext, String objectI @Override public Optional getLabelField(Object object) { - return Optional.of("label"); //$NON-NLS-1$ + return Optional.of("label"); } }; @@ -63,7 +63,7 @@ public void editLabel(Object object, String labelField, String newValue) { }; RenameObjectEventHandler handler = new RenameObjectEventHandler(new ICollaborativeMessageService.NoOp(), objectService, editService, new SimpleMeterRegistry()); - var input = new RenameObjectInput(UUID.randomUUID(), UUID.randomUUID().toString(), "objectId", "newName"); //$NON-NLS-1$ //$NON-NLS-2$ + var input = new RenameObjectInput(UUID.randomUUID(), UUID.randomUUID().toString(), "objectId", "newName"); IEditingContext editingContext = () -> UUID.randomUUID().toString(); assertThat(handler.canHandle(editingContext, input)).isTrue(); diff --git a/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/KindParser.java b/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/KindParser.java index f3124b83c2..1f948a0dba 100644 --- a/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/KindParser.java +++ b/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/KindParser.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -36,9 +36,9 @@ public class KindParser implements IKindParser { public Map> getParameterValues(String kind) { Map> parameterValues = new HashMap<>(); - List queryParameters = Arrays.asList(URI.create(kind).getQuery().split("&")); //$NON-NLS-1$ + List queryParameters = Arrays.asList(URI.create(kind).getQuery().split("&")); for (String queryParameter : queryParameters) { - String[] data = queryParameter.split("="); //$NON-NLS-1$ + String[] data = queryParameter.split("="); if (data.length == 2 && !data[0].isBlank() && !data[1].isBlank()) { var key = URLDecoder.decode(data[0], StandardCharsets.UTF_8); var value = URLDecoder.decode(data[1], StandardCharsets.UTF_8); diff --git a/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/RepresentationMetadata.java b/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/RepresentationMetadata.java index 9185d772c2..c75d392ac3 100644 --- a/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/RepresentationMetadata.java +++ b/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/RepresentationMetadata.java @@ -61,7 +61,7 @@ public String getTargetObjectId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, kind: {2}, label: {3}, descriptionId: {4}, targetObjectId: {5}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, kind: {2}, label: {3}, descriptionId: {4}, targetObjectId: {5}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.kind, this.label, this.descriptionId, this.targetObjectId); } } diff --git a/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/api/ChildCreationDescription.java b/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/api/ChildCreationDescription.java index 2fc7a436e6..f3a4797735 100644 --- a/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/api/ChildCreationDescription.java +++ b/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/api/ChildCreationDescription.java @@ -40,7 +40,7 @@ public String getLabel() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label); } } diff --git a/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/api/Domain.java b/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/api/Domain.java index e1e9505b8d..ab79c009a9 100644 --- a/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/api/Domain.java +++ b/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/api/Domain.java @@ -50,7 +50,7 @@ public boolean equals(Object obj) { @Override public int compareTo(Domain other) { - String customDomainPrefix = "domain://"; //$NON-NLS-1$ + String customDomainPrefix = "domain://"; // Make sure custom-defined domains are before non-custom ones if (this.id.startsWith(customDomainPrefix) && !other.id.startsWith(customDomainPrefix)) { return -1; @@ -61,7 +61,7 @@ public int compareTo(Domain other) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label); } diff --git a/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/api/Environment.java b/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/api/Environment.java index 22678972c4..4567282ee3 100644 --- a/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/api/Environment.java +++ b/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/api/Environment.java @@ -21,9 +21,9 @@ */ public class Environment { - public static final String ENVIRONMENT = "environment"; //$NON-NLS-1$ + public static final String ENVIRONMENT = "environment"; - public static final String SIRIUS_COMPONENTS = "siriusComponents"; //$NON-NLS-1$ + public static final String SIRIUS_COMPONENTS = "siriusComponents"; private final String name; diff --git a/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/api/ErrorPayload.java b/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/api/ErrorPayload.java index de68620e97..1f39693e63 100644 --- a/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/api/ErrorPayload.java +++ b/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/api/ErrorPayload.java @@ -42,7 +42,7 @@ public String getMessage() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, message: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, message: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.message); } } diff --git a/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/api/IEditingContext.java b/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/api/IEditingContext.java index 7503e71729..a2cadee13f 100644 --- a/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/api/IEditingContext.java +++ b/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/api/IEditingContext.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -22,7 +22,7 @@ public interface IEditingContext { /** * The name of the variable used to store and retrieve the editing context from a variable manager. */ - String EDITING_CONTEXT = "editingContext"; //$NON-NLS-1$ + String EDITING_CONTEXT = "editingContext"; String getId(); diff --git a/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/api/IObjectService.java b/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/api/IObjectService.java index 441d7f4ed2..69352b65ca 100644 --- a/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/api/IObjectService.java +++ b/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/api/IObjectService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -48,27 +48,27 @@ class NoOp implements IObjectService { @Override public String getId(Object object) { - return ""; //$NON-NLS-1$ + return ""; } @Override public String getLabel(Object object) { - return ""; //$NON-NLS-1$ + return ""; } @Override public String getKind(Object object) { - return ""; //$NON-NLS-1$ + return ""; } @Override public String getFullLabel(Object object) { - return ""; //$NON-NLS-1$ + return ""; } @Override public String getImagePath(Object object) { - return ""; //$NON-NLS-1$ + return ""; } @Override diff --git a/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/api/SemanticKindConstants.java b/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/api/SemanticKindConstants.java index dbfd965430..1cf45fdf7e 100644 --- a/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/api/SemanticKindConstants.java +++ b/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/api/SemanticKindConstants.java @@ -18,11 +18,11 @@ * @author sbegaudeau */ public final class SemanticKindConstants { - public static final String PREFIX = "siriusComponents://semantic"; //$NON-NLS-1$ + public static final String PREFIX = "siriusComponents://semantic"; - public static final String DOMAIN_ARGUMENT = "domain"; //$NON-NLS-1$ + public static final String DOMAIN_ARGUMENT = "domain"; - public static final String ENTITY_ARGUMENT = "entity"; //$NON-NLS-1$ + public static final String ENTITY_ARGUMENT = "entity"; private SemanticKindConstants() { // Prevent instantiation diff --git a/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/configuration/StereotypeDescription.java b/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/configuration/StereotypeDescription.java index 99844f8d94..2fd70e448c 100644 --- a/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/configuration/StereotypeDescription.java +++ b/packages/core/backend/sirius-components-core/src/main/java/org/eclipse/sirius/components/core/configuration/StereotypeDescription.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -64,7 +64,7 @@ public String getContent() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, documentName: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, documentName: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label, this.documentName); } } diff --git a/packages/core/backend/sirius-components-core/src/test/java/org/eclipse/sirius/components/core/architecture/ArchitectureConstants.java b/packages/core/backend/sirius-components-core/src/test/java/org/eclipse/sirius/components/core/architecture/ArchitectureConstants.java index d53e73314e..06536ebec8 100644 --- a/packages/core/backend/sirius-components-core/src/test/java/org/eclipse/sirius/components/core/architecture/ArchitectureConstants.java +++ b/packages/core/backend/sirius-components-core/src/test/java/org/eclipse/sirius/components/core/architecture/ArchitectureConstants.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -22,7 +22,7 @@ * @author sbegaudeau */ public final class ArchitectureConstants { - public static final String SIRIUS_COMPONENTS_CORE_ROOT_PACKAGE = "org.eclipse.sirius.components.core.."; //$NON-NLS-1$ + public static final String SIRIUS_COMPONENTS_CORE_ROOT_PACKAGE = "org.eclipse.sirius.components.core.."; // @formatter:off public static final JavaClasses CLASSES = new ClassFileImporter() diff --git a/packages/core/backend/sirius-components-graphql-api/src/main/java/org/eclipse/sirius/components/graphql/api/GraphQLConstants.java b/packages/core/backend/sirius-components-graphql-api/src/main/java/org/eclipse/sirius/components/graphql/api/GraphQLConstants.java index b2a47dc2d3..3eb0787fd4 100644 --- a/packages/core/backend/sirius-components-graphql-api/src/main/java/org/eclipse/sirius/components/graphql/api/GraphQLConstants.java +++ b/packages/core/backend/sirius-components-graphql-api/src/main/java/org/eclipse/sirius/components/graphql/api/GraphQLConstants.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -19,9 +19,9 @@ */ public final class GraphQLConstants { - public static final String GRAPHQL_BASE_PATH = "/api/graphql"; //$NON-NLS-1$ + public static final String GRAPHQL_BASE_PATH = "/api/graphql"; - public static final String SUBSCRIPTION_ID = "userId"; //$NON-NLS-1$ + public static final String SUBSCRIPTION_ID = "userId"; private GraphQLConstants() { // Prevent instantiation diff --git a/packages/core/backend/sirius-components-graphql-api/src/main/java/org/eclipse/sirius/components/graphql/api/LocalContextConstants.java b/packages/core/backend/sirius-components-graphql-api/src/main/java/org/eclipse/sirius/components/graphql/api/LocalContextConstants.java index 461281d515..e295e17ab0 100644 --- a/packages/core/backend/sirius-components-graphql-api/src/main/java/org/eclipse/sirius/components/graphql/api/LocalContextConstants.java +++ b/packages/core/backend/sirius-components-graphql-api/src/main/java/org/eclipse/sirius/components/graphql/api/LocalContextConstants.java @@ -18,9 +18,9 @@ * @author sbegaudeau */ public final class LocalContextConstants { - public static final String EDITING_CONTEXT_ID = "editingContextId"; //$NON-NLS-1$ + public static final String EDITING_CONTEXT_ID = "editingContextId"; - public static final String REPRESENTATION_ID = "representationId"; //$NON-NLS-1$ + public static final String REPRESENTATION_ID = "representationId"; private LocalContextConstants() { // Prevent instantiation diff --git a/packages/core/backend/sirius-components-graphql-api/src/main/java/org/eclipse/sirius/components/graphql/api/URLConstants.java b/packages/core/backend/sirius-components-graphql-api/src/main/java/org/eclipse/sirius/components/graphql/api/URLConstants.java index 0f7f65f0da..f46152aa0e 100644 --- a/packages/core/backend/sirius-components-graphql-api/src/main/java/org/eclipse/sirius/components/graphql/api/URLConstants.java +++ b/packages/core/backend/sirius-components-graphql-api/src/main/java/org/eclipse/sirius/components/graphql/api/URLConstants.java @@ -18,13 +18,13 @@ * @author sbegaudeau */ public final class URLConstants { - public static final String API_BASE_PATH = "/api"; //$NON-NLS-1$ + public static final String API_BASE_PATH = "/api"; - public static final String GRAPHQL_BASE_PATH = API_BASE_PATH + "/graphql"; //$NON-NLS-1$ + public static final String GRAPHQL_BASE_PATH = API_BASE_PATH + "/graphql"; - public static final String GRAPHQL_SUBSCRIPTION_PATH = "/subscriptions"; //$NON-NLS-1$ + public static final String GRAPHQL_SUBSCRIPTION_PATH = "/subscriptions"; - public static final String IMAGE_BASE_PATH = API_BASE_PATH + "/images"; //$NON-NLS-1$ + public static final String IMAGE_BASE_PATH = API_BASE_PATH + "/images"; private URLConstants() { // Prevent instantiation diff --git a/packages/core/backend/sirius-components-graphql-api/src/main/java/org/eclipse/sirius/components/graphql/api/UploadFile.java b/packages/core/backend/sirius-components-graphql-api/src/main/java/org/eclipse/sirius/components/graphql/api/UploadFile.java index ad0eb856a1..b8b9a41427 100644 --- a/packages/core/backend/sirius-components-graphql-api/src/main/java/org/eclipse/sirius/components/graphql/api/UploadFile.java +++ b/packages/core/backend/sirius-components-graphql-api/src/main/java/org/eclipse/sirius/components/graphql/api/UploadFile.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -41,7 +41,7 @@ public InputStream getInputStream() { @Override public String toString() { - String pattern = "{0} '{' name: {1} '}'"; //$NON-NLS-1$ + String pattern = "{0} '{' name: {1} '}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.name); } } diff --git a/packages/core/backend/sirius-components-graphql-api/src/main/java/org/eclipse/sirius/components/graphql/api/UploadScalarType.java b/packages/core/backend/sirius-components-graphql-api/src/main/java/org/eclipse/sirius/components/graphql/api/UploadScalarType.java index bb474df536..3a6bec9fd4 100644 --- a/packages/core/backend/sirius-components-graphql-api/src/main/java/org/eclipse/sirius/components/graphql/api/UploadScalarType.java +++ b/packages/core/backend/sirius-components-graphql-api/src/main/java/org/eclipse/sirius/components/graphql/api/UploadScalarType.java @@ -21,12 +21,12 @@ */ public class UploadScalarType { - public static final String UPLOAD_TYPE = "Upload"; //$NON-NLS-1$ + public static final String UPLOAD_TYPE = "Upload"; // @formatter:off public static final GraphQLScalarType INSTANCE = GraphQLScalarType.newScalar() .name(UPLOAD_TYPE) - .description("Upload type used for the file upload") //$NON-NLS-1$ + .description("Upload type used for the file upload") .coercing(new UploadScalarCoercing()) .build(); // @formatter:on diff --git a/packages/core/backend/sirius-components-representations/src/main/java/org/eclipse/sirius/components/representations/Fragment.java b/packages/core/backend/sirius-components-representations/src/main/java/org/eclipse/sirius/components/representations/Fragment.java index 221ec70588..cbdf1f8edd 100644 --- a/packages/core/backend/sirius-components-representations/src/main/java/org/eclipse/sirius/components/representations/Fragment.java +++ b/packages/core/backend/sirius-components-representations/src/main/java/org/eclipse/sirius/components/representations/Fragment.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -19,7 +19,7 @@ */ public class Fragment extends Element { - public static final String TYPE = "Fragment"; //$NON-NLS-1$ + public static final String TYPE = "Fragment"; public Fragment(FragmentProps props) { super(TYPE, props); diff --git a/packages/core/backend/sirius-components-representations/src/main/java/org/eclipse/sirius/components/representations/GetOrCreateRandomIdProvider.java b/packages/core/backend/sirius-components-representations/src/main/java/org/eclipse/sirius/components/representations/GetOrCreateRandomIdProvider.java index b30542f93b..db64380aac 100644 --- a/packages/core/backend/sirius-components-representations/src/main/java/org/eclipse/sirius/components/representations/GetOrCreateRandomIdProvider.java +++ b/packages/core/backend/sirius-components-representations/src/main/java/org/eclipse/sirius/components/representations/GetOrCreateRandomIdProvider.java @@ -23,7 +23,7 @@ */ public class GetOrCreateRandomIdProvider implements Function { - public static final String PREVIOUS_REPRESENTATION_ID = "previousRepresentationId"; //$NON-NLS-1$ + public static final String PREVIOUS_REPRESENTATION_ID = "previousRepresentationId"; @Override public String apply(VariableManager variableManager) { diff --git a/packages/core/backend/sirius-components-representations/src/main/java/org/eclipse/sirius/components/representations/IRepresentation.java b/packages/core/backend/sirius-components-representations/src/main/java/org/eclipse/sirius/components/representations/IRepresentation.java index 488a106f7d..440a8caecf 100644 --- a/packages/core/backend/sirius-components-representations/src/main/java/org/eclipse/sirius/components/representations/IRepresentation.java +++ b/packages/core/backend/sirius-components-representations/src/main/java/org/eclipse/sirius/components/representations/IRepresentation.java @@ -18,7 +18,7 @@ * @author sbegaudeau */ public interface IRepresentation { - String KIND_PREFIX = "siriusComponents://representation"; //$NON-NLS-1$ + String KIND_PREFIX = "siriusComponents://representation"; String getId(); diff --git a/packages/core/backend/sirius-components-representations/src/main/java/org/eclipse/sirius/components/representations/IRepresentationDescription.java b/packages/core/backend/sirius-components-representations/src/main/java/org/eclipse/sirius/components/representations/IRepresentationDescription.java index b2001b057e..af7f1f9af7 100644 --- a/packages/core/backend/sirius-components-representations/src/main/java/org/eclipse/sirius/components/representations/IRepresentationDescription.java +++ b/packages/core/backend/sirius-components-representations/src/main/java/org/eclipse/sirius/components/representations/IRepresentationDescription.java @@ -24,7 +24,7 @@ @PublicApi public interface IRepresentationDescription { - String CLASS = "class"; //$NON-NLS-1$ + String CLASS = "class"; String getId(); diff --git a/packages/core/backend/sirius-components-representations/src/main/java/org/eclipse/sirius/components/representations/Success.java b/packages/core/backend/sirius-components-representations/src/main/java/org/eclipse/sirius/components/representations/Success.java index 394b798793..2378522c12 100644 --- a/packages/core/backend/sirius-components-representations/src/main/java/org/eclipse/sirius/components/representations/Success.java +++ b/packages/core/backend/sirius-components-representations/src/main/java/org/eclipse/sirius/components/representations/Success.java @@ -23,14 +23,14 @@ */ public class Success implements IStatus { - public static final String NEW_SELECTION = "newSelection"; //$NON-NLS-1$ + public static final String NEW_SELECTION = "newSelection"; private final Map parameters; private final String changeKind; public Success() { - this("", new HashMap<>()); //$NON-NLS-1$ + this("", new HashMap<>()); } public Success(String changeKind, Map parameters) { diff --git a/packages/core/backend/sirius-components-representations/src/main/java/org/eclipse/sirius/components/representations/VariableManager.java b/packages/core/backend/sirius-components-representations/src/main/java/org/eclipse/sirius/components/representations/VariableManager.java index 65c3e20a91..7a8cfe26d5 100644 --- a/packages/core/backend/sirius-components-representations/src/main/java/org/eclipse/sirius/components/representations/VariableManager.java +++ b/packages/core/backend/sirius-components-representations/src/main/java/org/eclipse/sirius/components/representations/VariableManager.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -23,7 +23,7 @@ */ public class VariableManager { - public static final String SELF = "self"; //$NON-NLS-1$ + public static final String SELF = "self"; /** * The parent variable manager. @@ -93,9 +93,9 @@ public String toString() { String name = var.getKey(); Object value = var.getValue(); boolean local = this.variables.containsKey(name); - stringBuilder.append(name).append(" = ").append(value); //$NON-NLS-1$ + stringBuilder.append(name).append(" = ").append(value); if (!local) { - stringBuilder.append(" [inherited]"); //$NON-NLS-1$ + stringBuilder.append(" [inherited]"); } stringBuilder.append(System.lineSeparator()); } diff --git a/packages/core/backend/sirius-components-representations/src/main/java/org/eclipse/sirius/components/representations/WorkbenchSelection.java b/packages/core/backend/sirius-components-representations/src/main/java/org/eclipse/sirius/components/representations/WorkbenchSelection.java index 6c36be18f3..92ee8b4325 100644 --- a/packages/core/backend/sirius-components-representations/src/main/java/org/eclipse/sirius/components/representations/WorkbenchSelection.java +++ b/packages/core/backend/sirius-components-representations/src/main/java/org/eclipse/sirius/components/representations/WorkbenchSelection.java @@ -53,7 +53,7 @@ public int hashCode() { @Override public String toString() { - String pattern = "{0} '{'entries: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'entries: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.entries); } } diff --git a/packages/core/backend/sirius-components-representations/src/main/java/org/eclipse/sirius/components/representations/WorkbenchSelectionEntry.java b/packages/core/backend/sirius-components-representations/src/main/java/org/eclipse/sirius/components/representations/WorkbenchSelectionEntry.java index 9642cf49dc..94b87d4931 100644 --- a/packages/core/backend/sirius-components-representations/src/main/java/org/eclipse/sirius/components/representations/WorkbenchSelectionEntry.java +++ b/packages/core/backend/sirius-components-representations/src/main/java/org/eclipse/sirius/components/representations/WorkbenchSelectionEntry.java @@ -70,7 +70,7 @@ public int hashCode() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, kind: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, kind: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label, this.kind); } } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/DiagramChangeKind.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/DiagramChangeKind.java index b91049d805..5eac80a38c 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/DiagramChangeKind.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/DiagramChangeKind.java @@ -19,9 +19,9 @@ */ public final class DiagramChangeKind { - public static final String DIAGRAM_LAYOUT_CHANGE = "DIAGRAM_LAYOUT_CHANGE"; //$NON-NLS-1$ + public static final String DIAGRAM_LAYOUT_CHANGE = "DIAGRAM_LAYOUT_CHANGE"; - public static final String DIAGRAM_ELEMENT_VISIBILITY_CHANGE = "DIAGRAM_ELEMENT_VISIBILITY_CHANGE"; //$NON-NLS-1$ + public static final String DIAGRAM_ELEMENT_VISIBILITY_CHANGE = "DIAGRAM_ELEMENT_VISIBILITY_CHANGE"; private DiagramChangeKind() { // Prevent instantiation diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/DiagramCreationService.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/DiagramCreationService.java index fc07dc34a6..bf5b18c458 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/DiagramCreationService.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/DiagramCreationService.java @@ -69,7 +69,7 @@ public DiagramCreationService(IRepresentationDescriptionSearchService representa this.layoutService = Objects.requireNonNull(layoutService); // @formatter:off this.timer = Timer.builder(Monitoring.REPRESENTATION_EVENT_PROCESSOR_REFRESH) - .tag(Monitoring.NAME, "diagram") //$NON-NLS-1$ + .tag(Monitoring.NAME, "diagram") .register(meterRegistry); // @formatter:on } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/DiagramEventFlux.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/DiagramEventFlux.java index 06c524ce7e..2bf7d36ce7 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/DiagramEventFlux.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/DiagramEventFlux.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -49,7 +49,7 @@ public void diagramRefreshed(IInput input, Diagram newDiagram) { if (this.sink.currentSubscriberCount() > 0) { EmitResult emitResult = this.sink.tryEmitNext(new DiagramRefreshedEventPayload(input.getId(), this.currentDiagram)); if (emitResult.isFailure()) { - String pattern = "An error has occurred while emitting a DiagramRefreshedEventPayload: {}"; //$NON-NLS-1$ + String pattern = "An error has occurred while emitting a DiagramRefreshedEventPayload: {}"; this.logger.warn(pattern, emitResult); } } @@ -63,7 +63,7 @@ public Flux getFlux(IInput input) { public void dispose() { EmitResult emitResult = this.sink.tryEmitComplete(); if (emitResult.isFailure()) { - String pattern = "An error has occurred while marking the publisher as complete: {}"; //$NON-NLS-1$ + String pattern = "An error has occurred while marking the publisher as complete: {}"; this.logger.warn(pattern, emitResult); } } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/DiagramEventProcessor.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/DiagramEventProcessor.java index 1947be9183..8eca7a88c3 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/DiagramEventProcessor.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/DiagramEventProcessor.java @@ -73,7 +73,7 @@ public class DiagramEventProcessor implements IDiagramEventProcessor { public DiagramEventProcessor(IEditingContext editingContext, IDiagramContext diagramContext, List diagramEventHandlers, ISubscriptionManager subscriptionManager, IRepresentationDescriptionSearchService representationDescriptionSearchService, IRepresentationRefreshPolicyRegistry representationRefreshPolicyRegistry, IDiagramCreationService diagramCreationService) { - this.logger.trace("Creating the diagram event processor {}", diagramContext.getDiagram().getId()); //$NON-NLS-1$ + this.logger.trace("Creating the diagram event processor {}", diagramContext.getDiagram().getId()); this.editingContext = Objects.requireNonNull(editingContext); this.diagramContext = Objects.requireNonNull(diagramContext); @@ -90,7 +90,7 @@ public DiagramEventProcessor(IEditingContext editingContext, IDiagramContext dia this.diagramEventFlux = new DiagramEventFlux(diagram); if (diagram != null) { - this.logger.trace("Diagram refreshed: {})", diagram.getId()); //$NON-NLS-1$ + this.logger.trace("Diagram refreshed: {})", diagram.getId()); } } @@ -121,7 +121,7 @@ public void handle(One payloadSink, Many changeDesc IDiagramEventHandler diagramEventHandler = optionalDiagramEventHandler.get(); diagramEventHandler.handle(payloadSink, changeDescriptionSink, this.editingContext, this.diagramContext, diagramInput); } else { - this.logger.warn("No handler found for event: {}", diagramInput); //$NON-NLS-1$ + this.logger.warn("No handler found for event: {}", diagramInput); } } } @@ -131,7 +131,7 @@ public void refresh(ChangeDescription changeDescription) { if (this.shouldRefresh(changeDescription)) { Diagram refreshedDiagram = this.diagramCreationService.refresh(this.editingContext, this.diagramContext).orElse(null); if (refreshedDiagram != null) { - this.logger.trace("Diagram refreshed: {}", refreshedDiagram.getId()); //$NON-NLS-1$ + this.logger.trace("Diagram refreshed: {}", refreshedDiagram.getId()); } this.diagramContext.reset(); @@ -186,7 +186,7 @@ public Flux getOutputEvents(IInput input) { @Override public void dispose() { - this.logger.trace("Disposing the diagram event processor {}", this.diagramContext.getDiagram().getId()); //$NON-NLS-1$ + this.logger.trace("Disposing the diagram event processor {}", this.diagramContext.getDiagram().getId()); this.subscriptionManager.dispose(); this.diagramEventFlux.dispose(); diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/DiagramImagePathService.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/DiagramImagePathService.java index 3dbc10a022..ec6101c34a 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/DiagramImagePathService.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/DiagramImagePathService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -26,7 +26,7 @@ public class DiagramImagePathService implements IImagePathService { @Override public List getPaths() { - return List.of("/diagram-images/"); //$NON-NLS-1$ + return List.of("/diagram-images/"); } } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/DiagramImageProvider.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/DiagramImageProvider.java index 861310ec3e..5eb5a1de11 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/DiagramImageProvider.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/DiagramImageProvider.java @@ -29,7 +29,7 @@ public class DiagramImageProvider implements IRepresentationImageProvider { @Override public Optional getImageURL(String kind) { if (Diagram.KIND.equals(kind)) { - return Optional.of("/diagram-images/diagram.svg"); //$NON-NLS-1$ + return Optional.of("/diagram-images/diagram.svg"); } return Optional.empty(); } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/ILayoutStrategyDeserializer.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/ILayoutStrategyDeserializer.java index 564c1daa5a..27375e4f95 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/ILayoutStrategyDeserializer.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/ILayoutStrategyDeserializer.java @@ -51,7 +51,7 @@ public ILayoutStrategy deserialize(JsonParser jsonParser, DeserializationContext if (objectCodec instanceof ObjectMapper) { ObjectMapper mapper = (ObjectMapper) objectCodec; ObjectNode root = mapper.readTree(jsonParser); - switch (root.get("kind").asText()) { //$NON-NLS-1$ + switch (root.get("kind").asText()) { case ListLayoutStrategy.KIND: layoutStrategy = mapper.readValue(root.toString(), ListLayoutStrategy.class); break; diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/api/DiagramImageConstants.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/api/DiagramImageConstants.java index 1e51d97873..b399afd059 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/api/DiagramImageConstants.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/api/DiagramImageConstants.java @@ -19,13 +19,13 @@ */ public final class DiagramImageConstants { - private static final String IMAGES_ROOT_FOLDER = "/diagram-images"; //$NON-NLS-1$ + private static final String IMAGES_ROOT_FOLDER = "/diagram-images"; - public static final String EDIT_SVG = IMAGES_ROOT_FOLDER + "/edit.svg"; //$NON-NLS-1$ + public static final String EDIT_SVG = IMAGES_ROOT_FOLDER + "/edit.svg"; - public static final String SEMANTIC_DELETE_SVG = IMAGES_ROOT_FOLDER + "/semanticDelete.svg"; //$NON-NLS-1$ + public static final String SEMANTIC_DELETE_SVG = IMAGES_ROOT_FOLDER + "/semanticDelete.svg"; - public static final String GRAPHICAL_DELETE_SVG = IMAGES_ROOT_FOLDER + "/graphicalDelete.svg"; //$NON-NLS-1$ + public static final String GRAPHICAL_DELETE_SVG = IMAGES_ROOT_FOLDER + "/graphicalDelete.svg"; private DiagramImageConstants() { // Prevent instantiation diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/api/IDiagramContext.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/api/IDiagramContext.java index 31c734e682..ea74945e3e 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/api/IDiagramContext.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/api/IDiagramContext.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo and others. + * Copyright (c) 2019, 2022 Obeo and others. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -29,7 +29,7 @@ public interface IDiagramContext { /** * The name of the variable used to store and retrieve the diagram context from a variable manager. */ - String DIAGRAM_CONTEXT = "diagramContext"; //$NON-NLS-1$ + String DIAGRAM_CONTEXT = "diagramContext"; Diagram getDiagram(); diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/api/ParametricSVGImage.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/api/ParametricSVGImage.java index b21427526c..39c78c3a55 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/api/ParametricSVGImage.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/api/ParametricSVGImage.java @@ -48,7 +48,7 @@ public String getPath() { @Override public String toString() { - String pattern = "{0} '{' id: {1}, label: {2}, path: {3} '}'"; //$NON-NLS-1$ + String pattern = "{0} '{' id: {1}, label: {2}, path: {3} '}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label, this.path); } } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/api/SVGAttribute.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/api/SVGAttribute.java index dae7bbbf4d..3b6af4e32d 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/api/SVGAttribute.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/api/SVGAttribute.java @@ -18,14 +18,14 @@ * @author lfasani */ public enum SVGAttribute { - WIDTH("width"), //$NON-NLS-1$ - HEIGHT("height"), //$NON-NLS-1$ - LABELWIDTH("labelWidth"), //$NON-NLS-1$ - LABELHEIGHT("labelHeight"), //$NON-NLS-1$ - COLOR("color"), //$NON-NLS-1$ - BORDERCOLOR("borderColor"), //$NON-NLS-1$ - BORDERSTYLE("borderStyle"), //$NON-NLS-1$ - BORDERSIZE("borderSize"); //$NON-NLS-1$ + WIDTH("width"), + HEIGHT("height"), + LABELWIDTH("labelWidth"), + LABELHEIGHT("labelHeight"), + COLOR("color"), + BORDERCOLOR("borderColor"), + BORDERSTYLE("borderStyle"), + BORDERSIZE("borderSize"); private String label; diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/configuration/CollaborativeDiagramMessageServiceConfiguration.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/configuration/CollaborativeDiagramMessageServiceConfiguration.java index d6cf791ee8..b6b0a898d5 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/configuration/CollaborativeDiagramMessageServiceConfiguration.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/configuration/CollaborativeDiagramMessageServiceConfiguration.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -24,7 +24,7 @@ */ @Configuration public class CollaborativeDiagramMessageServiceConfiguration { - private static final String PATH = "messages/sirius-web-spring-collaborative-diagrams"; //$NON-NLS-1$ + private static final String PATH = "messages/sirius-web-spring-collaborative-diagrams"; @Bean public MessageSourceAccessor collaborativeDiagramMessageSourceAccessor() { diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/ArrangeAllInput.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/ArrangeAllInput.java index 4ef126fb92..e481d213b2 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/ArrangeAllInput.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/ArrangeAllInput.java @@ -57,7 +57,7 @@ public String getEditingContextId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.representationId); } } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/ArrangeAllSuccessPayload.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/ArrangeAllSuccessPayload.java index 83e2ed1d33..2a2302f5b1 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/ArrangeAllSuccessPayload.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/ArrangeAllSuccessPayload.java @@ -37,7 +37,7 @@ public UUID getId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/DeleteFromDiagramInput.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/DeleteFromDiagramInput.java index b01cff8c9e..4fda57c32a 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/DeleteFromDiagramInput.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/DeleteFromDiagramInput.java @@ -79,7 +79,7 @@ public DeletionPolicy getDeletionPolicy() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, deletionPolicy: {4}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, deletionPolicy: {4}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.representationId, this.deletionPolicy); } } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/DeleteFromDiagramSuccessPayload.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/DeleteFromDiagramSuccessPayload.java index f95ffed2ac..ab59d4db4d 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/DeleteFromDiagramSuccessPayload.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/DeleteFromDiagramSuccessPayload.java @@ -45,7 +45,7 @@ public Diagram getdiagram() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, diagram: '{'id: {2}, label: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, diagram: '{'id: {2}, label: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.diagram.getId(), this.diagram.getLabel()); } } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/DiagramEventInput.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/DiagramEventInput.java index 7594479324..339afbecf2 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/DiagramEventInput.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/DiagramEventInput.java @@ -55,7 +55,7 @@ public String getDiagramId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, diagramId: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, diagramId: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.editingContextId, this.diagramId); } } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/DiagramRefreshedEventPayload.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/DiagramRefreshedEventPayload.java index dbf4ccadf9..fd94c8ce4a 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/DiagramRefreshedEventPayload.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/DiagramRefreshedEventPayload.java @@ -45,7 +45,7 @@ public Diagram getDiagram() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, diagram: '{'id: {2}, label: {3}'}''}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, diagram: '{'id: {2}, label: {3}'}''}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.diagram.getId(), this.diagram.getLabel()); } } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/DropOnDiagramInput.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/DropOnDiagramInput.java index ca8de297a6..3003b6cfb7 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/DropOnDiagramInput.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/DropOnDiagramInput.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo and others. + * Copyright (c) 2019, 2022 Obeo and others. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -70,7 +70,7 @@ public double getStartingPositionY() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, diagramTargetElementId: {3}, representationId: {4}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, diagramTargetElementId: {3}, representationId: {4}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.diagramTargetElementId, this.representationId); } } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/DropOnDiagramSuccessPayload.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/DropOnDiagramSuccessPayload.java index 486576c0c8..a6cbd57d20 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/DropOnDiagramSuccessPayload.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/DropOnDiagramSuccessPayload.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo and others. + * Copyright (c) 2019, 2022 Obeo and others. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -45,7 +45,7 @@ public Diagram getdiagram() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, diagram: '{'id: {2}, label: {3}'}''}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, diagram: '{'id: {2}, label: {3}'}''}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.diagram.getId(), this.diagram.getLabel()); } } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/EditLabelInput.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/EditLabelInput.java index 7b8b18a16b..af4609a668 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/EditLabelInput.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/EditLabelInput.java @@ -57,7 +57,7 @@ public String getNewText() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, labelId: {4}, newText:{5}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, labelId: {4}, newText:{5}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.representationId, this.labelId, this.newText); } } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/EditLabelSuccessPayload.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/EditLabelSuccessPayload.java index d95de3b2eb..e08888f53a 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/EditLabelSuccessPayload.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/EditLabelSuccessPayload.java @@ -45,7 +45,7 @@ public Diagram getDiagram() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, diagram: '{'id: {2}, label: {3}'}''}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, diagram: '{'id: {2}, label: {3}'}''}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.diagram.getId(), this.diagram.getLabel()); } } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/ExportRepresentationPayload.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/ExportRepresentationPayload.java index 3ff96075c8..5f91b1c441 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/ExportRepresentationPayload.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/ExportRepresentationPayload.java @@ -51,7 +51,7 @@ public String getContent() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, name: {2}, content: {3} '}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, name: {2}, content: {3} '}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.name, this.content); } } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/FadeDiagramElementInput.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/FadeDiagramElementInput.java index bc000add6c..cd3a8459d8 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/FadeDiagramElementInput.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/FadeDiagramElementInput.java @@ -72,7 +72,7 @@ public boolean isFade() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, fade: {4}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, fade: {4}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.representationId, this.fade); } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/FadeDiagramElementSuccessPayload.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/FadeDiagramElementSuccessPayload.java index 1bc07204ff..f0887a7390 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/FadeDiagramElementSuccessPayload.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/FadeDiagramElementSuccessPayload.java @@ -38,7 +38,7 @@ public UUID getId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, diagram: '{'id: {2}, label: {3}'}''}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, diagram: '{'id: {2}, label: {3}'}''}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName()); } } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/GetConnectorToolsInput.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/GetConnectorToolsInput.java index 890c563874..daabec8e6a 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/GetConnectorToolsInput.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/GetConnectorToolsInput.java @@ -67,7 +67,7 @@ public String getTargetDiagramElementId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, sourceDiagramElementId: {4}, targetDiagramElementId: {5}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, sourceDiagramElementId: {4}, targetDiagramElementId: {5}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.representationId, this.sourceDiagramElementId, this.targetDiagramElementId); } } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/GetConnectorToolsSuccessPayload.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/GetConnectorToolsSuccessPayload.java index 1df8e7d114..572ac85b57 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/GetConnectorToolsSuccessPayload.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/GetConnectorToolsSuccessPayload.java @@ -47,7 +47,7 @@ public List getConnectorTools() { @Override public String toString() { String tools = Arrays.toString(this.connectorTools.toArray()); - String pattern = "{0} '{'id: {1}, tools: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, tools: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, tools); } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/GetToolSectionSuccessPayload.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/GetToolSectionSuccessPayload.java index f6cf92d516..6ab5b21885 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/GetToolSectionSuccessPayload.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/GetToolSectionSuccessPayload.java @@ -46,7 +46,7 @@ public List getToolSections() { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName()); } } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/GetToolSectionsInput.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/GetToolSectionsInput.java index 1e24301199..548b1096f9 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/GetToolSectionsInput.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/GetToolSectionsInput.java @@ -59,7 +59,7 @@ public String getDiagramElementId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, diagramElementId: {4}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, diagramElementId: {4}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.representationId, this.diagramElementId); } } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/HideDiagramElementInput.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/HideDiagramElementInput.java index 0879d1a2bc..8f38a8afa5 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/HideDiagramElementInput.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/HideDiagramElementInput.java @@ -72,7 +72,7 @@ public boolean isHide() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, hide: {4}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, hide: {4}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.representationId, this.hide); } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/HideDiagramElementSuccessPayload.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/HideDiagramElementSuccessPayload.java index 33cedb2b67..4dbff9d7c8 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/HideDiagramElementSuccessPayload.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/HideDiagramElementSuccessPayload.java @@ -38,7 +38,7 @@ public UUID getId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, diagram: '{'id: {2}, label: {3}'}''}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, diagram: '{'id: {2}, label: {3}'}''}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName()); } } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/InitialDirectEditElementLabelInput.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/InitialDirectEditElementLabelInput.java index 6e0c934ed4..c4425c00cc 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/InitialDirectEditElementLabelInput.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/InitialDirectEditElementLabelInput.java @@ -60,7 +60,7 @@ public String getLabelId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, labelId: {4}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, labelId: {4}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.representationId, this.labelId); } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/InitialDirectEditElementLabelSuccessPayload.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/InitialDirectEditElementLabelSuccessPayload.java index 300b188580..11004c5efe 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/InitialDirectEditElementLabelSuccessPayload.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/InitialDirectEditElementLabelSuccessPayload.java @@ -45,7 +45,7 @@ public String getInitialDirectEditElementLabel() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, initialDirectEditElementLabel: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, initialDirectEditElementLabel: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.initialDirectEditElementLabel); } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/InvokeDeleteToolOnDiagramInput.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/InvokeDeleteToolOnDiagramInput.java index 7a31844bc9..c851ef9307 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/InvokeDeleteToolOnDiagramInput.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/InvokeDeleteToolOnDiagramInput.java @@ -57,7 +57,7 @@ public String getToolId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, diagramElementId: {4}, toolId: {5}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, diagramElementId: {4}, toolId: {5}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.representationId, this.diagramElementId, this.toolId); } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/InvokeDeleteToolOnDiagramSuccessPayload.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/InvokeDeleteToolOnDiagramSuccessPayload.java index 171bd0d27d..0e42c45090 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/InvokeDeleteToolOnDiagramSuccessPayload.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/InvokeDeleteToolOnDiagramSuccessPayload.java @@ -45,7 +45,7 @@ public Diagram getDiagram() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, diagram: '{'id: {2}, label: {3}'}''}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, diagram: '{'id: {2}, label: {3}'}''}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.diagram.getId(), this.diagram.getLabel()); } } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/InvokeSingleClickOnDiagramElementToolInput.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/InvokeSingleClickOnDiagramElementToolInput.java index 757e8fbd9d..57472041c4 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/InvokeSingleClickOnDiagramElementToolInput.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/InvokeSingleClickOnDiagramElementToolInput.java @@ -86,7 +86,7 @@ public static Builder newInvokeSingleClickOnDiagramElementToolInput(UUID id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, diagramElementId: {4}, toolId: {5}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, diagramElementId: {4}, toolId: {5}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.representationId, this.diagramElementId, this.toolId); } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/InvokeSingleClickOnDiagramElementToolSuccessPayload.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/InvokeSingleClickOnDiagramElementToolSuccessPayload.java index aaa4636694..52c889a1d1 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/InvokeSingleClickOnDiagramElementToolSuccessPayload.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/InvokeSingleClickOnDiagramElementToolSuccessPayload.java @@ -45,7 +45,7 @@ public WorkbenchSelection getNewSelection() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, newSelection: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, newSelection: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.getId(), this.newSelection); } } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/InvokeSingleClickOnTwoDiagramElementsToolInput.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/InvokeSingleClickOnTwoDiagramElementsToolInput.java index 6192ab1fdd..d8dd181bd8 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/InvokeSingleClickOnTwoDiagramElementsToolInput.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/InvokeSingleClickOnTwoDiagramElementsToolInput.java @@ -88,7 +88,7 @@ public double getTargetPositionY() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, diagramSourceElementId: {4}, diagramTargetElementId: {5}, toolId: {6}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, diagramSourceElementId: {4}, diagramTargetElementId: {5}, toolId: {6}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.representationId, this.diagramSourceElementId, this.diagramTargetElementId, this.toolId); } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/InvokeSingleClickOnTwoDiagramElementsToolSuccessPayload.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/InvokeSingleClickOnTwoDiagramElementsToolSuccessPayload.java index d1fd00a7f1..8da849a8c8 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/InvokeSingleClickOnTwoDiagramElementsToolSuccessPayload.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/InvokeSingleClickOnTwoDiagramElementsToolSuccessPayload.java @@ -46,7 +46,7 @@ public WorkbenchSelection getNewSelection() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, newSelection: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, newSelection: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.getId(), this.newSelection); } } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/ReconnectEdgeInput.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/ReconnectEdgeInput.java index ba6828244a..7ff542f34b 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/ReconnectEdgeInput.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/ReconnectEdgeInput.java @@ -86,7 +86,7 @@ public Position getNewEdgeEndPosition() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.representationId); } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/ReconnectEdgeSuccessPayload.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/ReconnectEdgeSuccessPayload.java index 2c0097b053..06ebd08136 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/ReconnectEdgeSuccessPayload.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/ReconnectEdgeSuccessPayload.java @@ -38,7 +38,7 @@ public UUID getId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, '}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, '}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/RenameDiagramInput.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/RenameDiagramInput.java index bd10ecb548..235a80c6d1 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/RenameDiagramInput.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/RenameDiagramInput.java @@ -64,7 +64,7 @@ public String getNewLabel() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, diagramId: {3}, newLabel: {4}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, diagramId: {3}, newLabel: {4}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.diagramId, this.newLabel); } } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/UpdateEdgeRoutingPointsInput.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/UpdateEdgeRoutingPointsInput.java index b64163c9a7..4f136d98e0 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/UpdateEdgeRoutingPointsInput.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/UpdateEdgeRoutingPointsInput.java @@ -72,7 +72,7 @@ public List getRoutingPoints() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, diagramElementId: {4}, routingPoints: {5}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, diagramElementId: {4}, routingPoints: {5}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.representationId, this.diagramElementId, this.routingPoints); } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/UpdateEdgeRoutingPointsSuccessPayload.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/UpdateEdgeRoutingPointsSuccessPayload.java index 848b13d0f1..6e1a582b05 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/UpdateEdgeRoutingPointsSuccessPayload.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/UpdateEdgeRoutingPointsSuccessPayload.java @@ -38,7 +38,7 @@ public UUID getId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, '}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, '}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/UpdateNodeBoundsInput.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/UpdateNodeBoundsInput.java index 3852f554a9..2a85ef8754 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/UpdateNodeBoundsInput.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/UpdateNodeBoundsInput.java @@ -76,7 +76,7 @@ public double getNewHeight() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, diagramElementId: {4}, newPositionX: {5}, newPositionY: {6}, newWidth: {7}, newHeight: {8}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, diagramElementId: {4}, newPositionX: {5}, newPositionY: {6}, newWidth: {7}, newHeight: {8}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.representationId, this.diagramElementId, this.newPositionX, this.newPositionY, this.newWidth, this.newHeight); } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/UpdateNodeBoundsSuccessPayload.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/UpdateNodeBoundsSuccessPayload.java index d21960cca2..7bfaa0323f 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/UpdateNodeBoundsSuccessPayload.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/UpdateNodeBoundsSuccessPayload.java @@ -45,7 +45,7 @@ public Diagram getDiagram() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, diagram: '{'id: {2}, label: {3}'}''}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, diagram: '{'id: {2}, label: {3}'}''}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.diagram.getId(), this.diagram.getLabel()); } } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/UpdateNodePositionInput.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/UpdateNodePositionInput.java index bb92fdc90e..6ea06dbaab 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/UpdateNodePositionInput.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/UpdateNodePositionInput.java @@ -63,7 +63,7 @@ public double getNewPositionY() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, diagramElementId: {4}, newPositionX: {5}, newPositionY: {6}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, diagramElementId: {4}, newPositionX: {5}, newPositionY: {6}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.representationId, this.diagramElementId, this.newPositionX, this.newPositionY); } } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/UpdateNodePositionSuccessPayload.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/UpdateNodePositionSuccessPayload.java index 29cd01496a..904fc358d7 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/UpdateNodePositionSuccessPayload.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/UpdateNodePositionSuccessPayload.java @@ -45,7 +45,7 @@ public Diagram getDiagram() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, diagram: '{'id: {2}, label: {3}'}''}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, diagram: '{'id: {2}, label: {3}'}''}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.diagram.getId(), this.diagram.getLabel()); } } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/export/svg/DiagramElementExportService.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/export/svg/DiagramElementExportService.java index 99f37b19f5..0152343585 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/export/svg/DiagramElementExportService.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/export/svg/DiagramElementExportService.java @@ -45,14 +45,14 @@ public StringBuilder exportLabel(Label label, float opacity) { Position alignment = label.getAlignment(); LabelStyle style = label.getStyle(); - labelExport.append(""); //$NON-NLS-1$ + labelExport.append(""); if (!(style.getIconURL().isEmpty())) { labelExport.append(this.exportImageElement(style.getIconURL(), -20, -12, Optional.empty(), 1)); @@ -60,22 +60,22 @@ public StringBuilder exportLabel(Label label, float opacity) { labelExport.append(this.exportTextElement(label.getText(), label.getType(), style)); - return labelExport.append(""); //$NON-NLS-1$ + return labelExport.append(""); } public StringBuilder exportImageElement(String imageURL, int x, int y, Optional size, float nodeOpacity) { StringBuilder imageExport = new StringBuilder(); UUID symbolId = this.imageRegistry.registerImage(imageURL); if (symbolId != null) { - imageExport.append(" imageExport.append(this.addSizeParam(it))); - imageExport.append("style=\""); //$NON-NLS-1$ - imageExport.append("opacity: " + nodeOpacity + "; "); //$NON-NLS-1$ //$NON-NLS-2$ - imageExport.append("\" "); //$NON-NLS-1$ - imageExport.append("/>"); //$NON-NLS-1$ + imageExport.append("style=\""); + imageExport.append("opacity: " + nodeOpacity + "; "); + imageExport.append("\" "); + imageExport.append("/>"); } return imageExport; } @@ -90,124 +90,124 @@ public StringBuilder exportImageElement(String imageURL, int x, int y, Optional< public StringBuilder exportGNodeElement(Node node) { StringBuilder gExport = new StringBuilder(); - gExport.append(""); //$NON-NLS-1$ + return gExport.append(">"); } public StringBuilder exportRectangleElement(Size size, Position position, RectangleStyle rectangleStyle) { StringBuilder rectangle = new StringBuilder(); - rectangle.append(" rectangle.append("rx=\"" + radius + "\" ")); //$NON-NLS-1$ //$NON-NLS-2$ + rectangle.append(" rectangle.append("rx=\"" + radius + "\" ")); rectangle.append(this.addSizeParam(size)); rectangle.append(this.exportRectangleStyleParam(rectangleStyle)); - return rectangle.append("/> "); //$NON-NLS-1$ + return rectangle.append("/> "); } private StringBuilder addSizeParam(Size size) { StringBuilder sizeParam = new StringBuilder(); - sizeParam.append("width=\"" + size.getWidth() + "\" "); //$NON-NLS-1$ //$NON-NLS-2$ - return sizeParam.append("height=\"" + size.getHeight() + "\" "); //$NON-NLS-1$ //$NON-NLS-2$ + sizeParam.append("width=\"" + size.getWidth() + "\" "); + return sizeParam.append("height=\"" + size.getHeight() + "\" "); } private StringBuilder exportTextElement(String text, String type, LabelStyle labelStyle) { StringBuilder textExport = new StringBuilder(); - textExport.append(""); //$NON-NLS-1$ + textExport.append("\">"); - String[] lines = text.split("\\n", -1); //$NON-NLS-1$ + String[] lines = text.split("\\n", -1); if (lines.length == 1) { textExport.append(text); } else { - textExport.append("" + lines[0] + ""); //$NON-NLS-1$//$NON-NLS-2$ + textExport.append("" + lines[0] + ""); double fontSize = labelStyle.getFontSize(); for (int i = 1; i < lines.length; i++) { if (lines[i].isEmpty()) { // avoid tspan to be ignored if there is only a line return - lines[i] = " "; //$NON-NLS-1$ + lines[i] = " "; } - textExport.append("" + lines[i] + ""); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ + textExport.append("" + lines[i] + ""); } } - return textExport.append(""); //$NON-NLS-1$ + return textExport.append(""); } private StringBuilder exportFont(LabelStyle labelStyle) { StringBuilder textExport = new StringBuilder(); - textExport.append("font-size: " + labelStyle.getFontSize() + "px; "); //$NON-NLS-1$ //$NON-NLS-2$ - textExport.append("font-family: Arial, Helvetica, sans-serif; "); //$NON-NLS-1$ + textExport.append("font-size: " + labelStyle.getFontSize() + "px; "); + textExport.append("font-family: Arial, Helvetica, sans-serif; "); - textExport.append("font-weight: "); //$NON-NLS-1$ + textExport.append("font-weight: "); if (labelStyle.isBold()) { - textExport.append("bold"); //$NON-NLS-1$ + textExport.append("bold"); } else { - textExport.append("normal"); //$NON-NLS-1$ + textExport.append("normal"); } - textExport.append("; "); //$NON-NLS-1$ + textExport.append("; "); - textExport.append("font-style: "); //$NON-NLS-1$ + textExport.append("font-style: "); if (labelStyle.isItalic()) { - textExport.append("italic"); //$NON-NLS-1$ + textExport.append("italic"); } else { - textExport.append("normal"); //$NON-NLS-1$ + textExport.append("normal"); } - textExport.append("; "); //$NON-NLS-1$ + textExport.append("; "); - textExport.append("text-decoration: "); //$NON-NLS-1$ + textExport.append("text-decoration: "); if (labelStyle.isUnderline() || labelStyle.isStrikeThrough()) { if (labelStyle.isUnderline()) { - textExport.append("underline "); //$NON-NLS-1$ + textExport.append("underline "); } if (labelStyle.isStrikeThrough()) { - textExport.append("line-through"); //$NON-NLS-1$ + textExport.append("line-through"); } } else { - textExport.append("none"); //$NON-NLS-1$ + textExport.append("none"); } - return textExport.append(";"); //$NON-NLS-1$ + return textExport.append(";"); } private StringBuilder exportRectangleStyleParam(RectangleStyle rectangleStyle) { StringBuilder styleExport = new StringBuilder(); - styleExport.append("style=\""); //$NON-NLS-1$ + styleExport.append("style=\""); if (Optional.ofNullable(rectangleStyle.getColor()).isPresent()) { - styleExport.append("fill: " + rectangleStyle.getColor() + "; "); //$NON-NLS-1$ //$NON-NLS-2$ + styleExport.append("fill: " + rectangleStyle.getColor() + "; "); } else { - styleExport.append("fill-opacity: " + 0 + "; "); //$NON-NLS-1$ //$NON-NLS-2$ + styleExport.append("fill-opacity: " + 0 + "; "); } - styleExport.append("opacity: " + rectangleStyle.getOpacity() + "; "); //$NON-NLS-1$ //$NON-NLS-2$ + styleExport.append("opacity: " + rectangleStyle.getOpacity() + "; "); - Optional.ofNullable(rectangleStyle.getBorderColor()).ifPresent(it -> styleExport.append("stroke: " + it + "; ")); //$NON-NLS-1$ //$NON-NLS-2$ - Optional.ofNullable(rectangleStyle.getBorderSize()).ifPresent(it -> styleExport.append("stroke-width: " + it + "px; ")); //$NON-NLS-1$ //$NON-NLS-2$ + Optional.ofNullable(rectangleStyle.getBorderColor()).ifPresent(it -> styleExport.append("stroke: " + it + "; ")); + Optional.ofNullable(rectangleStyle.getBorderSize()).ifPresent(it -> styleExport.append("stroke-width: " + it + "px; ")); Optional.ofNullable(rectangleStyle.getBorderStyle()).ifPresent(style -> styleExport.append(this.exportBorderStyle(style))); - return styleExport.append("\""); //$NON-NLS-1$ + return styleExport.append("\""); } private StringBuilder exportBorderStyle(LineStyle borderStyle) { StringBuilder style = new StringBuilder(); switch (borderStyle.toString()) { - case "Dash": //$NON-NLS-1$ - style.append(" stroke-dasharray: 4, 4;"); //$NON-NLS-1$ + case "Dash": + style.append(" stroke-dasharray: 4, 4;"); break; - case "Dot": //$NON-NLS-1$ - style.append(" stroke-dasharray: 2, 2;"); //$NON-NLS-1$ + case "Dot": + style.append(" stroke-dasharray: 2, 2;"); break; - case "Dash_Dot": //$NON-NLS-1$ - style.append(" stroke-dasharray: 2, 4, 2;"); //$NON-NLS-1$ + case "Dash_Dot": + style.append(" stroke-dasharray: 2, 4, 2;"); break; default: break; diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/export/svg/DiagramExportService.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/export/svg/DiagramExportService.java index bb05752998..d198fda6db 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/export/svg/DiagramExportService.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/export/svg/DiagramExportService.java @@ -35,7 +35,7 @@ @Service @SuppressWarnings("checkstyle:MultipleStringLiterals") public class DiagramExportService implements ISVGDiagramExportService { - private static final String SVG_NAMESPACE = "xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" "; //$NON-NLS-1$ + private static final String SVG_NAMESPACE = "xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" "; private final NodeExportService nodeExport; @@ -62,17 +62,17 @@ public String export(Diagram diagram) { StringBuilder svg = new StringBuilder(); svg.append(this.addSvgRoot(diagram)); - svg.append(""); //$NON-NLS-1$ ) + svg.append(""); Map id2NodeHierarchy = new HashMap<>(); diagram.getNodes().forEach(node -> this.exportNode(svg, node, diagram.getId(), id2NodeHierarchy)); diagram.getEdges().forEach(edge -> svg.append(this.edgeExport.export(edge, id2NodeHierarchy))); - svg.append(""); //$NON-NLS-1$ + svg.append(""); svg.append(this.imageRegistry.getReferencedImageSymbols()); - return svg.append("").toString(); //$NON-NLS-1$ + return svg.append("").toString(); } private void exportNode(StringBuilder svg, Node node, String diagramId, Map id2NodeHierarchy) { @@ -83,12 +83,12 @@ private void exportNode(StringBuilder svg, Node node, String diagramId, Map"); //$NON-NLS-1$ + rootSvg.append("tabindex=\"0\" "); + rootSvg.append("style=\"cursor: pointer; outline: transparent solid 1px;\""); + return rootSvg.append(">"); } /** @@ -119,7 +119,7 @@ private StringBuilder addSvgRoot(Diagram diagram) { private StringBuilder computeViewBox(Diagram diagram) { StringBuilder viewBoxExport = new StringBuilder(); - viewBoxExport.append("viewBox=\""); //$NON-NLS-1$ + viewBoxExport.append("viewBox=\""); this.computeElementsCoordinates(diagram); @@ -137,8 +137,8 @@ private StringBuilder computeViewBox(Diagram diagram) { double finalWidth = width + padding; double finalHeight = height + padding; - viewBoxExport.append(finalMinX + " " + finalMinY + " " + finalWidth + " " + finalHeight); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - return viewBoxExport.append("\" "); //$NON-NLS-1$ + viewBoxExport.append(finalMinX + " " + finalMinY + " " + finalWidth + " " + finalHeight); + return viewBoxExport.append("\" "); } private void computeElementsCoordinates(Diagram diagram) { diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/export/svg/EdgeExportService.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/export/svg/EdgeExportService.java index 921d745717..b817624289 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/export/svg/EdgeExportService.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/export/svg/EdgeExportService.java @@ -56,11 +56,11 @@ public StringBuilder export(Edge edge, Map id2NodeHi // Should add source and target intersection in routingPoints. if (lineRoutingPoints.size() > 1) { - edgeExport.append(""); //$NON-NLS-1$ //$NON-NLS-2$ + edgeExport.append(""); edgeExport.append(this.exportLine(style, lineRoutingPoints)); edgeExport.append(this.exportAdditionals(style, lineRoutingPoints)); edgeExport.append(this.exportEdgeLabels(edge)); - edgeExport.append(""); //$NON-NLS-1$ + edgeExport.append(""); } } @@ -146,25 +146,25 @@ private StringBuilder exportEdgeLabels(Edge edge) { private StringBuilder exportLine(EdgeStyle style, List rootingPoints) { StringBuilder lineExport = new StringBuilder(); - lineExport.append(""); //$NON-NLS-1$ + lineExport.append(""); - lineExport.append(""); //$NON-NLS-1$ //$NON-NLS-2$ + lineExport.append(""); - return lineExport.append(""); //$NON-NLS-1$ + return lineExport.append(""); } private StringBuilder exportStrokeDasharray(EdgeStyle style) { StringBuilder dashArrayExport = new StringBuilder(); String lineStyleName = style.getLineStyle().toString(); - if (lineStyleName.equals("Dash")) { //$NON-NLS-1$ - dashArrayExport.append("stroke-dasharray: 5,5;"); //$NON-NLS-1$ - } else if (lineStyleName.equals("Dot")) { //$NON-NLS-1$ - dashArrayExport.append("stroke-dasharray: 2,2;"); //$NON-NLS-1$ - } else if (lineStyleName.equals("Dash_Dot")) { //$NON-NLS-1$ - dashArrayExport.append("stroke-dasharray: 10,5,2,2,2,5;"); //$NON-NLS-1$ + if (lineStyleName.equals("Dash")) { + dashArrayExport.append("stroke-dasharray: 5,5;"); + } else if (lineStyleName.equals("Dot")) { + dashArrayExport.append("stroke-dasharray: 2,2;"); + } else if (lineStyleName.equals("Dash_Dot")) { + dashArrayExport.append("stroke-dasharray: 10,5,2,2,2,5;"); } return dashArrayExport; @@ -173,10 +173,10 @@ private StringBuilder exportStrokeDasharray(EdgeStyle style) { private StringBuilder exportLineStyle(EdgeStyle style) { StringBuilder styleExport = new StringBuilder(); - styleExport.append("stroke: " + style.getColor() + "; "); //$NON-NLS-1$ //$NON-NLS-2$ - styleExport.append("stroke-width: " + style.getSize() + "px; "); //$NON-NLS-1$ //$NON-NLS-2$ - styleExport.append("pointer-events: stroke; "); //$NON-NLS-1$ - styleExport.append("fill: none; "); //$NON-NLS-1$ + styleExport.append("stroke: " + style.getColor() + "; "); + styleExport.append("stroke-width: " + style.getSize() + "px; "); + styleExport.append("pointer-events: stroke; "); + styleExport.append("fill: none; "); return styleExport.append(this.exportStrokeDasharray(style)); } @@ -186,15 +186,15 @@ private StringBuilder exportLinePath(List routingPoints) { Position[] positions = routingPoints.toArray(Position[]::new); Position firstPoint = positions[0]; - pathExport.append("M "); //$NON-NLS-1$ + pathExport.append("M "); pathExport.append(firstPoint.getX()); - pathExport.append(","); //$NON-NLS-1$ + pathExport.append(","); pathExport.append(firstPoint.getY()); for (int i = 1; i < positions.length; i++) { Position point = positions[i]; - pathExport.append(" L "); //$NON-NLS-1$ + pathExport.append(" L "); pathExport.append(point.getX()); - pathExport.append(","); //$NON-NLS-1$ + pathExport.append(","); pathExport.append(point.getY()); } return pathExport; @@ -212,29 +212,29 @@ private StringBuilder exportArrow(Position p1, Position p2, String arrowStyle, E String styleName = arrowStyle.toString(); - if (styleName.equals("OutputArrow")) { //$NON-NLS-1$ + if (styleName.equals("OutputArrow")) { arrowExport = this.exportOutputArrow(p1, p2, style); - } else if (styleName.equals("InputArrow")) { //$NON-NLS-1$ + } else if (styleName.equals("InputArrow")) { arrowExport = this.exportInputArrow(p1, p2, style); - } else if (styleName.equals("OutputClosedArrow")) { //$NON-NLS-1$ + } else if (styleName.equals("OutputClosedArrow")) { arrowExport = this.exportOutputClosedArrow(p1, p2, style, false); - } else if (styleName.equals("InputClosedArrow")) { //$NON-NLS-1$ + } else if (styleName.equals("InputClosedArrow")) { arrowExport = this.exportInputClosedArrow(p1, p2, style, false); - } else if (styleName.equals("OutputFillClosedArrow")) { //$NON-NLS-1$ + } else if (styleName.equals("OutputFillClosedArrow")) { arrowExport = this.exportOutputClosedArrow(p1, p2, style, true); - } else if (styleName.equals("InputFillClosedArrow")) { //$NON-NLS-1$ + } else if (styleName.equals("InputFillClosedArrow")) { arrowExport = this.exportInputClosedArrow(p1, p2, style, true); - } else if (styleName.equals("Diamond")) { //$NON-NLS-1$ + } else if (styleName.equals("Diamond")) { arrowExport = this.exportDiamondArrow(p1, p2, style, false); - } else if (styleName.equals("FillDiamond")) { //$NON-NLS-1$ + } else if (styleName.equals("FillDiamond")) { arrowExport = this.exportDiamondArrow(p1, p2, style, true); - } else if (styleName.equals("InputArrowWithDiamond")) { //$NON-NLS-1$ + } else if (styleName.equals("InputArrowWithDiamond")) { arrowExport = this.exportInputArrowWithDiamond(p1, p2, style, false); - } else if (styleName.equals("InputArrowWithFillDiamond")) { //$NON-NLS-1$ + } else if (styleName.equals("InputArrowWithFillDiamond")) { arrowExport = this.exportInputArrowWithDiamond(p1, p2, style, true); - } else if (styleName.equals("Circle")) { //$NON-NLS-1$ + } else if (styleName.equals("Circle")) { arrowExport = this.exportCircleArrow(p1, p2, style, false); - } else if (styleName.equals("FillCircle")) { //$NON-NLS-1$ + } else if (styleName.equals("FillCircle")) { arrowExport = this.exportCircleArrow(p1, p2, style, true); } else { arrowExport = new StringBuilder(); @@ -265,7 +265,7 @@ private StringBuilder exportInputArrow(Position p1, Position p2, EdgeStyle style double rotationY = p2.getY(); StringBuilder path = this.exportBasicArrowPath(style.getSize()); StringBuilder transformation = this.exportArrowTransformation(rotationAngle, rotationX, rotationY, offsetX, offsetY); - StringBuilder arrowStyle = this.exportArrowStyle(style, "none"); //$NON-NLS-1$ + StringBuilder arrowStyle = this.exportArrowStyle(style, "none"); return arrowExport.append(this.buildArrowPath(path, transformation, arrowStyle)); } @@ -273,7 +273,7 @@ private StringBuilder exportOutputClosedArrow(Position p1, Position p2, EdgeStyl StringBuilder arrowExport = new StringBuilder(); String fillColor; if (!fill) { - fillColor = "#ffffff"; //$NON-NLS-1$ + fillColor = "#ffffff"; } else { fillColor = style.getColor(); } @@ -292,7 +292,7 @@ private StringBuilder exportInputClosedArrow(Position p1, Position p2, EdgeStyle StringBuilder arrowExport = new StringBuilder(); String fillColor; if (!fill) { - fillColor = "#ffffff"; //$NON-NLS-1$ + fillColor = "#ffffff"; } else { fillColor = style.getColor(); } @@ -312,7 +312,7 @@ private StringBuilder exportDiamondArrow(Position p1, Position p2, EdgeStyle sty StringBuilder arrowExport = new StringBuilder(); String fillColor; if (!fill) { - fillColor = "#ffffff"; //$NON-NLS-1$ + fillColor = "#ffffff"; } else { fillColor = style.getColor(); } @@ -332,7 +332,7 @@ private StringBuilder exportInputArrowWithDiamond(Position p1, Position p2, Edge StringBuilder arrowExport = new StringBuilder(); String fillColor; if (!fill) { - fillColor = "#ffffff"; //$NON-NLS-1$ + fillColor = "#ffffff"; } else { fillColor = style.getColor(); } @@ -351,7 +351,7 @@ private StringBuilder exportCircleArrow(Position p1, Position p2, EdgeStyle styl StringBuilder arrowExport = new StringBuilder(); String fillColor; if (!fill) { - fillColor = "#ffffff"; //$NON-NLS-1$ + fillColor = "#ffffff"; } else { fillColor = styleObject.getColor(); } @@ -362,25 +362,25 @@ private StringBuilder exportCircleArrow(Position p1, Position p2, EdgeStyle styl double translateY = p2.getY(); StringBuilder arrowTransformation = this.exportArrowTransformation(rotationAngle, rotationX, rotationY, translateX, translateY); - arrowExport.append(""); //$NON-NLS-1$ + return arrowExport.append("/>"); } private StringBuilder exportBasicClosedArrowPath(int strokeWidth) { - return this.exportBasicArrowPath(strokeWidth).append("z"); //$NON-NLS-1$ + return this.exportBasicArrowPath(strokeWidth).append("z"); } private StringBuilder exportInputArrowWithDiamondPath(int strokeWidth) { @@ -390,13 +390,13 @@ private StringBuilder exportInputArrowWithDiamondPath(int strokeWidth) { private StringBuilder exportBasicArrowPath(int strokeWidth) { // Path definitions scaled with the stroke-width style attribute StringBuilder basicArrowPathExport = new StringBuilder(); - basicArrowPathExport.append("m "); //$NON-NLS-1$ + basicArrowPathExport.append("m "); basicArrowPathExport.append(-5 - strokeWidth); - basicArrowPathExport.append(" "); //$NON-NLS-1$ + basicArrowPathExport.append(" "); basicArrowPathExport.append(-3.5 - strokeWidth); - basicArrowPathExport.append(" L 0 0 L "); //$NON-NLS-1$ + basicArrowPathExport.append(" L 0 0 L "); basicArrowPathExport.append(-5 - strokeWidth); - basicArrowPathExport.append(" "); //$NON-NLS-1$ + basicArrowPathExport.append(" "); return basicArrowPathExport.append(3.5 + strokeWidth); } @@ -404,84 +404,84 @@ private StringBuilder exportBasicDiamondPath(int strokeWidth) { // Path definitions scaled with the stroke-width style attribute StringBuilder basicDiamondPathExport = new StringBuilder(); - basicDiamondPathExport.append("m 0 0 L "); //$NON-NLS-1$ + basicDiamondPathExport.append("m 0 0 L "); basicDiamondPathExport.append(5 + strokeWidth); - basicDiamondPathExport.append(" "); //$NON-NLS-1$ + basicDiamondPathExport.append(" "); basicDiamondPathExport.append(-3.5 - strokeWidth); - basicDiamondPathExport.append(" L "); //$NON-NLS-1$ + basicDiamondPathExport.append(" L "); basicDiamondPathExport.append(10 + strokeWidth * 2); - basicDiamondPathExport.append(" 0 L "); //$NON-NLS-1$ + basicDiamondPathExport.append(" 0 L "); basicDiamondPathExport.append(5 + strokeWidth); - basicDiamondPathExport.append(" "); //$NON-NLS-1$ + basicDiamondPathExport.append(" "); basicDiamondPathExport.append(3.5 + strokeWidth); - return basicDiamondPathExport.append(" z"); //$NON-NLS-1$ + return basicDiamondPathExport.append(" z"); } private StringBuilder exportOffsetArrowPath(int strokeWidth) { // Path definitions scaled with the stroke-width style attribute StringBuilder offsetArrowPathExport = new StringBuilder(); - offsetArrowPathExport.append("m "); //$NON-NLS-1$ + offsetArrowPathExport.append("m "); offsetArrowPathExport.append((5 + strokeWidth) * 2); - offsetArrowPathExport.append(" 0 L "); //$NON-NLS-1$ + offsetArrowPathExport.append(" 0 L "); offsetArrowPathExport.append((5 + strokeWidth) * 2 + (5 + strokeWidth)); - offsetArrowPathExport.append(" "); //$NON-NLS-1$ + offsetArrowPathExport.append(" "); offsetArrowPathExport.append(-3.5 - strokeWidth); - offsetArrowPathExport.append(" M "); //$NON-NLS-1$ + offsetArrowPathExport.append(" M "); offsetArrowPathExport.append((5 + strokeWidth) * 2); - offsetArrowPathExport.append(" 0 L "); //$NON-NLS-1$ + offsetArrowPathExport.append(" 0 L "); offsetArrowPathExport.append((5 + strokeWidth) * 2 + (5 + strokeWidth)); - offsetArrowPathExport.append(" "); //$NON-NLS-1$ + offsetArrowPathExport.append(" "); return offsetArrowPathExport.append(3.5 + strokeWidth); } private StringBuilder buildArrowPath(StringBuilder path, StringBuilder transformation, StringBuilder style) { StringBuilder arrowPath = new StringBuilder(); - arrowPath.append(""); //$NON-NLS-1$ + return arrowPath.append("\"/>"); } private StringBuilder exportArrowStyle(EdgeStyle style, String fillColor) { StringBuilder arrowStyleExport = new StringBuilder(); - arrowStyleExport.append("stroke:"); //$NON-NLS-1$ + arrowStyleExport.append("stroke:"); arrowStyleExport.append(style.getColor()); - arrowStyleExport.append("; "); //$NON-NLS-1$ + arrowStyleExport.append("; "); - arrowStyleExport.append("stroke-width:"); //$NON-NLS-1$ + arrowStyleExport.append("stroke-width:"); arrowStyleExport.append(style.getSize()); - arrowStyleExport.append("; "); //$NON-NLS-1$ + arrowStyleExport.append("; "); - arrowStyleExport.append("fill:"); //$NON-NLS-1$ + arrowStyleExport.append("fill:"); arrowStyleExport.append(fillColor); - return arrowStyleExport.append(";"); //$NON-NLS-1$ + return arrowStyleExport.append(";"); } private StringBuilder exportArrowTransformation(double rotationAngle, double rotationX, double rotationY, double translateX, double translateY) { StringBuilder transformation = new StringBuilder(); - transformation.append("rotate("); //$NON-NLS-1$ + transformation.append("rotate("); transformation.append(rotationAngle); - transformation.append(" "); //$NON-NLS-1$ + transformation.append(" "); transformation.append(rotationX); - transformation.append(" "); //$NON-NLS-1$ + transformation.append(" "); transformation.append(rotationY); - transformation.append(")"); //$NON-NLS-1$ + transformation.append(")"); - transformation.append(" translate("); //$NON-NLS-1$ + transformation.append(" translate("); transformation.append(translateX); - transformation.append(" "); //$NON-NLS-1$ + transformation.append(" "); transformation.append(translateY); - return transformation.append(")"); //$NON-NLS-1$ + return transformation.append(")"); } private double angle(Position a, Position b) { diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/export/svg/NodeExportService.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/export/svg/NodeExportService.java index e3d75c420e..b407f75be3 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/export/svg/NodeExportService.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/export/svg/NodeExportService.java @@ -102,7 +102,7 @@ private StringBuilder exportImage(Node node, ImageNodeStyle style, Map"); //$NON-NLS-1$ + return imageExport.append(""); } private StringBuilder exportHeaderSeparator(Node node, Label label, RectangularNodeStyle nodeStyle, float opacity) { @@ -111,18 +111,18 @@ private StringBuilder exportHeaderSeparator(Node node, Label label, RectangularN double headerLabelPadding = label.getPosition().getY(); double y = label.getSize().getHeight() + 2 * headerLabelPadding; - headerExport.append(""); //$NON-NLS-1$ + headerExport.append(""); } private StringBuilder exportIconLabel(Node node, IconLabelNodeStyle style, Map id2NodeHierarchy, float nodeOpacity) { @@ -140,7 +140,7 @@ private StringBuilder exportIconLabel(Node node, IconLabelNodeStyle style, Map"); //$NON-NLS-1$ + return rectangleExport.append(""); } private StringBuilder exportRectangle(Node node, RectangularNodeStyle style, Map id2NodeHierarchy, float nodeOpacity) { @@ -165,6 +165,6 @@ private StringBuilder exportRectangle(Node node, RectangularNodeStyle style, Map } rectangleExport.append(this.exportChildren(node, id2NodeHierarchy)); - return rectangleExport.append(""); //$NON-NLS-1$ + return rectangleExport.append(""); } } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/DeleteFromDiagramEventHandler.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/DeleteFromDiagramEventHandler.java index 7809edf6b0..26c00d969e 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/DeleteFromDiagramEventHandler.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/DeleteFromDiagramEventHandler.java @@ -63,7 +63,7 @@ @Service public class DeleteFromDiagramEventHandler implements IDiagramEventHandler { - public static final String DELETION_POLICY = "deletionPolicy"; //$NON-NLS-1$ + public static final String DELETION_POLICY = "deletionPolicy"; private final IObjectService objectService; @@ -178,7 +178,7 @@ private void sendResponse(One payloadSink, Many cha } private IStatus invokeDeleteNodeTool(Node node, IEditingContext editingContext, IDiagramContext diagramContext, DeletionPolicy deletionPolicy) { - IStatus result = new Failure(""); //$NON-NLS-1$ + IStatus result = new Failure(""); var optionalNodeDescription = this.findNodeDescription(node, diagramContext.getDiagram(), editingContext); if (optionalNodeDescription.isPresent()) { @@ -192,7 +192,7 @@ private IStatus invokeDeleteNodeTool(Node node, IEditingContext editingContext, variableManager.put(Environment.ENVIRONMENT, new Environment(Environment.SIRIUS_COMPONENTS)); NodeDescription nodeDescription = optionalNodeDescription.get(); - this.logger.debug("Deleted diagram element {}", node.getId()); //$NON-NLS-1$ + this.logger.debug("Deleted diagram element {}", node.getId()); result = nodeDescription.getDeleteHandler().apply(variableManager); } else { String message = this.messageService.semanticObjectNotFound(node.getTargetObjectId()); @@ -208,7 +208,7 @@ private IStatus invokeDeleteNodeTool(Node node, IEditingContext editingContext, } private IStatus invokeDeleteEdgeTool(Edge edge, IEditingContext editingContext, IDiagramContext diagramContext, DeletionPolicy deletionPolicy) { - IStatus result = new Failure(""); //$NON-NLS-1$ + IStatus result = new Failure(""); var optionalEdgeDescription = this.findEdgeDescription(edge, diagramContext.getDiagram(), editingContext); if (optionalEdgeDescription.isPresent()) { var optionalSelf = this.objectService.getObject(editingContext, edge.getTargetObjectId()); @@ -230,7 +230,7 @@ private IStatus invokeDeleteEdgeTool(Edge edge, IEditingContext editingContext, // @formatter:on EdgeDescription edgeDescription = optionalEdgeDescription.get(); - this.logger.debug("Deleted diagram edge {}", edge.getId()); //$NON-NLS-1$ + this.logger.debug("Deleted diagram edge {}", edge.getId()); result = edgeDescription.getDeleteHandler().apply(variableManager); } else { String message = this.messageService.semanticObjectNotFound(edge.getTargetObjectId()); diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/DropOnDiagramEventHandler.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/DropOnDiagramEventHandler.java index 46a9b6f705..8bc1570045 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/DropOnDiagramEventHandler.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/DropOnDiagramEventHandler.java @@ -104,7 +104,7 @@ public void handle(One payloadSink, Many changeDesc } private IStatus executeTool(IEditingContext editingContext, IDiagramContext diagramContext, List objects, String diagramElementId, double startingPositionX, double startingPositionY) { - IStatus result = new Failure(""); //$NON-NLS-1$ + IStatus result = new Failure(""); Diagram diagram = diagramContext.getDiagram(); Optional node = this.diagramQueryService.findNodeById(diagram, diagramElementId); diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/EditLabelEventHandler.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/EditLabelEventHandler.java index 20019a99d5..0e95d3e245 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/EditLabelEventHandler.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/EditLabelEventHandler.java @@ -139,7 +139,7 @@ private void invokeDirectEditTool(Node node, IEditingContext editingContext, Dia variableManager.put(Environment.ENVIRONMENT, new Environment(Environment.SIRIUS_COMPONENTS)); variableManager.put(VariableManager.SELF, self); nodeDescription.getLabelEditHandler().apply(variableManager, newText); - this.logger.debug("Edited label of diagram element {} to {}", node.getId(), newText); //$NON-NLS-1$ + this.logger.debug("Edited label of diagram element {} to {}", node.getId(), newText); } } } @@ -157,7 +157,7 @@ private void invokeDirectEditTool(Edge edge, IEditingContext editingContext, Dia variableManager.put(Environment.ENVIRONMENT, new Environment(Environment.SIRIUS_COMPONENTS)); variableManager.put(VariableManager.SELF, self); edgeDescription.getLabelEditHandler().apply(variableManager, newText); - this.logger.debug("Edited label of diagram element {} to {}", edge.getId(), newText); //$NON-NLS-1$ + this.logger.debug("Edited label of diagram element {} to {}", edge.getId(), newText); } } } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/ExportDiagramEventHandler.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/ExportDiagramEventHandler.java index 3915a261d9..1efcb4225f 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/ExportDiagramEventHandler.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/ExportDiagramEventHandler.java @@ -49,7 +49,7 @@ public boolean canHandle(IDiagramInput diagramInput) { @Override public void handle(One payloadSink, Many changeDescriptionSink, IEditingContext editingContext, IDiagramContext diagramContext, IDiagramInput diagramInput) { String svgExport = this.exportService.export(diagramContext.getDiagram()); - IPayload payload = new ExportRepresentationPayload(diagramInput.getId(), diagramContext.getDiagram().getLabel() + ".svg", svgExport); //$NON-NLS-1$ + IPayload payload = new ExportRepresentationPayload(diagramInput.getId(), diagramContext.getDiagram().getLabel() + ".svg", svgExport); payloadSink.tryEmitValue(payload); } } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/InvokeSingleClickOnDiagramElementToolEventHandler.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/InvokeSingleClickOnDiagramElementToolEventHandler.java index db0fbee742..9f3623bf5f 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/InvokeSingleClickOnDiagramElementToolEventHandler.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/InvokeSingleClickOnDiagramElementToolEventHandler.java @@ -133,7 +133,7 @@ public void handle(One payloadSink, Many changeDesc private IStatus executeTool(IEditingContext editingContext, IDiagramContext diagramContext, String diagramElementId, SingleClickOnDiagramElementTool tool, double startingPositionX, double startingPositionY, String selectedObjectId) { - IStatus result = new Failure(""); //$NON-NLS-1$ + IStatus result = new Failure(""); Diagram diagram = diagramContext.getDiagram(); Optional node = this.diagramQueryService.findNodeById(diagram, diagramElementId); Optional self = Optional.empty(); @@ -142,7 +142,7 @@ private IStatus executeTool(IEditingContext editingContext, IDiagramContext diag } else if (Objects.equals(diagram.getId(), diagramElementId)) { self = this.objectService.getObject(editingContext, diagram.getTargetObjectId()); } else { - this.logger.warn("The node creation tool {0} cannot be applied on the current diagram {1} and editing context {2}", tool.getId(), diagram.getId(), editingContext.getId()); //$NON-NLS-1$ + this.logger.warn("The node creation tool {0} cannot be applied on the current diagram {1} and editing context {2}", tool.getId(), diagram.getId(), editingContext.getId()); } // Else, cannot find the node with the given optionalDiagramElementId diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/InvokeSingleClickOnTwoDiagramElementsToolEventHandler.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/InvokeSingleClickOnTwoDiagramElementsToolEventHandler.java index abc6067bcd..776117ac7f 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/InvokeSingleClickOnTwoDiagramElementsToolEventHandler.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/InvokeSingleClickOnTwoDiagramElementsToolEventHandler.java @@ -142,7 +142,7 @@ public void handle(One payloadSink, Many changeDesc private IStatus executeTool(IEditingContext editingContext, IDiagramContext diagramContext, String sourceNodeId, String targetNodeId, SingleClickOnTwoDiagramElementsTool tool, Position sourcePosition, Position targetPosition) { - IStatus result = new Failure(""); //$NON-NLS-1$ + IStatus result = new Failure(""); Diagram diagram = diagramContext.getDiagram(); Optional sourceNode = this.diagramQueryService.findNodeById(diagram, sourceNodeId); Optional targetNode = this.diagramQueryService.findNodeById(diagram, targetNodeId); diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/ReconnectEdgeEventHandler.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/ReconnectEdgeEventHandler.java index f1340fed7d..f5c563a545 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/ReconnectEdgeEventHandler.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/ReconnectEdgeEventHandler.java @@ -138,7 +138,7 @@ private void handleReconnect(One payloadSink, Many } private IStatus invokeReconnectEdgeTool(Edge edge, IEditingContext editingContext, IDiagramContext diagramContext, ReconnectEdgeInput reconnectEdgeInput) { - IStatus status = new Failure(""); //$NON-NLS-1$ + IStatus status = new Failure(""); var diagram = diagramContext.getDiagram(); diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/messages/ICollaborativeDiagramMessageService.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/messages/ICollaborativeDiagramMessageService.java index 09007e679a..74ff42a240 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/messages/ICollaborativeDiagramMessageService.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/messages/ICollaborativeDiagramMessageService.java @@ -52,62 +52,62 @@ class NoOp implements ICollaborativeDiagramMessageService { @Override public String invalidInput(String expectedInputTypeName, String receivedInputTypeName) { - return ""; //$NON-NLS-1$ + return ""; } @Override public String edgeNotFound(String id) { - return ""; //$NON-NLS-1$ + return ""; } @Override public String reconnectEdgeSameEdgeEnd() { - return ""; //$NON-NLS-1$ + return ""; } @Override public String nodeNotFound(String id) { - return ""; //$NON-NLS-1$ + return ""; } @Override public String deleteEdgeFailed(String id) { - return ""; //$NON-NLS-1$ + return ""; } @Override public String deleteNodeFailed(String id) { - return ""; //$NON-NLS-1$ + return ""; } @Override public String deleteFailed() { - return ""; //$NON-NLS-1$ + return ""; } @Override public String semanticObjectNotFound(String id) { - return ""; //$NON-NLS-1$ + return ""; } @Override public String nodeDescriptionNotFound(String id) { - return ""; //$NON-NLS-1$ + return ""; } @Override public String edgeDescriptionNotFound(String id) { - return ""; //$NON-NLS-1$ + return ""; } @Override public String invalidDrop() { - return ""; //$NON-NLS-1$ + return ""; } @Override public String invalidNewValue(String newValue) { - return ""; //$NON-NLS-1$ + return ""; } } } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/messages/MessageConstants.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/messages/MessageConstants.java index efef4a3393..b13bed3edc 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/messages/MessageConstants.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/messages/MessageConstants.java @@ -19,29 +19,29 @@ */ public final class MessageConstants { - public static final String INVALID_INPUT = "INVALID_INPUT"; //$NON-NLS-1$ + public static final String INVALID_INPUT = "INVALID_INPUT"; - public static final String EDGE_NOT_FOUND = "EDGE_NOT_FOUND"; //$NON-NLS-1$ + public static final String EDGE_NOT_FOUND = "EDGE_NOT_FOUND"; - public static final String RECONNECT_EDGE_SAME_EDGE_END = "RECONNECT_EDGE_SAME_EDGE_END"; //$NON-NLS-1$ + public static final String RECONNECT_EDGE_SAME_EDGE_END = "RECONNECT_EDGE_SAME_EDGE_END"; - public static final String NODE_NOT_FOUND = "NODE_NOT_FOUND"; //$NON-NLS-1$ + public static final String NODE_NOT_FOUND = "NODE_NOT_FOUND"; - public static final String SEMANTIC_OBJECT_NOT_FOUND = "SEMANTIC_OBJECT_NOT_FOUND"; //$NON-NLS-1$ + public static final String SEMANTIC_OBJECT_NOT_FOUND = "SEMANTIC_OBJECT_NOT_FOUND"; - public static final String NODE_DESCRIPTION_NOT_FOUND = "NODE_DESCRIPTION_NOT_FOUND"; //$NON-NLS-1$ + public static final String NODE_DESCRIPTION_NOT_FOUND = "NODE_DESCRIPTION_NOT_FOUND"; - public static final String EDGE_DESCRIPTION_NOT_FOUND = "EDGE_DESCRIPTION_NOT_FOUND"; //$NON-NLS-1$ + public static final String EDGE_DESCRIPTION_NOT_FOUND = "EDGE_DESCRIPTION_NOT_FOUND"; - public static final String DELETE_EGDE_FAILED = "DELETE_EGDE_FAILED"; //$NON-NLS-1$ + public static final String DELETE_EGDE_FAILED = "DELETE_EGDE_FAILED"; - public static final String DELETE_NODE_FAILED = "DELETE_NODE_FAILED"; //$NON-NLS-1$ + public static final String DELETE_NODE_FAILED = "DELETE_NODE_FAILED"; - public static final String DELETE_FAILED = "DELETE_FAILED"; //$NON-NLS-1$ + public static final String DELETE_FAILED = "DELETE_FAILED"; - public static final String INVALID_DROP = "INVALID_DROP"; //$NON-NLS-1$ + public static final String INVALID_DROP = "INVALID_DROP"; - public static final String INVALID_NEW_VALUE = "INVALID_NEW_VALUE"; //$NON-NLS-1$ + public static final String INVALID_NEW_VALUE = "INVALID_NEW_VALUE"; private MessageConstants() { // Prevent instantiation diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/services/DiagramDeserializer.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/services/DiagramDeserializer.java index e87e33f422..bb78251375 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/services/DiagramDeserializer.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/services/DiagramDeserializer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -39,7 +39,7 @@ public class DiagramDeserializer implements IRepresentationDeserializer { @Override public boolean canHandle(ObjectNode root) { // @formatter:off - return Optional.ofNullable(root.get("kind")) //$NON-NLS-1$ + return Optional.ofNullable(root.get("kind")) .map(JsonNode::asText) .filter(Diagram.KIND::equals) .isPresent(); diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/DiagramEventProcessorTests.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/DiagramEventProcessorTests.java index 82a2db6a82..4325dc4be9 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/DiagramEventProcessorTests.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/DiagramEventProcessorTests.java @@ -50,7 +50,7 @@ public class DiagramEventProcessorTests { private static final Diagram INITIAL_TEST_DIAGRAM = Diagram.newDiagram(DIAGRAM_ID) .descriptionId(DIAGRAM_DESCRIPTION_ID) .label(String.valueOf(0)) - .targetObjectId("targetObjectId") //$NON-NLS-1$ + .targetObjectId("targetObjectId") .position(Position.UNDEFINED) .size(Size.UNDEFINED) .nodes(List.of()) diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/architecture/ArchitectureConstants.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/architecture/ArchitectureConstants.java index b66a0eee7e..296b7182c0 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/architecture/ArchitectureConstants.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/architecture/ArchitectureConstants.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -22,7 +22,7 @@ * @author sbegaudeau */ public final class ArchitectureConstants { - public static final String SIRIUS_COMPONENTS_COLLABORATIVE_DIAGRAMS_ROOT_PACKAGE = "org.eclipse.sirius.components.collaborative.diagrams.."; //$NON-NLS-1$ + public static final String SIRIUS_COMPONENTS_COLLABORATIVE_DIAGRAMS_ROOT_PACKAGE = "org.eclipse.sirius.components.collaborative.diagrams.."; // @formatter:off public static final JavaClasses CLASSES = new ClassFileImporter() diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/export/DiagramExportServiceTests.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/export/DiagramExportServiceTests.java index 8c0cc558d5..fd3568d3ff 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/export/DiagramExportServiceTests.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/export/DiagramExportServiceTests.java @@ -44,16 +44,16 @@ private DiagramExportService getDiagramExportService() throws URISyntaxException @Test public void testExportDiagramWithEdge() throws URISyntaxException { - String firstTargetObjectId = "First"; //$NON-NLS-1$ - String secondTargetObjectId = "Second"; //$NON-NLS-1$ + String firstTargetObjectId = "First"; + String secondTargetObjectId = "Second"; // @formatter:off - Diagram diagram = TestLayoutDiagramBuilder.diagram("root") //$NON-NLS-1$ + Diagram diagram = TestLayoutDiagramBuilder.diagram("root") .nodes() .rectangleNode(firstTargetObjectId).at(10, 10).of(20, 20).and() .rectangleNode(secondTargetObjectId).at(50, 10).of(20, 20).and() .and() - .edge("one") //$NON-NLS-1$ + .edge("one") .from(firstTargetObjectId).at(0.75, 0.5) .to(secondTargetObjectId).at(0.25, 0.5) .and() @@ -62,12 +62,12 @@ public void testExportDiagramWithEdge() throws URISyntaxException { DiagramExportService diagramExportService = this.getDiagramExportService(); String export = diagramExportService.export(diagram); - assertThat(export).contains(" findById(IEditingContext editingContext, String id) { // @formatter:off DiagramDescription diagramDescription = DiagramDescription.newDiagramDescription(UUID.randomUUID().toString()) - .label("label") //$NON-NLS-1$ + .label("label") .canCreatePredicate(variableManager -> Boolean.TRUE) .edgeDescriptions(new ArrayList<>()) - .labelProvider(variableManager -> "label") //$NON-NLS-1$ + .labelProvider(variableManager -> "label") .toolSections(List.of()) .tools(List.of()) .nodeDescriptions(new ArrayList<>()) - .targetObjectIdProvider(variableManager -> "targetObjectId") //$NON-NLS-1$ - .dropHandler(variableManager -> new Failure("")) //$NON-NLS-1$ + .targetObjectIdProvider(variableManager -> "targetObjectId") + .dropHandler(variableManager -> new Failure("")) .build(); // @formatter:on @@ -92,7 +92,7 @@ public Optional getObject(IEditingContext editingContext, String objectI CreateDiagramEventHandler handler = new CreateDiagramEventHandler(representationDescriptionSearchService, new IRepresentationPersistenceService.NoOp(), diagramCreationService, objectService, new ICollaborativeDiagramMessageService.NoOp(), new SimpleMeterRegistry()); - var input = new CreateRepresentationInput(UUID.randomUUID(), UUID.randomUUID().toString(), UUID.randomUUID().toString(), "objectId", "representationName"); //$NON-NLS-1$//$NON-NLS-2$ + var input = new CreateRepresentationInput(UUID.randomUUID(), UUID.randomUUID().toString(), UUID.randomUUID().toString(), "objectId", "representationName"); assertThat(handler.canHandle(null, input)).isTrue(); Many changeDescriptionSink = Sinks.many().unicast().onBackpressureBuffer(); diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/DeleteFromDiagramEventHandlerTests.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/DeleteFromDiagramEventHandlerTests.java index cc36beda6b..bef49da88b 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/DeleteFromDiagramEventHandlerTests.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/DeleteFromDiagramEventHandlerTests.java @@ -57,9 +57,9 @@ */ public class DeleteFromDiagramEventHandlerTests { - private static final String NODE_ID = "nodeId"; //$NON-NLS-1$ + private static final String NODE_ID = "nodeId"; - private static final String EDGE_ID = "edgeId"; //$NON-NLS-1$ + private static final String EDGE_ID = "edgeId"; private final IObjectService objectService = new IObjectService.NoOp() { @Override @@ -106,7 +106,7 @@ public void testNodeSemanticDeletionFromDiagram() { var nodeIds = List.of(NODE_ID); var edgeIds = List. of(); - var input = new DeleteFromDiagramInput(UUID.randomUUID(), "editingContextId", "representationId", nodeIds, edgeIds, DeletionPolicy.SEMANTIC); //$NON-NLS-1$ //$NON-NLS-2$ + var input = new DeleteFromDiagramInput(UUID.randomUUID(), "editingContextId", "representationId", nodeIds, edgeIds, DeletionPolicy.SEMANTIC); One payloadSink = Sinks.one(); Many changeDescriptionSink = Sinks.many().unicast().onBackpressureBuffer(); @@ -130,7 +130,7 @@ public void testEdgeSemanticDeletionFromDiagram() { var nodeIds = List. of(); var edgeIds = List. of(EDGE_ID); - var input = new DeleteFromDiagramInput(UUID.randomUUID(), "editingContextId", "representationId", nodeIds, edgeIds, DeletionPolicy.SEMANTIC); //$NON-NLS-1$ //$NON-NLS-2$ + var input = new DeleteFromDiagramInput(UUID.randomUUID(), "editingContextId", "representationId", nodeIds, edgeIds, DeletionPolicy.SEMANTIC); One payloadSink = Sinks.one(); Many changeDescriptionSink = Sinks.many().unicast().onBackpressureBuffer(); diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/GetConnectorToolsEventHandlerTests.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/GetConnectorToolsEventHandlerTests.java index 8342f58f3c..3ce9cfc347 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/GetConnectorToolsEventHandlerTests.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/GetConnectorToolsEventHandlerTests.java @@ -68,40 +68,40 @@ public class GetConnectorToolsEventHandlerTests { private static final UUID DIAGRAM_DESCRIPTION_ID = UUID.randomUUID(); - private static final String DIAGRAM_LABEL = "DiagramLabel"; //$NON-NLS-1$ + private static final String DIAGRAM_LABEL = "DiagramLabel"; - private static final String TOOLSECTION_ID = "ToolSection"; //$NON-NLS-1$ + private static final String TOOLSECTION_ID = "ToolSection"; - private static final String CONNECTOR_TOOL_ID = "ConnectorTool"; //$NON-NLS-1$ + private static final String CONNECTOR_TOOL_ID = "ConnectorTool"; - private static final String NOT_CONNECTOR_TOOL_ID = "NotConnectorTool"; //$NON-NLS-1$ + private static final String NOT_CONNECTOR_TOOL_ID = "NotConnectorTool"; - private static final String TOOLSECTION_LABEL = "ToolSectionLabel"; //$NON-NLS-1$ + private static final String TOOLSECTION_LABEL = "ToolSectionLabel"; - private static final String CONNECTOR_TOOL_LABEL = "ConnectorToolLabel"; //$NON-NLS-1$ + private static final String CONNECTOR_TOOL_LABEL = "ConnectorToolLabel"; - private static final String NOT_CONNECTOR_TOOL_LABEL = "NotConnectorToolLabel"; //$NON-NLS-1$ + private static final String NOT_CONNECTOR_TOOL_LABEL = "NotConnectorToolLabel"; - private static final String DIAGRAM_ID = "diagramId"; //$NON-NLS-1$ + private static final String DIAGRAM_ID = "diagramId"; - private static final String SOURCE_NODE_ID = "sourceNodeId"; //$NON-NLS-1$ + private static final String SOURCE_NODE_ID = "sourceNodeId"; - private static final String TARGET_NODE_ID = "targetNodeId"; //$NON-NLS-1$ + private static final String TARGET_NODE_ID = "targetNodeId"; - private static final String SOURCE_NODE_TARGET_ID = "sourceNodeTargetId"; //$NON-NLS-1$ + private static final String SOURCE_NODE_TARGET_ID = "sourceNodeTargetId"; - private static final String TARGET_NODE_TARGET_ID = "targetNodeTargetId"; //$NON-NLS-1$ + private static final String TARGET_NODE_TARGET_ID = "targetNodeTargetId"; private Node getNode(String id, String targetObjectId) { // @formatter:off LabelStyle labelStyle = LabelStyle.newLabelStyle() - .color("#000000") //$NON-NLS-1$ + .color("#000000") .fontSize(16) - .iconURL("") //$NON-NLS-1$ + .iconURL("") .build(); Label label = Label.newLabel(UUID.randomUUID().toString()) - .type("labelType") //$NON-NLS-1$ - .text("text") //$NON-NLS-1$ + .type("labelType") + .text("text") .position(Position.UNDEFINED) .size(Size.UNDEFINED) .alignment(Position.UNDEFINED) @@ -111,8 +111,8 @@ private Node getNode(String id, String targetObjectId) { return Node.newNode(id) .type(NodeType.NODE_RECTANGLE) .targetObjectId(targetObjectId) - .targetObjectKind("") //$NON-NLS-1$ - .targetObjectLabel("") //$NON-NLS-1$ + .targetObjectKind("") + .targetObjectLabel("") .descriptionId(NODE_DESCRIPTION_ID) .label(label) .style(new TestDiagramBuilder().getRectangularNodeStyle()) @@ -141,32 +141,32 @@ public void testGetConnectorTools() { .candidates(List.of(candidates)) .handler(variableManager -> new Success()) .label(CONNECTOR_TOOL_LABEL) - .imageURL("") //$NON-NLS-1$ + .imageURL("") .build(); SingleClickOnTwoDiagramElementsTool notConnectorTool = SingleClickOnTwoDiagramElementsTool.newSingleClickOnTwoDiagramElementsTool(NOT_CONNECTOR_TOOL_ID) .candidates(List.of(candidates)) .handler(variableManager -> new Success()) .label(NOT_CONNECTOR_TOOL_LABEL) - .imageURL("") //$NON-NLS-1$ + .imageURL("") .build(); ToolSection toolSection = ToolSection.newToolSection(TOOLSECTION_ID) .label(TOOLSECTION_LABEL) .tools(List.of(connectorTool, notConnectorTool)) - .imageURL("") //$NON-NLS-1$ + .imageURL("") .build(); DiagramDescription diagramDescription = DiagramDescription.newDiagramDescription(DIAGRAM_DESCRIPTION_ID.toString()) - .label("") //$NON-NLS-1$ + .label("") .canCreatePredicate(variableManager -> true) - .targetObjectIdProvider(variableManager -> "diagramTargetObjectId") //$NON-NLS-1$ + .targetObjectIdProvider(variableManager -> "diagramTargetObjectId") .labelProvider(variableManager -> DIAGRAM_LABEL) .nodeDescriptions(List.of(nodeDescription)) .edgeDescriptions(new ArrayList<>()) .toolSections(List.of(toolSection)) .tools(List.of()) - .dropHandler(variableManager -> new Failure("")) //$NON-NLS-1$ + .dropHandler(variableManager -> new Failure("")) .build(); //@formatter:on @@ -230,7 +230,7 @@ private Diagram getDiagram(String id, List nodes) { return Diagram.newDiagram(id) .label(DIAGRAM_LABEL) .descriptionId(DIAGRAM_DESCRIPTION_ID.toString()) - .targetObjectId("diagramTargetObjectId") //$NON-NLS-1$ + .targetObjectId("diagramTargetObjectId") .position(Position.UNDEFINED) .size(Size.UNDEFINED) .nodes(nodes) diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/InitialDirectEditElementLabelEventHandlerTests.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/InitialDirectEditElementLabelEventHandlerTests.java index d7a2e232c4..f00a86881b 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/InitialDirectEditElementLabelEventHandlerTests.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/InitialDirectEditElementLabelEventHandlerTests.java @@ -49,7 +49,7 @@ */ public class InitialDirectEditElementLabelEventHandlerTests { - private static final String INIT_LABEL = "initLabel"; //$NON-NLS-1$ + private static final String INIT_LABEL = "initLabel"; @Test public void testInitialDirectEditElementLabelEventHandler() { diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/InvokeSingleClickOnDiagramElementToolEventHandlerTests.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/InvokeSingleClickOnDiagramElementToolEventHandlerTests.java index f43ae69d8a..342c5cac37 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/InvokeSingleClickOnDiagramElementToolEventHandlerTests.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/InvokeSingleClickOnDiagramElementToolEventHandlerTests.java @@ -62,9 +62,9 @@ public Optional getObject(IEditingContext editingContext, String objectI var diagramQueryService = new IDiagramQueryService.NoOp(); // @formatter:off - var tool = SingleClickOnDiagramElementTool.newSingleClickOnDiagramElementTool("toolId") //$NON-NLS-1$ - .label("label") //$NON-NLS-1$ - .imageURL("imageURL") //$NON-NLS-1$ + var tool = SingleClickOnDiagramElementTool.newSingleClickOnDiagramElementTool("toolId") + .label("label") + .imageURL("imageURL") .targetDescriptions(List.of()) .selectionDescriptionId(null) .handler(variableManager -> new Success(ChangeKind.SEMANTIC_CHANGE, Map.of())) @@ -85,24 +85,24 @@ public Optional findToolById(IEditingContext editingContext, Diagram diag // @formatter:off var input = InvokeSingleClickOnDiagramElementToolInput.newInvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID()) - .editingContextId("editingContextId") //$NON-NLS-1$ - .representationId("representationId") //$NON-NLS-1$ - .diagramElementId("diagramId") //$NON-NLS-1$ - .toolId("toolId") //$NON-NLS-1$ + .editingContextId("editingContextId") + .representationId("representationId") + .diagramElementId("diagramId") + .toolId("toolId") .startingPositionX(5.0) .startingPositionY(8.0) - .selectedObjectId("selectedObjectId") //$NON-NLS-1$ + .selectedObjectId("selectedObjectId") .build(); // @formatter:on - IEditingContext editingContext = () -> "editingContextId"; //$NON-NLS-1$ + IEditingContext editingContext = () -> "editingContextId"; assertThat(handler.canHandle(input)).isTrue(); Many changeDescriptionSink = Sinks.many().unicast().onBackpressureBuffer(); One payloadSink = Sinks.one(); - IDiagramContext diagramContext = new DiagramContext(new TestDiagramBuilder().getDiagram("diagramId")); //$NON-NLS-1$ + IDiagramContext diagramContext = new DiagramContext(new TestDiagramBuilder().getDiagram("diagramId")); handler.handle(payloadSink, changeDescriptionSink, editingContext, diagramContext, input); ChangeDescription changeDescription = changeDescriptionSink.asFlux().blockFirst(); diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/ReconnectEdgeEventHandlerTests.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/ReconnectEdgeEventHandlerTests.java index 1fb69740ff..7bb61f1b20 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/ReconnectEdgeEventHandlerTests.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/ReconnectEdgeEventHandlerTests.java @@ -131,7 +131,7 @@ public IStatus execute(IEditingContext editingContext, ReconnectionToolInterpret var handler = new ReconnectEdgeEventHandler(diagramQueryService, diagramDescriptionService, representationDescriptionSearchService, objectService, List.of(reconnectionToolExecutor), messageService, new SimpleMeterRegistry()); - var input = new ReconnectEdgeInput(UUID.randomUUID(), "editingContextId", "representationId", edgeId, newEdgeEndId, ReconnectEdgeKind.TARGET, Position.UNDEFINED); //$NON-NLS-1$//$NON-NLS-2$ + var input = new ReconnectEdgeInput(UUID.randomUUID(), "editingContextId", "representationId", edgeId, newEdgeEndId, ReconnectEdgeKind.TARGET, Position.UNDEFINED); assertThat(handler.canHandle(input)).isTrue(); diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/RenameDiagramEventHandlerTests.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/RenameDiagramEventHandlerTests.java index b59b597de4..f28dcc4c6e 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/RenameDiagramEventHandlerTests.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/RenameDiagramEventHandlerTests.java @@ -48,9 +48,9 @@ * @author arichard */ public class RenameDiagramEventHandlerTests { - private static final String OLD_LABEL = "oldLabel"; //$NON-NLS-1$ + private static final String OLD_LABEL = "oldLabel"; - private static final String NEW_LABEL = "newLabel"; //$NON-NLS-1$ + private static final String NEW_LABEL = "newLabel"; @Test public void testRenameRepresentation() { diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/UpdateEdgeRoutingPointsEventHandlerTests.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/UpdateEdgeRoutingPointsEventHandlerTests.java index 24197018ce..e566c68130 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/UpdateEdgeRoutingPointsEventHandlerTests.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/UpdateEdgeRoutingPointsEventHandlerTests.java @@ -59,7 +59,7 @@ public Optional findEdgeById(Diagram diagram, String edgeId) { }; var handler = new UpdateEdgeRoutingPointsEventHandler(new ICollaborativeDiagramMessageService.NoOp(), diagramQueryService, new SimpleMeterRegistry()); - var input = new UpdateEdgeRoutingPointsInput(UUID.randomUUID(), "editingContextId", "representationId", edgeId, List.of()); //$NON-NLS-1$//$NON-NLS-2$ + var input = new UpdateEdgeRoutingPointsInput(UUID.randomUUID(), "editingContextId", "representationId", edgeId, List.of()); assertThat(handler.canHandle(input)).isTrue(); diff --git a/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/diagram/DiagramDescriptionConnectorToolsDataFetcher.java b/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/diagram/DiagramDescriptionConnectorToolsDataFetcher.java index 01d66dc1d6..15f8e42eca 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/diagram/DiagramDescriptionConnectorToolsDataFetcher.java +++ b/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/diagram/DiagramDescriptionConnectorToolsDataFetcher.java @@ -38,9 +38,9 @@ @QueryDataFetcher(type = "DiagramDescription", field = "connectorTools") public class DiagramDescriptionConnectorToolsDataFetcher implements IDataFetcherWithFieldCoordinates>> { - private static final String SOURCE_DIAGRAM_ELEMENT_ID = "sourceDiagramElementId"; //$NON-NLS-1$ + private static final String SOURCE_DIAGRAM_ELEMENT_ID = "sourceDiagramElementId"; - private static final String TARGET_DIAGRAM_ELEMENT_ID = "targetDiagramElementId"; //$NON-NLS-1$ + private static final String TARGET_DIAGRAM_ELEMENT_ID = "targetDiagramElementId"; private final IEditingContextEventProcessorRegistry editingContextEventProcessorRegistry; diff --git a/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/diagram/DiagramDescriptionInitialDirectEditElementLabelDataFetcher.java b/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/diagram/DiagramDescriptionInitialDirectEditElementLabelDataFetcher.java index a7bd84e3c7..32adfe6e03 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/diagram/DiagramDescriptionInitialDirectEditElementLabelDataFetcher.java +++ b/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/diagram/DiagramDescriptionInitialDirectEditElementLabelDataFetcher.java @@ -36,7 +36,7 @@ @QueryDataFetcher(type = "DiagramDescription", field = "initialDirectEditElementLabel") public class DiagramDescriptionInitialDirectEditElementLabelDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String LABEL_ID = "labelId"; //$NON-NLS-1$ + private static final String LABEL_ID = "labelId"; private final IEditingContextEventProcessorRegistry editingContextEventProcessorRegistry; diff --git a/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/diagram/DiagramDescriptionToolSectionsDataFetcher.java b/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/diagram/DiagramDescriptionToolSectionsDataFetcher.java index 50559de4ce..67ec763a27 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/diagram/DiagramDescriptionToolSectionsDataFetcher.java +++ b/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/diagram/DiagramDescriptionToolSectionsDataFetcher.java @@ -38,7 +38,7 @@ @QueryDataFetcher(type = "DiagramDescription", field = "toolSections") public class DiagramDescriptionToolSectionsDataFetcher implements IDataFetcherWithFieldCoordinates>> { - private static final String DIAGRAM_ELEMENT_ID = "diagramElementId"; //$NON-NLS-1$ + private static final String DIAGRAM_ELEMENT_ID = "diagramElementId"; private final IEditingContextEventProcessorRegistry editingContextEventProcessorRegistry; diff --git a/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationArrangeAllDataFetcher.java b/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationArrangeAllDataFetcher.java index 7882e58b54..b2e0bfe0d8 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationArrangeAllDataFetcher.java +++ b/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationArrangeAllDataFetcher.java @@ -34,7 +34,7 @@ @MutationDataFetcher(type = "Mutation", field = "arrangeAll") public class MutationArrangeAllDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationDeleteFromDiagramDataFetcher.java b/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationDeleteFromDiagramDataFetcher.java index 232a9260e4..81ab1c5858 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationDeleteFromDiagramDataFetcher.java +++ b/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationDeleteFromDiagramDataFetcher.java @@ -36,7 +36,7 @@ @MutationDataFetcher(type = "Mutation", field = "deleteFromDiagram") public class MutationDeleteFromDiagramDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationDropOnDiagramDataFetcher.java b/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationDropOnDiagramDataFetcher.java index f537400ad7..d7a9d78656 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationDropOnDiagramDataFetcher.java +++ b/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationDropOnDiagramDataFetcher.java @@ -34,7 +34,7 @@ @MutationDataFetcher(type = "Mutation", field = "dropOnDiagram") public class MutationDropOnDiagramDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationEditLabelDataFetcher.java b/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationEditLabelDataFetcher.java index cc1c3d0501..4c68104896 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationEditLabelDataFetcher.java +++ b/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationEditLabelDataFetcher.java @@ -34,7 +34,7 @@ @MutationDataFetcher(type = "Mutation", field = "editLabel") public class MutationEditLabelDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationFadeDiagramElementDataFetcher.java b/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationFadeDiagramElementDataFetcher.java index 40d5b067cc..88a99533b1 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationFadeDiagramElementDataFetcher.java +++ b/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationFadeDiagramElementDataFetcher.java @@ -34,7 +34,7 @@ @MutationDataFetcher(type = "Mutation", field = "fadeDiagramElement") public class MutationFadeDiagramElementDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationHideDiagramElementDataFetcher.java b/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationHideDiagramElementDataFetcher.java index 5b82e013cc..400d9985c3 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationHideDiagramElementDataFetcher.java +++ b/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationHideDiagramElementDataFetcher.java @@ -34,7 +34,7 @@ @MutationDataFetcher(type = "Mutation", field = "hideDiagramElement") public class MutationHideDiagramElementDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationInvokeSingleClickOnDiagramElementToolDataFetcher.java b/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationInvokeSingleClickOnDiagramElementToolDataFetcher.java index 4e201834df..4eddfbd6f7 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationInvokeSingleClickOnDiagramElementToolDataFetcher.java +++ b/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationInvokeSingleClickOnDiagramElementToolDataFetcher.java @@ -34,7 +34,7 @@ @MutationDataFetcher(type = "Mutation", field = "invokeSingleClickOnDiagramElementTool") public class MutationInvokeSingleClickOnDiagramElementToolDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationInvokeSingleClickOnTwoDiagramElementsToolDataFetcher.java b/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationInvokeSingleClickOnTwoDiagramElementsToolDataFetcher.java index cce4ab599d..6de9cf7cf9 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationInvokeSingleClickOnTwoDiagramElementsToolDataFetcher.java +++ b/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationInvokeSingleClickOnTwoDiagramElementsToolDataFetcher.java @@ -35,7 +35,7 @@ @MutationDataFetcher(type = "Mutation", field = "invokeSingleClickOnTwoDiagramElementsTool") public class MutationInvokeSingleClickOnTwoDiagramElementsToolDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationReconnectEdgeDataFetcher.java b/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationReconnectEdgeDataFetcher.java index d75f5ddcc8..d8dd0816b1 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationReconnectEdgeDataFetcher.java +++ b/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationReconnectEdgeDataFetcher.java @@ -43,7 +43,7 @@ @MutationDataFetcher(type = "Mutation", field = "reconnectEdge") public class MutationReconnectEdgeDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationUpdateEdgeRoutingPointsDataFetcher.java b/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationUpdateEdgeRoutingPointsDataFetcher.java index 0bb9e20c13..427308fae1 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationUpdateEdgeRoutingPointsDataFetcher.java +++ b/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationUpdateEdgeRoutingPointsDataFetcher.java @@ -43,7 +43,7 @@ @MutationDataFetcher(type = "Mutation", field = "updateEdgeRoutingPoints") public class MutationUpdateEdgeRoutingPointsDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationUpdateNodeBoundsDataFetcher.java b/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationUpdateNodeBoundsDataFetcher.java index f25b007942..1e60831de6 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationUpdateNodeBoundsDataFetcher.java +++ b/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationUpdateNodeBoundsDataFetcher.java @@ -34,7 +34,7 @@ @MutationDataFetcher(type = "Mutation", field = "updateNodeBounds") public class MutationUpdateNodeBoundsDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationUpdateNodePositionDataFetcher.java b/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationUpdateNodePositionDataFetcher.java index cd66e43b1b..65a16686e6 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationUpdateNodePositionDataFetcher.java +++ b/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/mutation/MutationUpdateNodePositionDataFetcher.java @@ -34,7 +34,7 @@ @MutationDataFetcher(type = "Mutation", field = "updateNodePosition") public class MutationUpdateNodePositionDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/subscription/SubscriptionDiagramEventDataFetcher.java b/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/subscription/SubscriptionDiagramEventDataFetcher.java index 011049cadc..baab462be5 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/subscription/SubscriptionDiagramEventDataFetcher.java +++ b/packages/diagrams/backend/sirius-components-diagrams-graphql/src/main/java/org/eclipse/sirius/components/diagrams/graphql/datafetchers/subscription/SubscriptionDiagramEventDataFetcher.java @@ -37,7 +37,7 @@ @SubscriptionDataFetcher(type = "Subscription", field = "diagramEvent") public class SubscriptionDiagramEventDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/diagrams/backend/sirius-components-diagrams-graphql/src/test/java/org/eclipse/sirius/components/diagrams/graphql/architecture/ArchitectureConstants.java b/packages/diagrams/backend/sirius-components-diagrams-graphql/src/test/java/org/eclipse/sirius/components/diagrams/graphql/architecture/ArchitectureConstants.java index 4b165dcd1c..64f4543425 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-graphql/src/test/java/org/eclipse/sirius/components/diagrams/graphql/architecture/ArchitectureConstants.java +++ b/packages/diagrams/backend/sirius-components-diagrams-graphql/src/test/java/org/eclipse/sirius/components/diagrams/graphql/architecture/ArchitectureConstants.java @@ -22,7 +22,7 @@ * @author gcoutable */ public final class ArchitectureConstants { - public static final String SIRIUS_COMPONENTS_DIAGRAMS_GRAPHQL_ROOT_PACKAGE = "org.eclipse.sirius.components.diagrams.graphql.."; //$NON-NLS-1$ + public static final String SIRIUS_COMPONENTS_DIAGRAMS_GRAPHQL_ROOT_PACKAGE = "org.eclipse.sirius.components.diagrams.graphql.."; // @formatter:off public static final JavaClasses CLASSES = new ClassFileImporter() diff --git a/packages/diagrams/backend/sirius-components-diagrams-layout-api/src/main/java/org/eclipse/sirius/components/diagrams/layout/api/Bounds.java b/packages/diagrams/backend/sirius-components-diagrams-layout-api/src/main/java/org/eclipse/sirius/components/diagrams/layout/api/Bounds.java index 98dc7b3b6a..7c64f504fa 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-layout-api/src/main/java/org/eclipse/sirius/components/diagrams/layout/api/Bounds.java +++ b/packages/diagrams/backend/sirius-components-diagrams-layout-api/src/main/java/org/eclipse/sirius/components/diagrams/layout/api/Bounds.java @@ -49,7 +49,7 @@ public static Builder newBounds() { @Override public String toString() { - String pattern = "{0} '{'size: {1}, position: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'size: {1}, position: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.size, this.position); } diff --git a/packages/diagrams/backend/sirius-components-diagrams-layout/src/main/java/org/eclipse/sirius/components/diagrams/layout/ELKDiagramConverter.java b/packages/diagrams/backend/sirius-components-diagrams-layout/src/main/java/org/eclipse/sirius/components/diagrams/layout/ELKDiagramConverter.java index ad3eb9c1ea..9949df5c77 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-layout/src/main/java/org/eclipse/sirius/components/diagrams/layout/ELKDiagramConverter.java +++ b/packages/diagrams/backend/sirius-components-diagrams-layout/src/main/java/org/eclipse/sirius/components/diagrams/layout/ELKDiagramConverter.java @@ -65,13 +65,13 @@ @Service public class ELKDiagramConverter implements IELKDiagramConverter { - public static final IProperty PROPERTY_TYPE = new Property<>("org.eclipse.sirius.components.layout.type"); //$NON-NLS-1$ + public static final IProperty PROPERTY_TYPE = new Property<>("org.eclipse.sirius.components.layout.type"); - public static final IProperty> PROPERTY_CHILDREN_LAYOUT_STRATEGY = new Property<>("org.eclipse.sirius.components.layout.children.layout.strategy"); //$NON-NLS-1$ + public static final IProperty> PROPERTY_CHILDREN_LAYOUT_STRATEGY = new Property<>("org.eclipse.sirius.components.layout.children.layout.strategy"); - public static final String DEFAULT_DIAGRAM_TYPE = "graph"; //$NON-NLS-1$ + public static final String DEFAULT_DIAGRAM_TYPE = "graph"; - public static final String DEFAULT_IMAGE_TYPE = "image:inside-center"; //$NON-NLS-1$ + public static final String DEFAULT_IMAGE_TYPE = "image:inside-center"; private final TextBoundsService textBoundsService; @@ -413,7 +413,7 @@ private void convertNode(Node node, ElkNode parent, Map { // @formatter:off LabelStyle labelStyle = LabelStyle.newLabelStyle() .fontSize(16) - .color("#000000") //$NON-NLS-1$ - .iconURL("") //$NON-NLS-1$ + .color("#000000") + .iconURL("") .build(); Label label = Label.newLabel(UUID.randomUUID().toString()) - .type("labelType") //$NON-NLS-1$ + .type("labelType") .position(Position.UNDEFINED) .size(Size.UNDEFINED) .alignment(Position.UNDEFINED) - .text("ABCDEFGHIJKLMOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz") //$NON-NLS-1$ + .text("ABCDEFGHIJKLMOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz") .style(labelStyle) .build(); this.getBounds(label); @@ -76,7 +76,7 @@ public void initialize() { this.executorService.execute(computeBounds); this.executorService.shutdown(); - this.logger.debug("AWT initialization done"); //$NON-NLS-1$ + this.logger.debug("AWT initialization done"); } @PreDestroy diff --git a/packages/diagrams/backend/sirius-components-diagrams-layout/src/main/java/org/eclipse/sirius/components/diagrams/layout/incremental/LayoutEngineHandlerSwitch.java b/packages/diagrams/backend/sirius-components-diagrams-layout/src/main/java/org/eclipse/sirius/components/diagrams/layout/incremental/LayoutEngineHandlerSwitch.java index 864df49eee..709ef5f778 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-layout/src/main/java/org/eclipse/sirius/components/diagrams/layout/incremental/LayoutEngineHandlerSwitch.java +++ b/packages/diagrams/backend/sirius-components-diagrams-layout/src/main/java/org/eclipse/sirius/components/diagrams/layout/incremental/LayoutEngineHandlerSwitch.java @@ -62,7 +62,7 @@ public Optional apply(String nodeType) { } if (optionalLayoutEngine.isEmpty()) { - String pattern = "The node type {} is not currently supported."; //$NON-NLS-1$ + String pattern = "The node type {} is not currently supported."; this.logger.warn(pattern, nodeType); } diff --git a/packages/diagrams/backend/sirius-components-diagrams-layout/src/main/java/org/eclipse/sirius/components/diagrams/layout/incremental/LayoutStrategyEngineHandlerSwitch.java b/packages/diagrams/backend/sirius-components-diagrams-layout/src/main/java/org/eclipse/sirius/components/diagrams/layout/incremental/LayoutStrategyEngineHandlerSwitch.java index 863c29ffcb..7fc57f322c 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-layout/src/main/java/org/eclipse/sirius/components/diagrams/layout/incremental/LayoutStrategyEngineHandlerSwitch.java +++ b/packages/diagrams/backend/sirius-components-diagrams-layout/src/main/java/org/eclipse/sirius/components/diagrams/layout/incremental/LayoutStrategyEngineHandlerSwitch.java @@ -45,7 +45,7 @@ public Optional apply(ILayoutStrategy layoutStrategy) { } if (optionalLayoutStrategyEngine.isEmpty()) { - String pattern = "The layout strategy engine {} is not currently supported."; //$NON-NLS-1$ + String pattern = "The layout strategy engine {} is not currently supported."; this.logger.warn(pattern, layoutStrategy.getClass().getSimpleName()); } diff --git a/packages/diagrams/backend/sirius-components-diagrams-layout/src/main/java/org/eclipse/sirius/components/diagrams/layout/incremental/provider/ImageSizeProvider.java b/packages/diagrams/backend/sirius-components-diagrams-layout/src/main/java/org/eclipse/sirius/components/diagrams/layout/incremental/provider/ImageSizeProvider.java index 34f7867c6e..1453b53d4b 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-layout/src/main/java/org/eclipse/sirius/components/diagrams/layout/incremental/provider/ImageSizeProvider.java +++ b/packages/diagrams/backend/sirius-components-diagrams-layout/src/main/java/org/eclipse/sirius/components/diagrams/layout/incremental/provider/ImageSizeProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo and others. + * Copyright (c) 2021, 2022 Obeo and others. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -57,9 +57,9 @@ @Service public class ImageSizeProvider { - private static final String SVGZ_FILE_EXTENSION = "svgz"; //$NON-NLS-1$ + private static final String SVGZ_FILE_EXTENSION = "svgz"; - private static final String SVG_FILE_EXTENSION = "svg"; //$NON-NLS-1$ + private static final String SVG_FILE_EXTENSION = "svg"; private static final long MAX_CACHE_SIZE = 1000; @@ -160,7 +160,7 @@ private Optional getSVGSize(URL url, String extension) { File tmpSvg = null; try (InputStream inJarInputStream = new BufferedInputStream(url.openStream())) { // We will copy the svg file to avoid jar in jar path problems. - tmpSvg = java.io.File.createTempFile("sirius-web", extension); //$NON-NLS-1$ + tmpSvg = java.io.File.createTempFile("sirius-web", extension); try (FileOutputStream outputStream = new FileOutputStream(tmpSvg)) { inJarInputStream.transferTo(outputStream); try (InputStream onTmpInputStream = new FileInputStream(tmpSvg)) { @@ -183,7 +183,7 @@ private Optional getSVGSize(URL url, String extension) { } } } catch (IOException | BridgeException exception) { - String pattern = "An error has occured while computing the dimensions of {0}: {1}"; //$NON-NLS-1$ + String pattern = "An error has occured while computing the dimensions of {0}: {1}"; this.logger.warn(MessageFormat.format(pattern, url.toString(), exception.getMessage()), exception); } finally { if (tmpSvg != null && tmpSvg.exists()) { diff --git a/packages/diagrams/backend/sirius-components-diagrams-layout/src/main/java/org/eclipse/sirius/components/diagrams/layout/incremental/provider/NodePositionProvider.java b/packages/diagrams/backend/sirius-components-diagrams-layout/src/main/java/org/eclipse/sirius/components/diagrams/layout/incremental/provider/NodePositionProvider.java index d0cdc3b2b3..c872568477 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-layout/src/main/java/org/eclipse/sirius/components/diagrams/layout/incremental/provider/NodePositionProvider.java +++ b/packages/diagrams/backend/sirius-components-diagrams-layout/src/main/java/org/eclipse/sirius/components/diagrams/layout/incremental/provider/NodePositionProvider.java @@ -230,11 +230,11 @@ public Position getDefaultPosition(NodeLayoutData node) { IContainerLayoutData parent = node.getParent(); double defaultYPosition = LayoutOptionValues.DEFAULT_ELK_PADDING; double labelPaddings = 0; - if (this.isLabelOfType(parent, "inside")) { //$NON-NLS-1$ + if (this.isLabelOfType(parent, "inside")) { double parentLabelHeight = ((NodeLayoutData) parent).getLabel().getTextBounds().getSize().getHeight(); labelPaddings += parentLabelHeight + DEFAULT_NODE_LABELS_PADDING; } - if (this.isLabelOfType(node, "outside")) { //$NON-NLS-1$ + if (this.isLabelOfType(node, "outside")) { double nodeLabelHeight = node.getLabel().getTextBounds().getSize().getHeight(); labelPaddings += nodeLabelHeight + DEFAULT_NODE_LABELS_PADDING; } diff --git a/packages/diagrams/backend/sirius-components-diagrams-layout/src/main/java/org/eclipse/sirius/components/diagrams/layout/incremental/updater/ContainmentUpdater.java b/packages/diagrams/backend/sirius-components-diagrams-layout/src/main/java/org/eclipse/sirius/components/diagrams/layout/incremental/updater/ContainmentUpdater.java index 003931cc8e..80c1241e6a 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-layout/src/main/java/org/eclipse/sirius/components/diagrams/layout/incremental/updater/ContainmentUpdater.java +++ b/packages/diagrams/backend/sirius-components-diagrams-layout/src/main/java/org/eclipse/sirius/components/diagrams/layout/incremental/updater/ContainmentUpdater.java @@ -141,7 +141,7 @@ private boolean compareDimensions(double parentStart, double parentDimension, do private boolean isLabelContained(IContainerLayoutData container) { if (container instanceof NodeLayoutData) { NodeLayoutData nodeLayoutData = (NodeLayoutData) container; - return nodeLayoutData.getLabel().getLabelType().contains("inside"); //$NON-NLS-1$ + return nodeLayoutData.getLabel().getLabelType().contains("inside"); } return false; diff --git a/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/architecture/ArchitectureConstants.java b/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/architecture/ArchitectureConstants.java index b97cb3ec96..930fc8e312 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/architecture/ArchitectureConstants.java +++ b/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/architecture/ArchitectureConstants.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -22,7 +22,7 @@ * @author sbegaudeau */ public final class ArchitectureConstants { - public static final String SIRIUS_COMPONENTS_DIAGRAMS_LAYOUT_ROOT_PACKAGE = "org.eclipse.sirius.components.diagrams.layout.."; //$NON-NLS-1$ + public static final String SIRIUS_COMPONENTS_DIAGRAMS_LAYOUT_ROOT_PACKAGE = "org.eclipse.sirius.components.diagrams.layout.."; // @formatter:off public static final JavaClasses CLASSES = new ClassFileImporter() diff --git a/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/BorderNodePositionTests.java b/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/BorderNodePositionTests.java index 245b10249a..b97b9a4117 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/BorderNodePositionTests.java +++ b/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/BorderNodePositionTests.java @@ -98,7 +98,7 @@ public void testBorderNodeCreationEvent() { List borderNodes = initializeDiagram.getChildrenNodes().get(0).getBorderNodes(); // add a border node with an non positioned label - LabelLayoutData labelLayoutData = this.createLabelLayoutData(Position.at(-1, -1), "any", BORDER_NODE_LABEL_TEXT_BOUNDS); //$NON-NLS-1$ + LabelLayoutData labelLayoutData = this.createLabelLayoutData(Position.at(-1, -1), "any", BORDER_NODE_LABEL_TEXT_BOUNDS); borderNodes.add(this.createBorderNodeLayoutData(BORDER_NODE_LABEL_TEXT_POSITION, DEFAULT_BORDER_NODE_SIZE, initializeDiagram, NodeType.NODE_RECTANGLE, labelLayoutData)); NodeSizeProvider nodeSizeProvider = new NodeSizeProvider(new ImageSizeProvider()); @@ -331,7 +331,7 @@ private NodeLayoutData createBorderNodeLayoutData(Position position, Size size, private NodeLayoutData createBorderNodeLayoutData(Position position, Size size, IContainerLayoutData parent, String nodeType) { NodeLayoutData nodeLayoutData = this.createBorderNodeLayoutData(position, size, parent, nodeType, - this.createLabelLayoutData(BORDER_NODE_LABEL_TEXT_POSITION, "any", BORDER_NODE_LABEL_TEXT_BOUNDS)); //$NON-NLS-1$ + this.createLabelLayoutData(BORDER_NODE_LABEL_TEXT_POSITION, "any", BORDER_NODE_LABEL_TEXT_BOUNDS)); return nodeLayoutData; } @@ -343,7 +343,7 @@ private NodeLayoutData createNodeLayoutData(Position position, Size size, IConta nodeLayoutData.setSize(size); nodeLayoutData.setNodeType(nodeType); nodeLayoutData.setChildrenNodes(new ArrayList<>()); - nodeLayoutData.setLabel(this.createLabelLayoutData(Position.at(0, 0), "inside", new TextBounds(Size.of(0, 0), Position.at(0, 0)))); //$NON-NLS-1$ + nodeLayoutData.setLabel(this.createLabelLayoutData(Position.at(0, 0), "inside", new TextBounds(Size.of(0, 0), Position.at(0, 0)))); return nodeLayoutData; } diff --git a/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/DiagramLayoutTests.java b/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/DiagramLayoutTests.java index 779fabcb38..1528c8e717 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/DiagramLayoutTests.java +++ b/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/DiagramLayoutTests.java @@ -58,15 +58,15 @@ */ public class DiagramLayoutTests { - private static final String DIAGRAM_ROOT_ID = "Root"; //$NON-NLS-1$ + private static final String DIAGRAM_ROOT_ID = "Root"; - private static final String THIRD_TARGET_OBJECT_ID = "Third"; //$NON-NLS-1$ + private static final String THIRD_TARGET_OBJECT_ID = "Third"; - private static final String SECOND_TARGET_OBJECT_ID = "Second"; //$NON-NLS-1$ + private static final String SECOND_TARGET_OBJECT_ID = "Second"; - private static final String FIRST_TARGET_OBJECT_ID = "First"; //$NON-NLS-1$ + private static final String FIRST_TARGET_OBJECT_ID = "First"; - private static final Path PATH_TO_EDITING_CONTEXTS = Paths.get("src", "test", "resources", "editing-contexts"); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$ + private static final Path PATH_TO_EDITING_CONTEXTS = Paths.get("src", "test", "resources", "editing-contexts"); private TestLayoutObjectService objectService = new TestLayoutObjectService(); @@ -123,11 +123,11 @@ public void testRemoveEdgeDoesNotAffectUnrelated() { .rectangleNode(SECOND_TARGET_OBJECT_ID).at(50, 10).of(20, 20).and() .rectangleNode(THIRD_TARGET_OBJECT_ID).at(50, 40).of(20, 20).and() .and() - .edge("one") //$NON-NLS-1$ + .edge("one") .from(FIRST_TARGET_OBJECT_ID).at(0.75, 0.5) .to(SECOND_TARGET_OBJECT_ID).at(0.25, 0.5) .and() - .edge("two") //$NON-NLS-1$ + .edge("two") .from(FIRST_TARGET_OBJECT_ID).at(0.5, 0.75) .to(THIRD_TARGET_OBJECT_ID).at(0.25, 0.5) .goingThrough(20, 50) @@ -135,7 +135,7 @@ public void testRemoveEdgeDoesNotAffectUnrelated() { .build(); // @formatter:on - Path path = Paths.get(PATH_TO_EDITING_CONTEXTS.toString(), "testRemoveEdgeDoesNotAffectUnrelated"); //$NON-NLS-1$ + Path path = Paths.get(PATH_TO_EDITING_CONTEXTS.toString(), "testRemoveEdgeDoesNotAffectUnrelated"); JsonBasedEditingContext editingContext = new JsonBasedEditingContext(path); TestDiagramCreationService diagramCreationService = this.createDiagramCreationService(diagram); @@ -169,10 +169,10 @@ public void testRemoveEdgeDoesNotAffectUnrelated() { @Test public void testSimpleDiagramLayout() throws IOException { - String firstParentTargetObjectId = "First Parent"; //$NON-NLS-1$ - String secondParentTargetObjectId = "Second Parent"; //$NON-NLS-1$ - String firstChildTargetObjectId = "First child"; //$NON-NLS-1$ - String secondChildTargetObjectId = "Second child"; //$NON-NLS-1$ + String firstParentTargetObjectId = "First Parent"; + String secondParentTargetObjectId = "Second Parent"; + String firstChildTargetObjectId = "First child"; + String secondChildTargetObjectId = "Second child"; // @formatter:off Diagram diagram = TestLayoutDiagramBuilder.diagram(DIAGRAM_ROOT_ID) @@ -185,18 +185,18 @@ public void testSimpleDiagramLayout() throws IOException { .and() .rectangleNode(secondParentTargetObjectId).at(300, 400).of(100, 100).and() .and() - .edge("Link") //$NON-NLS-1$ + .edge("Link") .from(firstParentTargetObjectId).at(0.5, 0.5) .to(secondParentTargetObjectId).at(0.8, 0.8) .and() - .edge("Opposite Link") //$NON-NLS-1$ + .edge("Opposite Link") .from(secondParentTargetObjectId).at(0.2, 0.7) .to(firstParentTargetObjectId).at(0.1, 0.9) .and() .build(); // @formatter:on - Path path = Paths.get(PATH_TO_EDITING_CONTEXTS.toString(), "testSimpleDiagramLayout"); //$NON-NLS-1$ + Path path = Paths.get(PATH_TO_EDITING_CONTEXTS.toString(), "testSimpleDiagramLayout"); JsonBasedEditingContext editingContext = new JsonBasedEditingContext(path); TestDiagramCreationService diagramCreationService = this.createDiagramCreationService(diagram); @@ -218,7 +218,7 @@ public void testSimpleDiagramLayout() throws IOException { assertThat(firstChild.getPosition()).isEqualTo(Position.at(10, 10)); assertThat(firstChild.getSize()).isEqualTo(Size.of(50, 50)); - Optional optionalThirdParent = this.getNode(refreshedDiagram.getNodes(), "Third Parent"); //$NON-NLS-1$ + Optional optionalThirdParent = this.getNode(refreshedDiagram.getNodes(), "Third Parent"); assertThat(optionalThirdParent).isPresent(); Node thirdParent = optionalThirdParent.get(); assertThat(thirdParent.getPosition()).isEqualTo(Position.UNDEFINED); @@ -236,7 +236,7 @@ public void testSimpleDiagramLayout() throws IOException { Diagram layoutedDiagram = diagramCreationService.performLayout(editingContext, refreshedDiagram, diagramEvent); - Optional optionalLayoutedThirdParent = this.getNode(layoutedDiagram.getNodes(), "Third Parent"); //$NON-NLS-1$ + Optional optionalLayoutedThirdParent = this.getNode(layoutedDiagram.getNodes(), "Third Parent"); assertThat(optionalLayoutedThirdParent).isPresent(); Node layoutedThirdParent = optionalLayoutedThirdParent.get(); assertThat(layoutedThirdParent.getPosition()).isEqualTo(Position.at(300, 100)); @@ -251,7 +251,7 @@ public void testCreateEdgeDoesNotAffectOtherEdges() { .nodes() .rectangleNode(FIRST_TARGET_OBJECT_ID).at(10, 10).of(-1, -1) .childNodes(columnListLayoutStrategy) - .iconLabelNode("Child").at(-1, -1).of(-1, -1).and() //$NON-NLS-1$ + .iconLabelNode("Child").at(-1, -1).of(-1, -1).and() .and() .and() .rectangleNode(SECOND_TARGET_OBJECT_ID).at(100, 100).of(-1, -1) @@ -271,7 +271,7 @@ public void testCreateEdgeDoesNotAffectOtherEdges() { assertThat(initialEdge.getSourceAnchorRelativePosition()).isEqualTo(Ratio.of(0.75, 0.25)); assertThat(initialEdge.getTargetAnchorRelativePosition()).isEqualTo(Ratio.of(0.25, 0.25)); - Path path = Paths.get(PATH_TO_EDITING_CONTEXTS.toString(), "testCreateEdgeDoesNotAffectOtherEdges"); //$NON-NLS-1$ + Path path = Paths.get(PATH_TO_EDITING_CONTEXTS.toString(), "testCreateEdgeDoesNotAffectOtherEdges"); JsonBasedEditingContext editingContext = new JsonBasedEditingContext(path); TestDiagramCreationService diagramCreationService = this.createDiagramCreationService(initialLayoutedDiagram); diff --git a/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/EdgeLabelPositionProviderTests.java b/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/EdgeLabelPositionProviderTests.java index b62f78dc8e..96a48edf39 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/EdgeLabelPositionProviderTests.java +++ b/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/EdgeLabelPositionProviderTests.java @@ -45,9 +45,9 @@ public class EdgeLabelPositionProviderTests { private static final int FONT_SIZE = 16; - private static final String LABEL_COLOR = "#000000"; //$NON-NLS-1$ + private static final String LABEL_COLOR = "#000000"; - private static final String ICON_URL = ""; //$NON-NLS-1$ + private static final String ICON_URL = ""; @BeforeAll public static void beforeAll() { @@ -83,7 +83,7 @@ private LabelLayoutData createLabelLayoutData() { .iconURL(ICON_URL) .build(); //@formatter:on - TextBounds textBounds = new TextBoundsProvider().computeBounds(labelStyle, "labelText"); //$NON-NLS-1$ + TextBounds textBounds = new TextBoundsProvider().computeBounds(labelStyle, "labelText"); labelLayoutData.setTextBounds(textBounds); return labelLayoutData; } diff --git a/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/EdgeLayoutTests.java b/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/EdgeLayoutTests.java index 207fe6394a..5a2200e1b1 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/EdgeLayoutTests.java +++ b/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/EdgeLayoutTests.java @@ -49,7 +49,7 @@ * @author gcoutable */ public class EdgeLayoutTests { - private static final Path PATH_TO_EDITING_CONTEXTS = Paths.get("src", "test", "resources", "editing-contexts"); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$ + private static final Path PATH_TO_EDITING_CONTEXTS = Paths.get("src", "test", "resources", "editing-contexts"); private TestLayoutObjectService objectService = new TestLayoutObjectService(); @@ -77,51 +77,49 @@ public Optional findById(IEditingContext editingCont @Test public void testRemoveEdgesBetweenTwoSameElements() { - String firstNode = "First"; //$NON-NLS-1$ - String secondNode = "Second"; //$NON-NLS-1$ + String firstNode = "First"; + String secondNode = "Second"; // @formatter:off - Diagram diagram = TestLayoutDiagramBuilder.diagram("Root") //$NON-NLS-1$ + Diagram diagram = TestLayoutDiagramBuilder.diagram("Root") .nodes() .rectangleNode(firstNode).at(10, 10).of(40, 210).and() .rectangleNode(secondNode).at(100, 10).of(40, 210).and() .and() - .edge("E1 - removed") //$NON-NLS-1$ + .edge("E1 - removed") .from(firstNode).at(0.75, 1.0 / 7.0) .to(secondNode).at(0.25, 1.0 / 7.0) .and() - .edge("E2") //$NON-NLS-1$ + .edge("E2") .from(firstNode).at(0.75, 2.0 / 7.0) .to(secondNode).at(0.25, 2.0 / 7.0) .and() - .edge("E3 - removed") //$NON-NLS-1$ + .edge("E3 - removed") .from(firstNode).at(0.75, 3.0 / 7.0) .to(secondNode).at(0.25, 3.0 / 7.0) .and() - .edge("E4") //$NON-NLS-1$ + .edge("E4") .from(firstNode).at(0.75, 4.0 / 7.0) .to(secondNode).at(0.25, 4.0 / 7.0) .and() - .edge("E5 - removed") //$NON-NLS-1$ + .edge("E5 - removed") .from(firstNode).at(0.75, 5.0 / 7.0) .to(secondNode).at(0.25, 5.0 / 7.0) .and() - .edge("E6") //$NON-NLS-1$ + .edge("E6") .from(firstNode).at(0.75, 6.0 / 7.0) .to(secondNode).at(0.25, 6.0 / 7.0) .and() .build(); // @formatter:on - Path path = Paths.get(PATH_TO_EDITING_CONTEXTS.toString(), "testRemoveEdgeWithMultipleEdgeBetweenSameElement"); //$NON-NLS-1$ + Path path = Paths.get(PATH_TO_EDITING_CONTEXTS.toString(), "testRemoveEdgeWithMultipleEdgeBetweenSameElement"); JsonBasedEditingContext editingContext = new JsonBasedEditingContext(path); List removedEdgeIds = new ArrayList<>(); // @formatter:off diagram.getEdges().stream() - .filter(edge -> { - return edge.getCenterLabel().getText().contains(" - removed"); //$NON-NLS-1$ - }) + .filter(edge -> edge.getCenterLabel().getText().contains(" - removed")) .map(Edge::getId) .forEach(removedEdgeIds::add); // @formatter:on diff --git a/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/IncrementalLayoutTests.java b/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/IncrementalLayoutTests.java index e0c4b68fa9..c207673dfe 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/IncrementalLayoutTests.java +++ b/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/IncrementalLayoutTests.java @@ -71,25 +71,25 @@ public void testClassDiagramIncrementalLayout() { ListLayoutStrategy columnListLayoutStrategy = new ListLayoutStrategy(); // @formatter:off - Diagram diagram = TestLayoutDiagramBuilder.diagram("Class") //$NON-NLS-1$ + Diagram diagram = TestLayoutDiagramBuilder.diagram("Class") .nodes() - .rectangleNode("Engine").at(100, 100).of(200, 300) //$NON-NLS-1$ + .rectangleNode("Engine").at(100, 100).of(200, 300) .childNodes(columnListLayoutStrategy) - .iconLabelNode("rpm: Integer").at(0, 0).of(0, 0).and() //$NON-NLS-1$ - .iconLabelNode("start(): void").at(0, 0).of(0, 0).and() //$NON-NLS-1$ - .iconLabelNode("accelerate(): void").at(0, 0).of(0, 0).and() //$NON-NLS-1$ - .iconLabelNode("deccelerate(): void").at(0, 0).of(0, 0).and() //$NON-NLS-1$ + .iconLabelNode("rpm: Integer").at(0, 0).of(0, 0).and() + .iconLabelNode("start(): void").at(0, 0).of(0, 0).and() + .iconLabelNode("accelerate(): void").at(0, 0).of(0, 0).and() + .iconLabelNode("deccelerate(): void").at(0, 0).of(0, 0).and() .and() .and() - .rectangleNode("Display").at(500, 500).of(200, 300) //$NON-NLS-1$ + .rectangleNode("Display").at(500, 500).of(200, 300) .childNodes(columnListLayoutStrategy) - .iconLabelNode("show(): void").at(0, 0).of(0, 0).and() //$NON-NLS-1$ - .iconLabelNode("update(): void").at(0, 0).of(0, 0).and() //$NON-NLS-1$ + .iconLabelNode("show(): void").at(0, 0).of(0, 0).and() + .iconLabelNode("update(): void").at(0, 0).of(0, 0).and() .and() .and() - .rectangleNode("Temperature Sensor").at(500, 500).of(400, 300) //$NON-NLS-1$ + .rectangleNode("Temperature Sensor").at(500, 500).of(400, 300) .childNodes(columnListLayoutStrategy) - .iconLabelNode("read(): Integer").at(0, 0).of(0, 0).and() //$NON-NLS-1$ + .iconLabelNode("read(): Integer").at(0, 0).of(0, 0).and() .and() .and() .and() @@ -105,52 +105,52 @@ public void testClassDiagramIncrementalLayout() { @Disabled public void testComponentDiagramIncrementalLayout() { // @formatter:off - Diagram diagram = TestLayoutDiagramBuilder.diagram("Component") //$NON-NLS-1$ + Diagram diagram = TestLayoutDiagramBuilder.diagram("Component") .nodes() - .rectangleNode("Server").at(100, 100).of(400, 200) //$NON-NLS-1$ + .rectangleNode("Server").at(100, 100).of(400, 200) .borderNodes() - .rectangleNode("ServerOutput1").at(-1, -1).of(20, 20) //$NON-NLS-1$ + .rectangleNode("ServerOutput1").at(-1, -1).of(20, 20) .and() - .rectangleNode("ServerInput1").at(-1, -1).of(20, 20) //$NON-NLS-1$ + .rectangleNode("ServerInput1").at(-1, -1).of(20, 20) .and() .and() .and() - .rectangleNode("Gateway").at(100, 500).of(400, 200) //$NON-NLS-1$ + .rectangleNode("Gateway").at(100, 500).of(400, 200) .borderNodes() - .rectangleNode("GatewayInput1").at(-1, -1).of(20, 20) //$NON-NLS-1$ + .rectangleNode("GatewayInput1").at(-1, -1).of(20, 20) .and() - .rectangleNode("GatewayInput2").at(-1, -1).of(20, 20) //$NON-NLS-1$ + .rectangleNode("GatewayInput2").at(-1, -1).of(20, 20) .and() - .rectangleNode("GatewayOutput1").at(-1, -1).of(20, 20) //$NON-NLS-1$ + .rectangleNode("GatewayOutput1").at(-1, -1).of(20, 20) .and() - .rectangleNode("GatewayOutput2").at(-1, -1).of(20, 20) //$NON-NLS-1$ + .rectangleNode("GatewayOutput2").at(-1, -1).of(20, 20) .and() .and() .and() - .rectangleNode("Client").at(100, 1000).of(400, 200) //$NON-NLS-1$ + .rectangleNode("Client").at(100, 1000).of(400, 200) .borderNodes() - .rectangleNode("ClientInput1").at(-1, -1).of(20, 20) //$NON-NLS-1$ + .rectangleNode("ClientInput1").at(-1, -1).of(20, 20) .and() - .rectangleNode("ClientOutput1").at(-1, -1).of(20, 20) //$NON-NLS-1$ + .rectangleNode("ClientOutput1").at(-1, -1).of(20, 20) .and() .and() .and() .and() - .edge("ClientOutput1 to GatewayInput1") //$NON-NLS-1$ - .from("ClientOutput1").at(0.5, 0.5) //$NON-NLS-1$ - .to("GatewayInput1").at(0.5, 0.5) //$NON-NLS-1$ + .edge("ClientOutput1 to GatewayInput1") + .from("ClientOutput1").at(0.5, 0.5) + .to("GatewayInput1").at(0.5, 0.5) .and() - .edge("GatewayOutput1 to ServerInput1") //$NON-NLS-1$ - .from("GatewayOutput1").at(0.5, 0.5) //$NON-NLS-1$ - .to("ServerInput1").at(0.5, 0.5) //$NON-NLS-1$ + .edge("GatewayOutput1 to ServerInput1") + .from("GatewayOutput1").at(0.5, 0.5) + .to("ServerInput1").at(0.5, 0.5) .and() - .edge("ServerOutput1 to GatewayInput2") //$NON-NLS-1$ - .from("ServerOutput1").at(0.5, 0.5) //$NON-NLS-1$ - .to("GatewayInput2").at(0.5, 0.5) //$NON-NLS-1$ + .edge("ServerOutput1 to GatewayInput2") + .from("ServerOutput1").at(0.5, 0.5) + .to("GatewayInput2").at(0.5, 0.5) .and() - .edge("GatewayOutput2 to ClientInput1") //$NON-NLS-1$ - .from("GatewayOutput2").at(0.5, 0.5) //$NON-NLS-1$ - .to("ClientInput1").at(0.5, 0.5) //$NON-NLS-1$ + .edge("GatewayOutput2 to ClientInput1") + .from("GatewayOutput2").at(0.5, 0.5) + .to("ClientInput1").at(0.5, 0.5) .and() .build(); // @formatter:on diff --git a/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/NodeCreationTests.java b/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/NodeCreationTests.java index 1586451985..b1851d1c1f 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/NodeCreationTests.java +++ b/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/NodeCreationTests.java @@ -64,7 +64,7 @@ public class NodeCreationTests { @Test public void testNodeCreationNoResizeNeeded() { - Path path = Paths.get("src", "test", "resources", "editing-contexts", "testNodeCreation"); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$ //$NON-NLS-5$ + Path path = Paths.get("src", "test", "resources", "editing-contexts", "testNodeCreation"); JsonBasedEditingContext editingContext = new JsonBasedEditingContext(path); Position eventCreationPosition = Position.at(10, 10); @@ -76,7 +76,7 @@ public void testNodeCreationNoResizeNeeded() { @Test public void testNodeCreationWithResizeNeeded() { - Path path = Paths.get("src", "test", "resources", "editing-contexts", "testNodeCreation"); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$ //$NON-NLS-5$ + Path path = Paths.get("src", "test", "resources", "editing-contexts", "testNodeCreation"); JsonBasedEditingContext editingContext = new JsonBasedEditingContext(path); Position eventCreationPosition = Position.at(200, 200); @@ -88,7 +88,7 @@ public void testNodeCreationWithResizeNeeded() { @Test public void testNodeCreationInResizedParentNoResizeNeeded() { - Path path = Paths.get("src", "test", "resources", "editing-contexts", "testNodeCreation"); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$ //$NON-NLS-5$ + Path path = Paths.get("src", "test", "resources", "editing-contexts", "testNodeCreation"); JsonBasedEditingContext editingContext = new JsonBasedEditingContext(path); Position eventCreationPosition = Position.at(10, 10); @@ -100,7 +100,7 @@ public void testNodeCreationInResizedParentNoResizeNeeded() { @Test public void testNodeCreationInResizedParentWithResizeNeeded() { - Path path = Paths.get("src", "test", "resources", "editing-contexts", "testNodeCreation"); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$ //$NON-NLS-5$ + Path path = Paths.get("src", "test", "resources", "editing-contexts", "testNodeCreation"); JsonBasedEditingContext editingContext = new JsonBasedEditingContext(path); Position eventCreationPosition = Position.at(200, 200); @@ -112,15 +112,15 @@ public void testNodeCreationInResizedParentWithResizeNeeded() { @Test public void testNodeCreationOutsideItsParent() { - Path path = Paths.get("src", "test", "resources", "editing-contexts", "testNodeCreationOutsideItsParent"); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$ //$NON-NLS-5$ + Path path = Paths.get("src", "test", "resources", "editing-contexts", "testNodeCreationOutsideItsParent"); JsonBasedEditingContext editingContext = new JsonBasedEditingContext(path); Position eventCreationPosition = Position.at(100, 100); // @formatter:off - Diagram diagram = TestLayoutDiagramBuilder.diagram("Root") //$NON-NLS-1$ + Diagram diagram = TestLayoutDiagramBuilder.diagram("Root") .nodes() - .rectangleNode("A").at(10, 10).of(200, 300).and() //$NON-NLS-1$ - .rectangleNode("B").at(500, 500).of(200, 300).and() //$NON-NLS-1$ + .rectangleNode("A").at(10, 10).of(200, 300).and() + .rectangleNode("B").at(500, 500).of(200, 300).and() .and() .build(); // @formatter:on @@ -128,11 +128,11 @@ public void testNodeCreationOutsideItsParent() { // we create a child of B by clicking inside of A Diagram layoutedDiagram = this.createNewNode(diagram, editingContext, eventCreationPosition); - Optional optionalA = this.getNode(layoutedDiagram.getNodes(), "A"); //$NON-NLS-1$ + Optional optionalA = this.getNode(layoutedDiagram.getNodes(), "A"); assertThat(optionalA).isPresent(); - Optional optionalB = this.getNode(layoutedDiagram.getNodes(), "B"); //$NON-NLS-1$ + Optional optionalB = this.getNode(layoutedDiagram.getNodes(), "B"); assertThat(optionalB).isPresent(); - Optional optionalChild = this.getNode(layoutedDiagram.getNodes(), "Child"); //$NON-NLS-1$ + Optional optionalChild = this.getNode(layoutedDiagram.getNodes(), "Child"); assertThat(optionalChild).isPresent(); // A should not have been resized @@ -150,16 +150,16 @@ public void testNodeCreationOutsideItsParent() { @Test public void testChildlessNodeCreation() { - Path path = Paths.get("src", "test", "resources", "editing-contexts", "testChildlessNodeCreation"); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$ //$NON-NLS-5$ + Path path = Paths.get("src", "test", "resources", "editing-contexts", "testChildlessNodeCreation"); JsonBasedEditingContext editingContext = new JsonBasedEditingContext(path); Position eventCreationPosition = Position.at(100, 100); - Diagram diagram = TestLayoutDiagramBuilder.diagram("Root").nodes().and().build(); //$NON-NLS-1$ + Diagram diagram = TestLayoutDiagramBuilder.diagram("Root").nodes().and().build(); Diagram layoutedDiagram = this.createNewNode(diagram, editingContext, eventCreationPosition); // parent node should still be positioned at the eventCreationPosition - Optional optionalParent = this.getNode(layoutedDiagram.getNodes(), "Parent"); //$NON-NLS-1$ + Optional optionalParent = this.getNode(layoutedDiagram.getNodes(), "Parent"); assertThat(optionalParent).isPresent(); Node parent = optionalParent.get(); Position parentPosition = parent.getPosition(); @@ -168,23 +168,23 @@ public void testChildlessNodeCreation() { @Test public void testMultiNodeCreation() { - Path path = Paths.get("src", "test", "resources", "editing-contexts", "testNodeCreation"); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$ //$NON-NLS-5$ + Path path = Paths.get("src", "test", "resources", "editing-contexts", "testNodeCreation"); JsonBasedEditingContext editingContext = new JsonBasedEditingContext(path); Position eventCreationPosition = Position.at(100, 100); - Diagram diagram = TestLayoutDiagramBuilder.diagram("Root").nodes().and().build(); //$NON-NLS-1$ + Diagram diagram = TestLayoutDiagramBuilder.diagram("Root").nodes().and().build(); Diagram layoutedDiagram = this.createNewNode(diagram, editingContext, eventCreationPosition); // parent node should still be positioned at the eventCreationPosition - Optional optionalParent = this.getNode(layoutedDiagram.getNodes(), "Parent"); //$NON-NLS-1$ + Optional optionalParent = this.getNode(layoutedDiagram.getNodes(), "Parent"); assertThat(optionalParent).isPresent(); Node parent = optionalParent.get(); Position parentPosition = parent.getPosition(); assertThat(parentPosition).isEqualTo(Position.at(100, 100)); // since the parent was not positioned yet, its children should be at a default position - Optional optionalChild = this.getNode(layoutedDiagram.getNodes(), "Child"); //$NON-NLS-1$ + Optional optionalChild = this.getNode(layoutedDiagram.getNodes(), "Child"); assertThat(optionalChild).isPresent(); Node child = optionalChild.get(); assertThat(child.getPosition()).isEqualTo(this.getDefaultPosition(parent, child)); @@ -201,11 +201,11 @@ private Position getDefaultPosition(Node parent, Node child) { double defaultLabelPadding = 2 * LayoutOptionValues.DEFAULT_ELK_NODE_LABELS_PADDING; double defaultYPosition = LayoutOptionValues.DEFAULT_ELK_PADDING; double labelPaddings = 0; - if (this.isLabelOfType(parent, "inside")) { //$NON-NLS-1$ + if (this.isLabelOfType(parent, "inside")) { double parentLabelHeight = parent.getLabel().getSize().getHeight(); labelPaddings += parentLabelHeight + defaultLabelPadding; } - if (this.isLabelOfType(child, "outside")) { //$NON-NLS-1$ + if (this.isLabelOfType(child, "outside")) { double nodeLabelHeight = child.getLabel().getSize().getHeight(); labelPaddings += nodeLabelHeight + defaultLabelPadding; } @@ -224,9 +224,9 @@ private boolean isLabelOfType(Node node, String labelType) { private Diagram createParentNotResizedDiagram() { // @formatter:off - return TestLayoutDiagramBuilder.diagram("Root") //$NON-NLS-1$ + return TestLayoutDiagramBuilder.diagram("Root") .nodes() - .rectangleNode("Parent").at(10, 10).of(200, 200) //$NON-NLS-1$ + .rectangleNode("Parent").at(10, 10).of(200, 200) .and() .and() .build(); @@ -234,9 +234,9 @@ private Diagram createParentNotResizedDiagram() { } private void testThatChildIsInParentBounds(Diagram diagram) { - Optional optionalParent = this.getNode(diagram.getNodes(), "Parent"); //$NON-NLS-1$ + Optional optionalParent = this.getNode(diagram.getNodes(), "Parent"); assertThat(optionalParent).isPresent(); - Optional optionalChild = this.getNode(diagram.getNodes(), "Child"); //$NON-NLS-1$ + Optional optionalChild = this.getNode(diagram.getNodes(), "Child"); assertThat(optionalChild).isPresent(); Node layoutedParent = optionalParent.get(); @@ -245,9 +245,9 @@ private void testThatChildIsInParentBounds(Diagram diagram) { private Diagram createParentResizedDiagram() { // @formatter:off - return TestLayoutDiagramBuilder.diagram("Root") //$NON-NLS-1$ + return TestLayoutDiagramBuilder.diagram("Root") .nodes() - .rectangleNode("Parent").at(10, 10).of(200, 200).customizedProperties(Set.of(CustomizableProperties.Size)) //$NON-NLS-1$ + .rectangleNode("Parent").at(10, 10).of(200, 200).customizedProperties(Set.of(CustomizableProperties.Size)) .and() .and() .build(); diff --git a/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/NodeLabelPositionProviderTests.java b/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/NodeLabelPositionProviderTests.java index b53d063d1b..05b890d9a3 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/NodeLabelPositionProviderTests.java +++ b/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/NodeLabelPositionProviderTests.java @@ -44,9 +44,9 @@ public class NodeLabelPositionProviderTests { private static final int FONT_SIZE = 16; - private static final String LABEL_COLOR = "#000000"; //$NON-NLS-1$ + private static final String LABEL_COLOR = "#000000"; - private static final String ICON_URL = ""; //$NON-NLS-1$ + private static final String ICON_URL = ""; private static final Size DEFAULT_NODE_SIZE = Size.of(150, 70); @@ -98,7 +98,7 @@ private LabelLayoutData createLabelLayoutData() { .iconURL(ICON_URL) .build(); //@formatter:on - TextBounds textBounds = new TextBoundsProvider().computeBounds(labelStyle, "labelText"); //$NON-NLS-1$ + TextBounds textBounds = new TextBoundsProvider().computeBounds(labelStyle, "labelText"); labelLayoutData.setTextBounds(textBounds); return labelLayoutData; } diff --git a/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/NodeMoveTests.java b/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/NodeMoveTests.java index 4c2de4daea..b76898da31 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/NodeMoveTests.java +++ b/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/NodeMoveTests.java @@ -59,18 +59,18 @@ public class NodeMoveTests { @Test public void testNodeMoveUpdatesEdgeRoutingPoints() { // @formatter:off - Diagram diagram = TestLayoutDiagramBuilder.diagram("Root") //$NON-NLS-1$ + Diagram diagram = TestLayoutDiagramBuilder.diagram("Root") .nodes() - .rectangleNode("Parent").at(100, 100).of(500, 500) //$NON-NLS-1$ + .rectangleNode("Parent").at(100, 100).of(500, 500) .childNodes(new FreeFormLayoutStrategy()) - .rectangleNode("First Child").at(100, 100).of(100, 100).and() //$NON-NLS-1$ - .rectangleNode("Second Child").at(300, 300).of(100, 100).and() //$NON-NLS-1$ + .rectangleNode("First Child").at(100, 100).of(100, 100).and() + .rectangleNode("Second Child").at(300, 300).of(100, 100).and() .and() .and() .and() - .edge("Contained Edge") //$NON-NLS-1$ - .from("First Child").at(0.5, 0.5) //$NON-NLS-1$ - .to("Second Child").at(0.5, 0.5) //$NON-NLS-1$ + .edge("Contained Edge") + .from("First Child").at(0.5, 0.5) + .to("Second Child").at(0.5, 0.5) .goingThrough(450, 250) .and() .build(); diff --git a/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/NodeResizeTests.java b/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/NodeResizeTests.java index d6991e727d..33500bbdea 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/NodeResizeTests.java +++ b/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/NodeResizeTests.java @@ -170,7 +170,7 @@ public void testExpandFromNW() { } private void testResizeNode(Position positionDelta, Position expectedPosition, Size newSize) { - String firstParentTargetObjectId = "First Parent"; //$NON-NLS-1$ + String firstParentTargetObjectId = "First Parent"; Diagram diagram = this.createDiagramWithOneNode(firstParentTargetObjectId); @@ -184,7 +184,7 @@ private void testResizeNode(Position positionDelta, Position expectedPosition, S private Diagram createDiagramWithOneNode(String firstParentTargetObjectId) { // @formatter:off - Diagram diagram = TestLayoutDiagramBuilder.diagram("Root") //$NON-NLS-1$ + Diagram diagram = TestLayoutDiagramBuilder.diagram("Root") .nodes() .rectangleNode(firstParentTargetObjectId).at(100, 100).of(200, 300) .and() @@ -195,7 +195,7 @@ private Diagram createDiagramWithOneNode(String firstParentTargetObjectId) { } private Optional resizeNode(String objectId, Diagram diagram, Position positionDelta, Size newSize) { - Path path = Paths.get("src", "test", "resources", "editing-contexts", "testResizeWithNoPositionDelta"); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$ //$NON-NLS-5$ + Path path = Paths.get("src", "test", "resources", "editing-contexts", "testResizeWithNoPositionDelta"); JsonBasedEditingContext editingContext = new JsonBasedEditingContext(path); TestDiagramCreationService diagramCreationService = this.createDiagramCreationService(diagram); diff --git a/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/ReconnectEdgeTests.java b/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/ReconnectEdgeTests.java index d7ddde7902..171b7be9ad 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/ReconnectEdgeTests.java +++ b/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/incremental/ReconnectEdgeTests.java @@ -54,17 +54,17 @@ */ public class ReconnectEdgeTests { - private static final String EDGE_TO_RECONNECT_LABEL = "Edge to reconnect"; //$NON-NLS-1$ + private static final String EDGE_TO_RECONNECT_LABEL = "Edge to reconnect"; - private static final String DIAGRAM_ROOT = "Root"; //$NON-NLS-1$ + private static final String DIAGRAM_ROOT = "Root"; - private static final String THIRD_NODE = "Third"; //$NON-NLS-1$ + private static final String THIRD_NODE = "Third"; - private static final String SECOND_NODE = "Second"; //$NON-NLS-1$ + private static final String SECOND_NODE = "Second"; - private static final String FIRST_NODE = "First"; //$NON-NLS-1$ + private static final String FIRST_NODE = "First"; - private static final Path PATH_TO_EDITING_CONTEXTS = Paths.get("src", "test", "resources", "editing-contexts"); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$ + private static final Path PATH_TO_EDITING_CONTEXTS = Paths.get("src", "test", "resources", "editing-contexts"); private TestLayoutObjectService objectService = new TestLayoutObjectService(); @@ -127,7 +127,7 @@ public void testReconnectTargetEdgeEnd() { .build(); // @formatter:on - Path path = Paths.get(PATH_TO_EDITING_CONTEXTS.toString(), "testReconnectTargetEdgeEnd"); //$NON-NLS-1$ + Path path = Paths.get(PATH_TO_EDITING_CONTEXTS.toString(), "testReconnectTargetEdgeEnd"); JsonBasedEditingContext editingContext = new JsonBasedEditingContext(path); Optional thirdNode = this.getNode(diagram.getNodes(), THIRD_NODE); @@ -178,7 +178,7 @@ public void testReconnectSourceEdgeEnd() { .build(); // @formatter:on - Path path = Paths.get(PATH_TO_EDITING_CONTEXTS.toString(), "testReconnectSourceEdgeEnd"); //$NON-NLS-1$ + Path path = Paths.get(PATH_TO_EDITING_CONTEXTS.toString(), "testReconnectSourceEdgeEnd"); JsonBasedEditingContext editingContext = new JsonBasedEditingContext(path); Optional thirdNode = this.getNode(diagram.getNodes(), THIRD_NODE); @@ -225,7 +225,7 @@ public void testReconnectOneTargetWithMultipleEdgeBetweenSameElements() { .rectangleNode(SECOND_NODE).at(150, 10).of(100, 100).and() .rectangleNode(THIRD_NODE).at(150, 150).of(100, 100).and() .and() - .edge("f -> s 0") //$NON-NLS-1$ + .edge("f -> s 0") .from(FIRST_NODE).at(0.75, 0.2) .to(SECOND_NODE).at(0.25, 0.2) .and() @@ -233,15 +233,15 @@ public void testReconnectOneTargetWithMultipleEdgeBetweenSameElements() { .from(FIRST_NODE).at(0.75, 0.4) .to(SECOND_NODE).at(0.25, 0.4) .and() - .edge("f -> s 2") //$NON-NLS-1$ + .edge("f -> s 2") .from(FIRST_NODE).at(0.75, 0.6) .to(SECOND_NODE).at(0.25, 0.6) .and() - .edge("f -> s 3") //$NON-NLS-1$ + .edge("f -> s 3") .from(FIRST_NODE).at(0.75, 0.8) .to(SECOND_NODE).at(0.25, 0.8) .and() - .edge("f -> t 0") //$NON-NLS-1$ + .edge("f -> t 0") .from(FIRST_NODE).at(0.5, 0.75) .to(THIRD_NODE).at(0.25, 0.5) .goingThrough(60, 200) @@ -249,7 +249,7 @@ public void testReconnectOneTargetWithMultipleEdgeBetweenSameElements() { .build(); // @formatter:on - Path path = Paths.get(PATH_TO_EDITING_CONTEXTS.toString(), "testReconnectOneTargetWithMultipleEdgeBetweenSameElements"); //$NON-NLS-1$ + Path path = Paths.get(PATH_TO_EDITING_CONTEXTS.toString(), "testReconnectOneTargetWithMultipleEdgeBetweenSameElements"); JsonBasedEditingContext editingContext = new JsonBasedEditingContext(path); Optional secondNode = this.getNode(diagram.getNodes(), SECOND_NODE); diff --git a/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/services/DefaultTestDiagramDescriptionProvider.java b/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/services/DefaultTestDiagramDescriptionProvider.java index d7cdb85445..74b3d7f14b 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/services/DefaultTestDiagramDescriptionProvider.java +++ b/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/services/DefaultTestDiagramDescriptionProvider.java @@ -57,15 +57,15 @@ */ public class DefaultTestDiagramDescriptionProvider { - private static final String NODE_LIST_ITEM_PREFIX = "listitem"; //$NON-NLS-1$ + private static final String NODE_LIST_ITEM_PREFIX = "listitem"; - private static final String NODE_LIST_PREFIX = "list"; //$NON-NLS-1$ + private static final String NODE_LIST_PREFIX = "list"; - private static final String NODE_IMG_PREFIX = "img"; //$NON-NLS-1$ + private static final String NODE_IMG_PREFIX = "img"; - private static final String NODE_RECT_PREFIX = "rect"; //$NON-NLS-1$ + private static final String NODE_RECT_PREFIX = "rect"; - private static final String NODE_NAME_SEPARATOR = ":"; //$NON-NLS-1$ + private static final String NODE_NAME_SEPARATOR = ":"; private IObjectService objectService; @@ -73,7 +73,7 @@ public class DefaultTestDiagramDescriptionProvider { // @formatter:off return variableManager.get(VariableManager.SELF, Object.class) .map(this.objectService::getId) - .orElse(""); //$NON-NLS-1$ + .orElse(""); // @formatter:on }; @@ -84,7 +84,7 @@ public class DefaultTestDiagramDescriptionProvider { .map(name -> name.split(NODE_NAME_SEPARATOR)) .filter(composedName -> composedName.length >= 2) .map(composedName -> composedName[0]) - .orElse(""); //$NON-NLS-1$ + .orElse(""); // @formatter:on INodeStyle nodeStyle = null; @@ -96,15 +96,15 @@ public class DefaultTestDiagramDescriptionProvider { .borderSize(1) .borderRadius(3) .borderStyle(LineStyle.Solid) - .color("#E5F5F8") //$NON-NLS-1$ - .borderColor("#33B0C3") //$NON-NLS-1$ + .color("#E5F5F8") + .borderColor("#33B0C3") .build(); // @formatter:on break; case NODE_IMG_PREFIX: // @formatter:off nodeStyle = ImageNodeStyle.newImageNodeStyle() - .imageURL("") //$NON-NLS-1$ + .imageURL("") .scalingFactor(1) .build(); // @formatter:on @@ -113,18 +113,18 @@ public class DefaultTestDiagramDescriptionProvider { // @formatter:off nodeStyle = RectangularNodeStyle.newRectangularNodeStyle() .withHeader(true) - .borderColor("black") //$NON-NLS-1$ + .borderColor("black") .borderRadius(0) .borderSize(1) .borderStyle(LineStyle.Solid) - .color("white") //$NON-NLS-1$ + .color("white") .build(); // @formatter:on break; case NODE_LIST_ITEM_PREFIX: // @formatter:off nodeStyle = IconLabelNodeStyle.newIconLabelNodeStyle() - .backgroundColor("white") //$NON-NLS-1$ + .backgroundColor("white") .build(); // @formatter:on break; @@ -143,7 +143,7 @@ public class DefaultTestDiagramDescriptionProvider { .filter(composedName -> composedName.length >= 2) .map(composedName -> composedName[0]) .map(prefix -> { - String type = ""; //$NON-NLS-1$ + String type = ""; switch (prefix) { case NODE_RECT_PREFIX: type = NodeType.NODE_RECTANGLE; @@ -158,12 +158,12 @@ public class DefaultTestDiagramDescriptionProvider { type = NodeType.NODE_ICON_LABEL; break; default: - type = ""; //$NON-NLS-1$ + type = ""; break; } return type; }) - .orElse(""); //$NON-NLS-1$ + .orElse(""); // @formatter:on }; @@ -203,7 +203,7 @@ public class DefaultTestDiagramDescriptionProvider { .map(name -> name.split(NODE_NAME_SEPARATOR)) .filter(composedName -> composedName.length >= 2) .map(composedName -> composedName[1]) - .orElse(""); //$NON-NLS-1$ + .orElse(""); // @formatter:on }; @@ -214,7 +214,7 @@ public class DefaultTestDiagramDescriptionProvider { .map(Element::getChildren) .orElse(List.of()) .stream() - .filter(element -> !element.getName().startsWith("edge:")) //$NON-NLS-1$ + .filter(element -> !element.getName().startsWith("edge:")) .forEach(children::add); return children; // @formatter:on @@ -273,7 +273,7 @@ private Function element.getName().startsWith("edge:")) //$NON-NLS-1$ + .filter(element -> element.getName().startsWith("edge:")) .map(this.objectService::getId) .map(targetObjectIdToNodeId::get) .map(idToElement::get) @@ -295,16 +295,16 @@ public DiagramDescription getDefaultDiagramDescription(Diagram diagram) { // @formatter:off DiagramDescription diagramDescription = DiagramDescription.newDiagramDescription(TestLayoutDiagramBuilder.DIAGRAM_DESCRIPTION_ID) - .label("") //$NON-NLS-1$ + .label("") .autoLayout(false) .targetObjectIdProvider(this.targetObjectIdProvider) .canCreatePredicate(variableManager -> false) - .labelProvider(variableManager -> variableManager.get(DiagramDescription.LABEL, String.class).orElse("")) //$NON-NLS-1$ + .labelProvider(variableManager -> variableManager.get(DiagramDescription.LABEL, String.class).orElse("")) .toolSections(List.of()) .tools(List.of()) .nodeDescriptions(List.of(nodeDescription)) .edgeDescriptions(List.of(edgeDescription)) - .dropHandler(variableManager -> new Failure("")) //$NON-NLS-1$ + .dropHandler(variableManager -> new Failure("")) .build(); // @formatter:on @@ -317,7 +317,7 @@ private EdgeDescription getDefaultEdgeDescription(Diagram diagram, LabelDescript // @formatter:off return EdgeDescription.newEdgeDescription(TestLayoutDiagramBuilder.EDGE_DESCRIPTION_ID) .targetObjectIdProvider(this.targetObjectIdProvider) - .targetObjectKindProvider(variableManager -> "") //$NON-NLS-1$ + .targetObjectKindProvider(variableManager -> "") .targetObjectLabelProvider(this.labelProvider) .semanticElementsProvider(variableManager -> { var optionalCache = variableManager.get(DiagramDescription.CACHE, DiagramRenderingCache.class); @@ -359,12 +359,12 @@ private EdgeDescription getDefaultEdgeDescription(Diagram diagram, LabelDescript .lineStyle(LineStyle.Solid) .sourceArrow(ArrowStyle.None) .targetArrow(ArrowStyle.InputArrow) - .color("#002639") //$NON-NLS-1$ + .color("#002639") .size(1) .build(); }) - .deleteHandler(variableManager -> new Failure("")) //$NON-NLS-1$ - .labelEditHandler((variableManager, newValue) -> new Failure("")) //$NON-NLS-1$ + .deleteHandler(variableManager -> new Failure("")) + .labelEditHandler((variableManager, newValue) -> new Failure("")) .build(); // @formatter:on @@ -375,7 +375,7 @@ private NodeDescription getDefaultNodeDescription(LabelDescription labelDescript return NodeDescription.newNodeDescription(TestLayoutDiagramBuilder.NODE_DESCRIPTION_ID) .typeProvider(this.nodeTypeProvider) .targetObjectIdProvider(this.targetObjectIdProvider) - .targetObjectKindProvider(variableManager -> "") //$NON-NLS-1$ + .targetObjectKindProvider(variableManager -> "") .targetObjectLabelProvider(this.labelProvider) .semanticElementsProvider(this.nodeSemanticElementProvider) .labelDescription(labelDescription) @@ -384,8 +384,8 @@ private NodeDescription getDefaultNodeDescription(LabelDescription labelDescript .sizeProvider(variableManager -> Size.UNDEFINED) .borderNodeDescriptions(List.of()) .childNodeDescriptions(List.of(childDescription)) - .deleteHandler(variableManager -> new Failure("")) //$NON-NLS-1$ - .labelEditHandler((variableManager, newValue) -> new Failure("")) //$NON-NLS-1$ + .deleteHandler(variableManager -> new Failure("")) + .labelEditHandler((variableManager, newValue) -> new Failure("")) .build(); // @formatter:on } @@ -395,7 +395,7 @@ private NodeDescription getDefaultChildDescription(LabelDescription labelDescrip return NodeDescription.newNodeDescription(TestLayoutDiagramBuilder.CHILD_NODE_DESCRIPTION_ID) .typeProvider(this.nodeTypeProvider) .targetObjectIdProvider(this.targetObjectIdProvider) - .targetObjectKindProvider(variableManager -> "") //$NON-NLS-1$ + .targetObjectKindProvider(variableManager -> "") .targetObjectLabelProvider(this.labelProvider) .semanticElementsProvider(this.nodeSemanticElementProvider) .labelDescription(labelDescription) @@ -403,8 +403,8 @@ private NodeDescription getDefaultChildDescription(LabelDescription labelDescrip .childrenLayoutStrategyProvider(this.childrenLayoutStrategyProvider) .sizeProvider(variableManager -> Size.UNDEFINED) .borderNodeDescriptions(List.of()).childNodeDescriptions(List.of()) - .deleteHandler(variableManager -> new Failure("")) //$NON-NLS-1$ - .labelEditHandler((variableManager, newValue) -> new Failure("")) //$NON-NLS-1$ + .deleteHandler(variableManager -> new Failure("")) + .labelEditHandler((variableManager, newValue) -> new Failure("")) .build(); // @formatter:on } @@ -412,7 +412,7 @@ private NodeDescription getDefaultChildDescription(LabelDescription labelDescrip private LabelDescription getDefaultLabelDescription() { // @formatter:off return LabelDescription.newLabelDescription(UUID.randomUUID().toString()) - .idProvider(variableManager -> "") //$NON-NLS-1$ + .idProvider(variableManager -> "") .textProvider(this.labelProvider) .styleDescriptionProvider(variableManager -> { return LabelStyleDescription.newLabelStyleDescription() @@ -420,9 +420,9 @@ private LabelDescription getDefaultLabelDescription() { .italicProvider(vm -> false) .underlineProvider(vm -> false) .strikeThroughProvider(vm -> false) - .colorProvider(vm -> "black") //$NON-NLS-1$ + .colorProvider(vm -> "black") .fontSizeProvider(vm -> 14) - .iconURLProvider(vm -> "") //$NON-NLS-1$ + .iconURLProvider(vm -> "") .build(); }) .build(); diff --git a/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/services/DiagramELKLayoutTest.java b/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/services/DiagramELKLayoutTest.java index 1968db8122..e2e53e7b6f 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/services/DiagramELKLayoutTest.java +++ b/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/services/DiagramELKLayoutTest.java @@ -81,11 +81,11 @@ public Optional findById(IEditingContext editingCont @Test public void testNodeLayoutWithMultilineLabel() throws IOException { - String nodeLabelWithMultiple = "First LineAAAAAAAA\nSecond LineBBBBBBBBB"; //$NON-NLS-1$ - String firstChildTargetObjectId = "First child"; //$NON-NLS-1$ + String nodeLabelWithMultiple = "First LineAAAAAAAA\nSecond LineBBBBBBBBB"; + String firstChildTargetObjectId = "First child"; // @formatter:off - Diagram diagram = TestLayoutDiagramBuilder.diagram("Root") //$NON-NLS-1$ + Diagram diagram = TestLayoutDiagramBuilder.diagram("Root") .nodes() .rectangleNode(nodeLabelWithMultiple).at(10, 10).of(10, 10) .childNodes(new FreeFormLayoutStrategy()) @@ -96,7 +96,7 @@ public void testNodeLayoutWithMultilineLabel() throws IOException { .build(); // @formatter:on - Path path = Paths.get("src", "test", "resources", "editing-contexts", "testNodeLayoutWithMultilineLabel"); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$ //$NON-NLS-5$ + Path path = Paths.get("src", "test", "resources", "editing-contexts", "testNodeLayoutWithMultilineLabel"); JsonBasedEditingContext editingContext = new JsonBasedEditingContext(path); TestDiagramCreationService diagramCreationService = this.createDiagramCreationService(diagram); diff --git a/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/services/ImageNodeStyleSizeProviderTests.java b/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/services/ImageNodeStyleSizeProviderTests.java index 3ebe911c26..8ab5e865b8 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/services/ImageNodeStyleSizeProviderTests.java +++ b/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/services/ImageNodeStyleSizeProviderTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -30,7 +30,7 @@ */ public class ImageNodeStyleSizeProviderTests { - private static final String IMAGE_PNG = "/image.png"; //$NON-NLS-1$ + private static final String IMAGE_PNG = "/image.png"; private static final Size SIZE = Size.of(42, 42); diff --git a/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/services/ImageSizeProviderTests.java b/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/services/ImageSizeProviderTests.java index a62a15e799..b0f802591f 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/services/ImageSizeProviderTests.java +++ b/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/services/ImageSizeProviderTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -39,7 +39,7 @@ */ public class ImageSizeProviderTests { - private static final List FOLDERS = List.of("svg", "png", "jpg"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + private static final List FOLDERS = List.of("svg", "png", "jpg"); private final ImageSizeProvider imageSizeProvider = new ImageSizeProvider(); @@ -63,8 +63,8 @@ public static List getImagePaths() { String fileName = file.getName(); String baseName = FilenameUtils.getBaseName(fileName); - String[] splitBaseName = baseName.split("-"); //$NON-NLS-1$ - String[] expectedSize = splitBaseName[splitBaseName.length - 1].split("_"); //$NON-NLS-1$ + String[] splitBaseName = baseName.split("-"); + String[] expectedSize = splitBaseName[splitBaseName.length - 1].split("_"); String imagePath = folder + File.separator + fileName; Double width = Double.parseDouble(expectedSize[0]); Double height = Double.parseDouble(expectedSize[1]); diff --git a/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/services/TestLayoutObjectService.java b/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/services/TestLayoutObjectService.java index a01c1232af..297bb2f569 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/services/TestLayoutObjectService.java +++ b/packages/diagrams/backend/sirius-components-diagrams-layout/src/test/java/org/eclipse/sirius/components/diagrams/layout/services/TestLayoutObjectService.java @@ -31,12 +31,12 @@ public class TestLayoutObjectService extends NoOp { public String getId(Object object) { if (object instanceof Element) { Element element = (Element) object; - String[] composedName = element.getName().split(":"); //$NON-NLS-1$ + String[] composedName = element.getName().split(":"); if (composedName.length >= 2) { return composedName[1]; } } - return ""; //$NON-NLS-1$ + return ""; } @Override @@ -64,7 +64,7 @@ private Object doGetObject(Element element, String objectId) { } private boolean isObject(Element element, String objectId) { - String[] composedName = element.getName().split(":"); //$NON-NLS-1$ + String[] composedName = element.getName().split(":"); if (composedName.length < 2) { return false; } diff --git a/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/DiagramAssert.java b/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/DiagramAssert.java index 701b5c3b95..7d01b7c14a 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/DiagramAssert.java +++ b/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/DiagramAssert.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -118,25 +118,25 @@ public DiagramAssert hasBounds(double x, double y, double width, double height) Size size = this.actual.getSize(); if (size == null) { - this.failWithMessage("Expected diagram's size to be <'{'width: %.2f, height: %.2f'}'> but was null", width, height); //$NON-NLS-1$ + this.failWithMessage("Expected diagram's size to be <'{'width: %.2f, height: %.2f'}'> but was null", width, height); } else { if (width != size.getWidth()) { - this.failWithMessage("Expected diagram's width to be <%.2f> but was <%.2f>", width, size.getWidth()); //$NON-NLS-1$ + this.failWithMessage("Expected diagram's width to be <%.2f> but was <%.2f>", width, size.getWidth()); } if (height != size.getHeight()) { - this.failWithMessage("Expected diagram's height to be <%.2f> but was <%.2f>", height, size.getHeight()); //$NON-NLS-1$ + this.failWithMessage("Expected diagram's height to be <%.2f> but was <%.2f>", height, size.getHeight()); } } Position position = this.actual.getPosition(); if (position == null) { - this.failWithMessage("Expected diagram's position to be <'{'x: %.2f, y: %.2f'}'> but was null", x, y); //$NON-NLS-1$ + this.failWithMessage("Expected diagram's position to be <'{'x: %.2f, y: %.2f'}'> but was null", x, y); } else { if (x != position.getX()) { - this.failWithMessage("Expected diagram's x to be <%.2f> but was <%.2f>", x, position.getX()); //$NON-NLS-1$ + this.failWithMessage("Expected diagram's x to be <%.2f> but was <%.2f>", x, position.getX()); } if (y != position.getY()) { - this.failWithMessage("Expected diagram's y to be <%.2f> but was <%.2f>", y, position.getY()); //$NON-NLS-1$ + this.failWithMessage("Expected diagram's y to be <%.2f> but was <%.2f>", y, position.getY()); } } @@ -155,7 +155,7 @@ public DiagramAssert isValid() { private void visitNodeId(List ids, Node node) { if (ids.contains(node.getId())) { - this.failWithMessage("The id of the node <%s> already exist in the diagram", node.getId()); //$NON-NLS-1$ + this.failWithMessage("The id of the node <%s> already exist in the diagram", node.getId()); } ids.add(node.getId()); this.visitLabelId(ids, node.getLabel()); @@ -166,7 +166,7 @@ private void visitNodeId(List ids, Node node) { private void visitEdgeId(List ids, Edge edge) { if (ids.contains(edge.getId())) { - this.failWithMessage("The id of the edge <%s> already exist in the diagram", edge.getId()); //$NON-NLS-1$ + this.failWithMessage("The id of the edge <%s> already exist in the diagram", edge.getId()); } ids.add(edge.getId()); @@ -178,7 +178,7 @@ private void visitEdgeId(List ids, Edge edge) { private void visitLabelId(List ids, Label label) { if (label != null) { if (ids.contains(label.getId())) { - this.failWithMessage("The id of the label <%s> already exist in the diagram", label.getId()); //$NON-NLS-1$ + this.failWithMessage("The id of the label <%s> already exist in the diagram", label.getId()); } ids.add(label.getId()); } diff --git a/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/EdgeAssert.java b/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/EdgeAssert.java index 4d3924b89e..1b72d88703 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/EdgeAssert.java +++ b/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/EdgeAssert.java @@ -63,13 +63,13 @@ public EdgeAssert matches(Edge edge, IdPolicy idPolicy, LayoutPolicy layoutPolic Position routingPoint = edge.getRoutingPoints().get(i); if (actualRoutingPoint == null) { - this.failWithMessage("Expected routing point to be <'{'x: %.2f, y: %.2f'}'> but was null", routingPoint.getX(), routingPoint.getY()); //$NON-NLS-1$ + this.failWithMessage("Expected routing point to be <'{'x: %.2f, y: %.2f'}'> but was null", routingPoint.getX(), routingPoint.getY()); } else { if (actualRoutingPoint.getX() != routingPoint.getX()) { - this.failWithMessage("Expected routing point's x to be <%.2f> but was <%.2f>", actualRoutingPoint.getX(), routingPoint.getX()); //$NON-NLS-1$ + this.failWithMessage("Expected routing point's x to be <%.2f> but was <%.2f>", actualRoutingPoint.getX(), routingPoint.getX()); } if (actualRoutingPoint.getY() != routingPoint.getY()) { - this.failWithMessage("Expected routing point's y to be <%.2f> but was <%.2f>", actualRoutingPoint.getY(), routingPoint.getY()); //$NON-NLS-1$ + this.failWithMessage("Expected routing point's y to be <%.2f> but was <%.2f>", actualRoutingPoint.getY(), routingPoint.getY()); } } } diff --git a/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/LabelAssert.java b/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/LabelAssert.java index 9cd4ff55ec..78e25081dc 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/LabelAssert.java +++ b/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/LabelAssert.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -54,37 +54,37 @@ public LabelAssert hasBounds(double x, double y, double width, double height, do Size size = this.actual.getSize(); if (size == null) { - this.failWithMessage("Expected label's size to be <'{'width: %.2f, height: %.2f'}'> but was null", width, height); //$NON-NLS-1$ + this.failWithMessage("Expected label's size to be <'{'width: %.2f, height: %.2f'}'> but was null", width, height); } else { if (width != size.getWidth()) { - this.failWithMessage("Expected label's width to be <%.2f> but was <%.2f>", width, size.getWidth()); //$NON-NLS-1$ + this.failWithMessage("Expected label's width to be <%.2f> but was <%.2f>", width, size.getWidth()); } if (height != size.getHeight()) { - this.failWithMessage("Expected label's height to be <%.2f> but was <%.2f>", height, size.getHeight()); //$NON-NLS-1$ + this.failWithMessage("Expected label's height to be <%.2f> but was <%.2f>", height, size.getHeight()); } } Position position = this.actual.getPosition(); if (position == null) { - this.failWithMessage("Expected label's position to be <'{'x: %.2f, y: %.2f'}'> but was null", x, y); //$NON-NLS-1$ + this.failWithMessage("Expected label's position to be <'{'x: %.2f, y: %.2f'}'> but was null", x, y); } else { if (x != position.getX()) { - this.failWithMessage("Expected label's x to be <%.2f> but was <%.2f>", x, position.getX()); //$NON-NLS-1$ + this.failWithMessage("Expected label's x to be <%.2f> but was <%.2f>", x, position.getX()); } if (y != position.getY()) { - this.failWithMessage("Expected label's y to be <%.2f> but was <%.2f>", y, position.getY()); //$NON-NLS-1$ + this.failWithMessage("Expected label's y to be <%.2f> but was <%.2f>", y, position.getY()); } } Position alignment = this.actual.getAlignment(); if (alignment == null) { - this.failWithMessage("Expected label's alignment to be <'{'x: %.2f, y: %.2f'}'> but was null", xAlignment, yAlignment); //$NON-NLS-1$ + this.failWithMessage("Expected label's alignment to be <'{'x: %.2f, y: %.2f'}'> but was null", xAlignment, yAlignment); } else { if (x != alignment.getX()) { - this.failWithMessage("Expected label's x alignment to be <%.2f> but was <%.2f>", x, alignment.getX()); //$NON-NLS-1$ + this.failWithMessage("Expected label's x alignment to be <%.2f> but was <%.2f>", x, alignment.getX()); } if (y != alignment.getY()) { - this.failWithMessage("Expected label's y alignment to be <%.2f> but was <%.2f>", y, alignment.getY()); //$NON-NLS-1$ + this.failWithMessage("Expected label's y alignment to be <%.2f> but was <%.2f>", y, alignment.getY()); } } diff --git a/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/NodeAssert.java b/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/NodeAssert.java index da4e4d12af..094734fbb0 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/NodeAssert.java +++ b/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/NodeAssert.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -101,25 +101,25 @@ public NodeAssert hasBounds(double x, double y, double width, double height) { Size size = this.actual.getSize(); if (size == null) { - this.failWithMessage("Expected node's size to be <'{'width: %.2f, height: %.2f'}'> but was null", width, height); //$NON-NLS-1$ + this.failWithMessage("Expected node's size to be <'{'width: %.2f, height: %.2f'}'> but was null", width, height); } else { if (width != size.getWidth()) { - this.failWithMessage("Expected node's width to be <%.2f> but was <%.2f>", width, size.getWidth()); //$NON-NLS-1$ + this.failWithMessage("Expected node's width to be <%.2f> but was <%.2f>", width, size.getWidth()); } if (height != size.getHeight()) { - this.failWithMessage("Expected node's height to be <%.2f> but was <%.2f>", height, size.getHeight()); //$NON-NLS-1$ + this.failWithMessage("Expected node's height to be <%.2f> but was <%.2f>", height, size.getHeight()); } } Position position = this.actual.getPosition(); if (position == null) { - this.failWithMessage("Expected node's position to be <'{'x: %.2f, y: %.2f'}'> but was null", x, y); //$NON-NLS-1$ + this.failWithMessage("Expected node's position to be <'{'x: %.2f, y: %.2f'}'> but was null", x, y); } else { if (x != position.getX()) { - this.failWithMessage("Expected node's x to be <%.2f> but was <%.2f>", x, position.getX()); //$NON-NLS-1$ + this.failWithMessage("Expected node's x to be <%.2f> but was <%.2f>", x, position.getX()); } if (y != position.getY()) { - this.failWithMessage("Expected node's y to be <%.2f> but was <%.2f>", y, position.getY()); //$NON-NLS-1$ + this.failWithMessage("Expected node's y to be <%.2f> but was <%.2f>", y, position.getY()); } } diff --git a/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/TestDiagramBuilder.java b/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/TestDiagramBuilder.java index 6e1e342cbe..e8a11e5d56 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/TestDiagramBuilder.java +++ b/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/TestDiagramBuilder.java @@ -42,18 +42,18 @@ */ public class TestDiagramBuilder { - public static final String IMAGE_PNG = "/image.png"; //$NON-NLS-1$ + public static final String IMAGE_PNG = "/image.png"; public static final String TOOL_IMAGE_URL = IMAGE_PNG; - public static final String TOOL_LABEL = "toolLabel"; //$NON-NLS-1$ + public static final String TOOL_LABEL = "toolLabel"; public Diagram getDiagram(String id) { // @formatter:off return Diagram.newDiagram(id) - .label("diagramLabel") //$NON-NLS-1$ + .label("diagramLabel") .descriptionId(UUID.randomUUID().toString()) - .targetObjectId("diagramTargetObjectId") //$NON-NLS-1$ + .targetObjectId("diagramTargetObjectId") .position(Position.UNDEFINED) .size(Size.UNDEFINED) .nodes(List.of()) @@ -65,10 +65,10 @@ public Diagram getDiagram(String id) { public RectangularNodeStyle getRectangularNodeStyle() { // @formatter:off return RectangularNodeStyle.newRectangularNodeStyle() - .borderColor("#000000") //$NON-NLS-1$ + .borderColor("#000000") .borderSize(1) .borderStyle(LineStyle.Solid) - .color("#FFFFFF") //$NON-NLS-1$ + .color("#FFFFFF") .build(); // @formatter:on } @@ -85,13 +85,13 @@ public ImageNodeStyle getImageNodeStyle() { public Node getNode(String id) { // @formatter:off LabelStyle labelStyle = LabelStyle.newLabelStyle() - .color("#000000") //$NON-NLS-1$ + .color("#000000") .fontSize(16) - .iconURL("") //$NON-NLS-1$ + .iconURL("") .build(); Label label = Label.newLabel(UUID.randomUUID().toString()) - .type("labelType") //$NON-NLS-1$ - .text("text") //$NON-NLS-1$ + .type("labelType") + .text("text") .position(Position.UNDEFINED) .size(Size.UNDEFINED) .alignment(Position.UNDEFINED) @@ -100,9 +100,9 @@ public Node getNode(String id) { return Node.newNode(id) .type(NodeType.NODE_RECTANGLE) - .targetObjectId("nodeTargetObjectId") //$NON-NLS-1$ - .targetObjectKind("") //$NON-NLS-1$ - .targetObjectLabel("") //$NON-NLS-1$ + .targetObjectId("nodeTargetObjectId") + .targetObjectKind("") + .targetObjectLabel("") .descriptionId(UUID.randomUUID()) .label(label) .style(this.getRectangularNodeStyle()) @@ -124,14 +124,14 @@ public Edge getEdge(String id, String sourceId, String targetId) { .lineStyle(LineStyle.Solid) .sourceArrow(ArrowStyle.None) .targetArrow(ArrowStyle.InputArrow) - .color("#FFFFFF") //$NON-NLS-1$ + .color("#FFFFFF") .build(); return Edge.newEdge(id) - .type("edgeType") //$NON-NLS-1$ - .targetObjectId("edgeTargetObjectId") //$NON-NLS-1$ - .targetObjectKind("") //$NON-NLS-1$ - .targetObjectLabel("") //$NON-NLS-1$ + .type("edgeType") + .targetObjectId("edgeTargetObjectId") + .targetObjectKind("") + .targetObjectLabel("") .descriptionId(UUID.randomUUID()) .sourceId(sourceId) .targetId(targetId) diff --git a/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/TestDiagramDescriptionBuilder.java b/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/TestDiagramDescriptionBuilder.java index 346be72057..4032db8fc5 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/TestDiagramDescriptionBuilder.java +++ b/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/TestDiagramDescriptionBuilder.java @@ -45,15 +45,15 @@ public class TestDiagramDescriptionBuilder { public DiagramDescription getDiagramDescription(String diagramDescriptionId, List nodeDescriptions, List edgeDescriptions, List toolSections) { // @formatter:off return DiagramDescription.newDiagramDescription(diagramDescriptionId) - .label("") //$NON-NLS-1$ + .label("") .canCreatePredicate(variableManager -> Boolean.TRUE) - .targetObjectIdProvider(variableManager -> "targetObjectId") //$NON-NLS-1$ - .labelProvider(variableManager -> "Diagram") //$NON-NLS-1$ + .targetObjectIdProvider(variableManager -> "targetObjectId") + .labelProvider(variableManager -> "Diagram") .nodeDescriptions(nodeDescriptions) .edgeDescriptions(edgeDescriptions) .toolSections(toolSections) .tools(List.of()) - .dropHandler(variableManager -> new Failure("")) //$NON-NLS-1$ + .dropHandler(variableManager -> new Failure("")) .build(); // @formatter:on } @@ -69,7 +69,7 @@ public EdgeDescription getEdgeDescription(UUID edgeDescriptionId, NodeDescriptio .lineStyle(LineStyle.Dash_Dot) .sourceArrow(ArrowStyle.InputArrowWithDiamond) .targetArrow(ArrowStyle.None) - .color("rgb(1, 2, 3)") //$NON-NLS-1$ + .color("rgb(1, 2, 3)") .build(); }; @@ -84,10 +84,10 @@ public EdgeDescription getEdgeDescription(UUID edgeDescriptionId, NodeDescriptio .sourceNodeDescriptions(List.of(nodeDescription)) .targetNodeDescriptions(List.of(nodeDescription)) .targetObjectIdProvider(idProvider) - .targetObjectKindProvider(variableManager -> "") //$NON-NLS-1$ - .targetObjectLabelProvider(variableManager -> "")//$NON-NLS-1$ + .targetObjectKindProvider(variableManager -> "") + .targetObjectLabelProvider(variableManager -> "") .styleProvider(edgeStyleProvider) - .labelEditHandler((variableManager, newValue) -> new Failure("")) //$NON-NLS-1$ + .labelEditHandler((variableManager, newValue) -> new Failure("")) .deleteHandler(variableManager -> new Success()) .build(); // @formatter:on @@ -96,25 +96,25 @@ public EdgeDescription getEdgeDescription(UUID edgeDescriptionId, NodeDescriptio public NodeDescription getNodeDescription(UUID nodeDescriptionId, Function> semanticElementsProvider) { // @formatter:off LabelStyleDescription labelStyleDescription = LabelStyleDescription.newLabelStyleDescription() - .colorProvider(variableManager -> "#000000") //$NON-NLS-1$ + .colorProvider(variableManager -> "#000000") .fontSizeProvider(variableManager -> 16) .boldProvider(variableManager -> false) .italicProvider(variableManager -> false) .underlineProvider(variableManager -> false) .strikeThroughProvider(variableManager -> false) - .iconURLProvider(variableManager -> "") //$NON-NLS-1$ + .iconURLProvider(variableManager -> "") .build(); - LabelDescription labelDescription = LabelDescription.newLabelDescription("labelDescriptionId") //$NON-NLS-1$ - .idProvider(variableManager -> "labelId") //$NON-NLS-1$ - .textProvider(variableManager -> "Node") //$NON-NLS-1$ + LabelDescription labelDescription = LabelDescription.newLabelDescription("labelDescriptionId") + .idProvider(variableManager -> "labelId") + .textProvider(variableManager -> "Node") .styleDescriptionProvider(variableManager -> labelStyleDescription) .build(); Function nodeStyleProvider = variableManager -> { return RectangularNodeStyle.newRectangularNodeStyle() - .color("") //$NON-NLS-1$ - .borderColor("") //$NON-NLS-1$ + .color("") + .borderColor("") .borderSize(0) .borderStyle(LineStyle.Solid) .build(); @@ -129,11 +129,11 @@ public NodeDescription getNodeDescription(UUID nodeDescriptionId, Function "") //$NON-NLS-1$ + .typeProvider(variableManager -> "") .semanticElementsProvider(semanticElementsProvider) .targetObjectIdProvider(idProvider) - .targetObjectKindProvider(variableManager -> "") //$NON-NLS-1$ - .targetObjectLabelProvider(variableManager -> "")//$NON-NLS-1$ + .targetObjectKindProvider(variableManager -> "") + .targetObjectLabelProvider(variableManager -> "") .labelDescription(labelDescription) .styleProvider(nodeStyleProvider) .childrenLayoutStrategyProvider(variableManager -> new FreeFormLayoutStrategy()) @@ -147,6 +147,6 @@ public NodeDescription getNodeDescription(UUID nodeDescriptionId, Function " + targetId + " - " + edgeCount; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + String rawIdentifier = TestLayoutDiagramBuilder.EDGE_DESCRIPTION_ID.toString() + ": " + sourceId + " --> " + targetId + " - " + edgeCount; String id = UUID.nameUUIDFromBytes(rawIdentifier.getBytes()).toString(); return id; } @@ -94,7 +94,7 @@ public Edge build(Map targetObjectIdToNodeId) { .lineStyle(LineStyle.Solid) .sourceArrow(ArrowStyle.None) .targetArrow(ArrowStyle.InputArrow) - .color("#002639") //$NON-NLS-1$ + .color("#002639") .build(); // @formatter:on @@ -107,7 +107,7 @@ public Edge build(Map targetObjectIdToNodeId) { // @formatter:off return Edge.newEdge(targetObjectId) - .type("edge:straight") //$NON-NLS-1$ + .type("edge:straight") .sourceId(sourceId) .targetId(targetId) .sourceAnchorRelativePosition(sourceEdgeEnd.getEndRatio()) @@ -119,7 +119,7 @@ public Edge build(Map targetObjectIdToNodeId) { .routingPoints(this.routingPoints) .style(edgeStyle) .targetObjectId(sourceEdgeEnd.getEndId()) - .targetObjectKind("") //$NON-NLS-1$ + .targetObjectKind("") .targetObjectLabel(this.centerLabel.getText()) .modifiers(Set.of()) .state(ViewModifier.Normal) diff --git a/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/builder/label/LabelBuilder.java b/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/builder/label/LabelBuilder.java index fc0da78588..296ad8422b 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/builder/label/LabelBuilder.java +++ b/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/builder/label/LabelBuilder.java @@ -31,13 +31,13 @@ public final class LabelBuilder { public Label basicLabel(String text, LabelType labelType) { // @formatter:off LabelStyle labelStyle = LabelStyle.newLabelStyle() - .color("black") //$NON-NLS-1$ + .color("black") .fontSize(14) .bold(false) .italic(false) .underline(false) .strikeThrough(false) - .iconURL("") //$NON-NLS-1$ + .iconURL("") .build(); // @formatter:on diff --git a/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/builder/node/IconlabelNodeBuilder.java b/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/builder/node/IconlabelNodeBuilder.java index edae66a953..38f0345c8e 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/builder/node/IconlabelNodeBuilder.java +++ b/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/builder/node/IconlabelNodeBuilder.java @@ -101,7 +101,7 @@ public Node build(Map targetObjectIdToNodeId) { // @formatter:off INodeStyle style = IconLabelNodeStyle.newIconLabelNodeStyle() - .backgroundColor("white") //$NON-NLS-1$ + .backgroundColor("white") .build(); // @formatter:on @@ -126,7 +126,7 @@ public Node build(Map targetObjectIdToNodeId) { .customizedProperties(this.customizedProperties) .descriptionId(descriptionId) .targetObjectId(labelText) - .targetObjectKind("") //$NON-NLS-1$ + .targetObjectKind("") .targetObjectLabel(labelText) .style(Objects.requireNonNull(style)) .modifiers(Set.of()) diff --git a/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/builder/node/ImageNodeBuilder.java b/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/builder/node/ImageNodeBuilder.java index 147d1cc7c5..1e5636afc5 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/builder/node/ImageNodeBuilder.java +++ b/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/builder/node/ImageNodeBuilder.java @@ -100,7 +100,7 @@ public Node build(Map targetObjectIdToNodeId) { // @formatter:off INodeStyle style = ImageNodeStyle.newImageNodeStyle() - .imageURL("") //$NON-NLS-1$ + .imageURL("") .scalingFactor(1) .build(); // @formatter:on @@ -126,7 +126,7 @@ public Node build(Map targetObjectIdToNodeId) { .customizedProperties(this.customizedProperties) .descriptionId(descriptionId) .targetObjectId(labelText) - .targetObjectKind("") //$NON-NLS-1$ + .targetObjectKind("") .targetObjectLabel(labelText) .style(Objects.requireNonNull(style)) .modifiers(Set.of()) diff --git a/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/builder/node/RectangleNodeBuilder.java b/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/builder/node/RectangleNodeBuilder.java index 995e60cbd5..2396529cd2 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/builder/node/RectangleNodeBuilder.java +++ b/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/builder/node/RectangleNodeBuilder.java @@ -113,8 +113,8 @@ public Node build(Map targetObjectIdToNodeId) { // @formatter:off INodeStyle style = RectangularNodeStyle.newRectangularNodeStyle() - .color("#E5F5F8") //$NON-NLS-1$ - .borderColor("#33B0C3") //$NON-NLS-1$ + .color("#E5F5F8") + .borderColor("#33B0C3") .borderSize(1) .borderRadius(3) .borderStyle(LineStyle.Solid) @@ -143,7 +143,7 @@ public Node build(Map targetObjectIdToNodeId) { .customizedProperties(this.customizedProperties) .descriptionId(descriptionId) .targetObjectId(labeltext) - .targetObjectKind("") //$NON-NLS-1$ + .targetObjectKind("") .targetObjectLabel(this.label.getText()) .style(Objects.requireNonNull(style)) .modifiers(Set.of()) diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Diagram.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Diagram.java index 4caffd0057..3c241e3942 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Diagram.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Diagram.java @@ -27,7 +27,7 @@ */ @Immutable public final class Diagram implements IRepresentation, ISemanticRepresentation { - public static final String KIND = IRepresentation.KIND_PREFIX + "?type=Diagram"; //$NON-NLS-1$ + public static final String KIND = IRepresentation.KIND_PREFIX + "?type=Diagram"; private String id; @@ -102,7 +102,7 @@ public static Builder newDiagram(Diagram diagram) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, targetObjectId: {2}, descriptionId: {3}, label: {4}, nodeCount: {5}, edgeCount: {6}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, targetObjectId: {2}, descriptionId: {3}, label: {4}, nodeCount: {5}, edgeCount: {6}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.targetObjectId, this.descriptionId, this.label, this.nodes.size(), this.edges.size()); } diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Edge.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Edge.java index dfe249adfc..4cddc5553d 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Edge.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Edge.java @@ -29,15 +29,15 @@ @Immutable public final class Edge { - public static final String SELECTED_EDGE = "selectedEdge"; //$NON-NLS-1$ + public static final String SELECTED_EDGE = "selectedEdge"; - public static final String PRE_SOURCE = "preSource"; //$NON-NLS-1$ + public static final String PRE_SOURCE = "preSource"; - public static final String PRE_TARGET = "preTarget"; //$NON-NLS-1$ + public static final String PRE_TARGET = "preTarget"; - public static final String PRE_SOURCE_VIEW = "preSourceView"; //$NON-NLS-1$ + public static final String PRE_SOURCE_VIEW = "preSourceView"; - public static final String PRE_TARGET_VIEW = "preTargetView"; //$NON-NLS-1$ + public static final String PRE_TARGET_VIEW = "preTargetView"; private String id; @@ -155,7 +155,7 @@ public static Builder newEdge(Edge edge) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, targetObjectId: {2}, targetObjectKind: {3}, targetObjectLabel: {4}, descriptionId: {5}, sourceId: {6}, targetId: {7}, state: {8}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, targetObjectId: {2}, targetObjectKind: {3}, targetObjectLabel: {4}, descriptionId: {5}, sourceId: {6}, targetId: {7}, state: {8}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.targetObjectId, this.targetObjectKind, this.targetObjectLabel, this.descriptionId, this.sourceId, this.targetId, this.state.name()); } diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/EdgeStyle.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/EdgeStyle.java index 2d5fdc1303..5779f9d3fb 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/EdgeStyle.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/EdgeStyle.java @@ -64,7 +64,7 @@ public static Builder newEdgeStyle() { @Override public String toString() { - String pattern = "{0} '{'size: {1}, lineStyle: {2}, sourceArrow: {3}, targetArrow: {4}, color: {5}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'size: {1}, lineStyle: {2}, sourceArrow: {3}, targetArrow: {4}, color: {5}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.size, this.lineStyle, this.sourceArrow, this.targetArrow, this.color); } diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/FreeFormLayoutStrategy.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/FreeFormLayoutStrategy.java index fbe037493c..c66b245d80 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/FreeFormLayoutStrategy.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/FreeFormLayoutStrategy.java @@ -19,7 +19,7 @@ */ public final class FreeFormLayoutStrategy implements ILayoutStrategy { - public static final String KIND = "FreeForm"; //$NON-NLS-1$ + public static final String KIND = "FreeForm"; @Override public String getKind() { diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/IconLabelNodeStyle.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/IconLabelNodeStyle.java index ca49c8c4ce..8c353cd9f0 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/IconLabelNodeStyle.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/IconLabelNodeStyle.java @@ -41,7 +41,7 @@ public static Builder newIconLabelNodeStyle() { @Override public String toString() { - String pattern = "{0} '{'backgroundColor: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'backgroundColor: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.backgroundColor); } diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/ImageNodeStyle.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/ImageNodeStyle.java index d2cf78364c..f4f02010b2 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/ImageNodeStyle.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/ImageNodeStyle.java @@ -71,7 +71,7 @@ public static Builder newImageNodeStyle() { @Override public String toString() { - String pattern = "{0} '{'imageURL: {1}', border: '{' size: {2}, color: {3}, style: {4} '}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'imageURL: {1}', border: '{' size: {2}, color: {3}, style: {4} '}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.imageURL, this.borderSize, this.borderColor, this.borderStyle); } @@ -86,7 +86,7 @@ public static final class Builder { private int scalingFactor; - private String borderColor = "black"; //$NON-NLS-1$ + private String borderColor = "black"; private int borderSize; diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Label.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Label.java index 79bc6c51c8..20d4fa29b2 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Label.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Label.java @@ -81,7 +81,7 @@ public static Builder newLabel(Label label) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, type: {2}, text: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, type: {2}, text: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.type, this.text); } diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/ListLayoutStrategy.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/ListLayoutStrategy.java index d31ac0ead7..5ae8f36796 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/ListLayoutStrategy.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/ListLayoutStrategy.java @@ -19,7 +19,7 @@ */ public final class ListLayoutStrategy implements ILayoutStrategy { - public static final String KIND = "List"; //$NON-NLS-1$ + public static final String KIND = "List"; @Override public String getKind() { diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Node.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Node.java index 118786a22f..996e54b7a8 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Node.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Node.java @@ -28,7 +28,7 @@ */ @Immutable public final class Node { - public static final String SELECTED_NODE = "selectedNode"; //$NON-NLS-1$ + public static final String SELECTED_NODE = "selectedNode"; private String id; @@ -146,7 +146,7 @@ public static Builder newNode(Node node) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, targetObjectId: {2}, targetObjectKind: {3}, targetObjectLabel: {4}, descriptionId: {5}, state: {6}, label: {7}, styleType: {8}, borderNodeCount: {9}, childNodeCount: {10}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, targetObjectId: {2}, targetObjectKind: {3}, targetObjectLabel: {4}, descriptionId: {5}, state: {6}, label: {7}, styleType: {8}, borderNodeCount: {9}, childNodeCount: {10}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.targetObjectId, this.targetObjectKind, this.targetObjectLabel, this.descriptionId, this.state, this.label.getText(), this.style.getClass().getSimpleName(), this.borderNodes.size(), this.childNodes.size()); } diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/NodeType.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/NodeType.java index bc492d1a5e..2f44b0695e 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/NodeType.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/NodeType.java @@ -18,11 +18,11 @@ * @author sbegaudeau */ public final class NodeType { - public static final String NODE_RECTANGLE = "node:rectangle"; //$NON-NLS-1$ + public static final String NODE_RECTANGLE = "node:rectangle"; - public static final String NODE_IMAGE = "node:image"; //$NON-NLS-1$ + public static final String NODE_IMAGE = "node:image"; - public static final String NODE_ICON_LABEL = "node:icon-label"; //$NON-NLS-1$ + public static final String NODE_ICON_LABEL = "node:icon-label"; private NodeType() { // Prevent instantiation diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/ParametricSVGNodeStyle.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/ParametricSVGNodeStyle.java index a545570d07..1f8c1b445c 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/ParametricSVGNodeStyle.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/ParametricSVGNodeStyle.java @@ -70,7 +70,7 @@ public static Builder newParametricSVGNodeStyle() { @Override public String toString() { - String pattern = "{0} '{'backgroundcolor: {1}', border: '{' size: {2}, radius: {3}, color: {4}, style: {5} '}', svg: {6}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'backgroundcolor: {1}', border: '{' size: {2}, radius: {3}, color: {4}, style: {5} '}', svg: {6}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.backgroundColor, this.borderSize, this.borderRadius, this.borderColor, this.borderStyle, this.svgURL); } @@ -83,9 +83,9 @@ public String toString() { public static final class Builder { private String svgURL; - private String backgroundColor = "white"; //$NON-NLS-1$ + private String backgroundColor = "white"; - private String borderColor = "black"; //$NON-NLS-1$ + private String borderColor = "black"; private int borderSize; diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/ParametricSVGNodeType.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/ParametricSVGNodeType.java index 9c500729e7..a0d81bd5ca 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/ParametricSVGNodeType.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/ParametricSVGNodeType.java @@ -18,7 +18,7 @@ * @author lfasani */ public final class ParametricSVGNodeType { - public static final String NODE_TYPE_PARAMETRIC_IMAGE = "node:parametric-svg"; //$NON-NLS-1$ + public static final String NODE_TYPE_PARAMETRIC_IMAGE = "node:parametric-svg"; private ParametricSVGNodeType() { // Prevent instantiation diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Position.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Position.java index 9a4da6a548..30985c3420 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Position.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Position.java @@ -68,7 +68,7 @@ public int hashCode() { @Override public String toString() { - String pattern = "{0} '{'x: {1}, y: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'x: {1}, y: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.x, this.y); } diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Ratio.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Ratio.java index 048e24508b..be4d7cba54 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Ratio.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Ratio.java @@ -68,7 +68,7 @@ public int hashCode() { @Override public String toString() { - String pattern = "{0} '{'x: {1}, y: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'x: {1}, y: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.x, this.y); } diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/RectangularNodeStyle.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/RectangularNodeStyle.java index 3b5db28d76..d8649d8c2d 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/RectangularNodeStyle.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/RectangularNodeStyle.java @@ -70,7 +70,7 @@ public static Builder newRectangularNodeStyle() { @Override public String toString() { - String pattern = "{0} '{'color: {1}, with header: {2}, border: '{' color: {3}, size: {4}, radius: {5}, style: {6} '}''}'"; //$NON-NLS-1$ + String pattern = "{0} '{'color: {1}, with header: {2}, border: '{' color: {3}, size: {4}, radius: {5}, style: {6} '}''}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.color, this.withHeader, this.borderColor, this.borderSize, this.borderRadius, this.borderStyle); } diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Size.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Size.java index 04bed2ded6..36c58df571 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Size.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/Size.java @@ -68,7 +68,7 @@ public static Builder newSize() { @Override public String toString() { - String pattern = "{0} '{'width: {1}, height: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'width: {1}, height: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.width, this.height); } diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/TextBoundsProvider.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/TextBoundsProvider.java index c9111deb2d..458195cd20 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/TextBoundsProvider.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/TextBoundsProvider.java @@ -28,9 +28,9 @@ public class TextBoundsProvider { /** * Font used in backend & frontend to compute and draw diagram labels. */ - private static final String DEFAULT_LABEL_FONT_NAME = "Arial"; //$NON-NLS-1$ + private static final String DEFAULT_LABEL_FONT_NAME = "Arial"; - private static final String FALLBACK_LABEL_FONT_NAME = "Liberation Sans"; //$NON-NLS-1$ + private static final String FALLBACK_LABEL_FONT_NAME = "Liberation Sans"; private static final AffineTransform AFFINE_TRANSFORM = new AffineTransform(); @@ -53,10 +53,10 @@ public class TextBoundsProvider { public TextBounds computeBounds(LabelStyle labelStyle, String text) { Font font = this.getFont(labelStyle); - String[] lines = text.split("\\n", -1); //$NON-NLS-1$ + String[] lines = text.split("\\n", -1); Rectangle2D labelBounds = null; if (lines.length == 0) { - labelBounds = font.getStringBounds("", FONT_RENDER_CONTEXT); //$NON-NLS-1$ + labelBounds = font.getStringBounds("", FONT_RENDER_CONTEXT); } else { labelBounds = font.getStringBounds(lines[0], FONT_RENDER_CONTEXT); if (lines.length > 1) { diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/ViewCreationRequest.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/ViewCreationRequest.java index 76657da0fd..ed5b292cfc 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/ViewCreationRequest.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/ViewCreationRequest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -69,7 +69,7 @@ public static Builder newViewCreationRequest() { @Override public String toString() { - String pattern = "{0} '{'parentElementId: {1}, descriptionId: {2}, targetObjectId: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'parentElementId: {1}, descriptionId: {2}, targetObjectId: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.parentElementId, this.descriptionId, this.targetObjectId); } diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/ViewDeletionRequest.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/ViewDeletionRequest.java index 6c40fa2e38..dfcd5888d7 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/ViewDeletionRequest.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/ViewDeletionRequest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -41,7 +41,7 @@ public static Builder newViewDeletionRequest() { @Override public String toString() { - String pattern = "{0} '{'elementId: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'elementId: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.elementId); } diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/components/EdgeComponent.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/components/EdgeComponent.java index c268d07ac9..d86d5096d2 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/components/EdgeComponent.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/components/EdgeComponent.java @@ -59,7 +59,7 @@ */ public class EdgeComponent implements IComponent { - private static final String INVALID_NODE_ID = "INVALID_NODE_ID"; //$NON-NLS-1$ + private static final String INVALID_NODE_ID = "INVALID_NODE_ID"; private final EdgeComponentProps props; @@ -165,7 +165,7 @@ private List renderEdge(VariableManager variableManager, EdgeDescriptio // @formatter:off String edgeType = optionalPreviousEdge .map(Edge::getType) - .orElse("edge:straight"); //$NON-NLS-1$ + .orElse("edge:straight"); List routingPoints = optionalPreviousEdge.map(Edge::getRoutingPoints).orElse(List.of()); List labelChildren = this.getLabelsChildren(edgeDescription, edgeInstanceVariableManager, optionalPreviousEdge, id, routingPoints); @@ -449,7 +449,7 @@ private String computeEdgeId(EdgeDescription edgeDescription, Element sourceNode } private String computeEdgeId(String edgeDescriptionId, String sourceId, String targetId, int count) { - String rawIdentifier = edgeDescriptionId + ": " + sourceId + " --> " + targetId + " - " + count; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + String rawIdentifier = edgeDescriptionId + ": " + sourceId + " --> " + targetId + " - " + count; return UUID.nameUUIDFromBytes(rawIdentifier.getBytes()).toString(); } diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/components/LabelType.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/components/LabelType.java index d6cde43d91..934f5bf1f4 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/components/LabelType.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/components/LabelType.java @@ -19,12 +19,12 @@ */ public enum LabelType { - OUTSIDE("label:outside"), //$NON-NLS-1$ - INSIDE_CENTER("label:inside-center"), //$NON-NLS-1$ - OUTSIDE_CENTER("label:outside-center"), //$NON-NLS-1$ - EDGE_BEGIN("label:edge-begin"), //$NON-NLS-1$ - EDGE_CENTER("label:edge-center"), //$NON-NLS-1$ - EDGE_END("label:edge-end"); //$NON-NLS-1$ + OUTSIDE("label:outside"), + INSIDE_CENTER("label:inside-center"), + OUTSIDE_CENTER("label:outside-center"), + EDGE_BEGIN("label:edge-begin"), + EDGE_CENTER("label:edge-center"), + EDGE_END("label:edge-end"); private final String value; diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/components/NodeComponent.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/components/NodeComponent.java index 18cd9eb392..86875b9985 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/components/NodeComponent.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/components/NodeComponent.java @@ -53,7 +53,7 @@ */ public class NodeComponent implements IComponent { - public static final String SEMANTIC_ELEMENT_IDS = "semanticElementIds"; //$NON-NLS-1$ + public static final String SEMANTIC_ELEMENT_IDS = "semanticElementIds"; private NodeComponentProps props; diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/description/DiagramDescription.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/description/DiagramDescription.java index 1d320d890b..9d44549b82 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/description/DiagramDescription.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/description/DiagramDescription.java @@ -36,11 +36,11 @@ public final class DiagramDescription implements IRepresentationDescription { /** * The name of the variable used to store and retrieve the node or edge description id from a variable manager. */ - public static final String DESCRIPTION_ID = "descriptionId"; //$NON-NLS-1$ + public static final String DESCRIPTION_ID = "descriptionId"; - public static final String CACHE = "cache"; //$NON-NLS-1$ + public static final String CACHE = "cache"; - public static final String LABEL = "label"; //$NON-NLS-1$ + public static final String LABEL = "label"; private String id; @@ -121,7 +121,7 @@ public static Builder newDiagramDescription(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, nodeDescriptionCount: {3}, edgeDescriptionCount: {4}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, nodeDescriptionCount: {3}, edgeDescriptionCount: {4}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label, this.nodeDescriptions.size(), this.edgeDescriptions.size()); } diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/description/EdgeDescription.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/description/EdgeDescription.java index f760dafabd..ae987deb7c 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/description/EdgeDescription.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/description/EdgeDescription.java @@ -35,23 +35,23 @@ public final class EdgeDescription { /** * The name of the variables which points to the representation element at the source/origin of a particular edge. */ - public static final String EDGE_SOURCE = "edgeSource"; //$NON-NLS-1$ + public static final String EDGE_SOURCE = "edgeSource"; /** * The name of the variables which points to the representation element at the destination/target of a particular * edge. */ - public static final String EDGE_TARGET = "edgeTarget"; //$NON-NLS-1$ + public static final String EDGE_TARGET = "edgeTarget"; /** * The name of the variables which points to the semantic element at the source/origin of a particular edge. */ - public static final String SEMANTIC_EDGE_SOURCE = "semanticEdgeSource"; //$NON-NLS-1$ + public static final String SEMANTIC_EDGE_SOURCE = "semanticEdgeSource"; /** * The name of the variables which points to the semantic element at the destination/target of a particular edge. */ - public static final String SEMANTIC_EDGE_TARGET = "semanticEdgeTarget"; //$NON-NLS-1$ + public static final String SEMANTIC_EDGE_TARGET = "semanticEdgeTarget"; private UUID id; @@ -159,7 +159,7 @@ public static Builder newEdgeDescription(UUID id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, sourceNodeDescriptionCount: {2}, targetNodeDescriptionCount: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, sourceNodeDescriptionCount: {2}, targetNodeDescriptionCount: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.sourceNodeDescriptions.size(), this.targetNodeDescriptions.size()); } diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/description/LabelDescription.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/description/LabelDescription.java index ba465a55e4..a853e2f95d 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/description/LabelDescription.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/description/LabelDescription.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -30,12 +30,12 @@ public final class LabelDescription { * The name of the variable passed to a label id provider so that the label's own id can include the id of it's * owner/parent diagram element. */ - public static final String OWNER_ID = "ownerId"; //$NON-NLS-1$ + public static final String OWNER_ID = "ownerId"; /** * The suffix used to build a label's id given its owner's. */ - public static final String LABEL_SUFFIX = "_label"; //$NON-NLS-1$ + public static final String LABEL_SUFFIX = "_label"; private String id; @@ -71,7 +71,7 @@ public Function getStyleDescriptionProvi @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/description/NodeDescription.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/description/NodeDescription.java index 76a14e41cb..b12b0120e6 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/description/NodeDescription.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/description/NodeDescription.java @@ -146,7 +146,7 @@ public static Builder newNodeDescription(UUID id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, borderNodeDescriptionCount: {2}, childNodeDescriptionCount: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, borderNodeDescriptionCount: {2}, childNodeDescriptionCount: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.borderNodeDescriptions.size(), this.childNodeDescriptions.size()); } diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/elements/DiagramElementProps.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/elements/DiagramElementProps.java index ef79c17609..cc1f6aff73 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/elements/DiagramElementProps.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/elements/DiagramElementProps.java @@ -29,7 +29,7 @@ */ @Immutable public final class DiagramElementProps implements IProps { - public static final String TYPE = "Diagram"; //$NON-NLS-1$ + public static final String TYPE = "Diagram"; private String id; @@ -84,7 +84,7 @@ public static Builder newDiagramElementProps(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass(), this.id); } diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/elements/EdgeElementProps.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/elements/EdgeElementProps.java index bb4880a131..302ad24734 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/elements/EdgeElementProps.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/elements/EdgeElementProps.java @@ -35,7 +35,7 @@ @Immutable public final class EdgeElementProps implements IProps { - public static final String TYPE = "Edge"; //$NON-NLS-1$ + public static final String TYPE = "Edge"; private String id; @@ -138,7 +138,7 @@ public static Builder newEdgeElementProps(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, targetObjectId: {2}, descriptionId: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, targetObjectId: {2}, descriptionId: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.targetObjectId, this.descriptionId); } diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/elements/LabelElementProps.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/elements/LabelElementProps.java index c75a9eabcc..d03e8f5bca 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/elements/LabelElementProps.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/elements/LabelElementProps.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -29,7 +29,7 @@ @Immutable public final class LabelElementProps implements IProps { - public static final String TYPE = "Label"; //$NON-NLS-1$ + public static final String TYPE = "Label"; private String id; @@ -83,7 +83,7 @@ public static Builder newLabelElementProps(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, type: {2}, text: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, type: {2}, text: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.type, this.text); } diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/elements/NodeElementProps.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/elements/NodeElementProps.java index 1873dd0902..8defecebfe 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/elements/NodeElementProps.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/elements/NodeElementProps.java @@ -36,7 +36,7 @@ @Immutable public final class NodeElementProps implements IProps { - public static final String TYPE = "Node"; //$NON-NLS-1$ + public static final String TYPE = "Node"; private String id; @@ -139,7 +139,7 @@ public List getChildren() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, targetObjectId: {2}, targetObjectKind: {3}, targetObjectLabel: {4}, descriptionId: {5}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, targetObjectId: {2}, targetObjectKind: {3}, targetObjectLabel: {4}, descriptionId: {5}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.targetObjectId, this.targetObjectKind, this.targetObjectLabel, this.descriptionId); } diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/renderer/DiagramElementFactory.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/renderer/DiagramElementFactory.java index 5ee2aea189..3d609db41f 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/renderer/DiagramElementFactory.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/renderer/DiagramElementFactory.java @@ -65,7 +65,7 @@ private Diagram instantiateDiagram(DiagramElementProps props, List child } else if (child instanceof Edge) { edges.add((Edge) child); } else { - this.logger.warn("Unsupported child {}", child); //$NON-NLS-1$ + this.logger.warn("Unsupported child {}", child); } }); diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/tools/EdgeReconnectionTool.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/tools/EdgeReconnectionTool.java index 3cadedc4fc..49681a1da4 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/tools/EdgeReconnectionTool.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/tools/EdgeReconnectionTool.java @@ -62,12 +62,12 @@ public Function getHandler() { @Override public String getImageURL() { - return ""; //$NON-NLS-1$ + return ""; } @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label); } diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/tools/SingleClickOnDiagramElementTool.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/tools/SingleClickOnDiagramElementTool.java index 4539bdf971..358712c422 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/tools/SingleClickOnDiagramElementTool.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/tools/SingleClickOnDiagramElementTool.java @@ -31,7 +31,7 @@ @Immutable public final class SingleClickOnDiagramElementTool implements ITool { - public static final String SELECTED_OBJECT = "selectedObject"; //$NON-NLS-1$ + public static final String SELECTED_OBJECT = "selectedObject"; private String id; @@ -86,7 +86,7 @@ public Function getHandler() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, imageURL: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, imageURL: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label, this.imageURL); } diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/tools/SingleClickOnTwoDiagramElementsCandidate.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/tools/SingleClickOnTwoDiagramElementsCandidate.java index ee4ac87ee8..459f19b2dc 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/tools/SingleClickOnTwoDiagramElementsCandidate.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/tools/SingleClickOnTwoDiagramElementsCandidate.java @@ -45,7 +45,7 @@ public List getTargets() { @Override public String toString() { - String pattern = "{0} "; //$NON-NLS-1$ + String pattern = "{0} "; return MessageFormat.format(pattern, this.getClass().getSimpleName()); } diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/tools/SingleClickOnTwoDiagramElementsTool.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/tools/SingleClickOnTwoDiagramElementsTool.java index 99db72feaf..4c9934013d 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/tools/SingleClickOnTwoDiagramElementsTool.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/tools/SingleClickOnTwoDiagramElementsTool.java @@ -69,7 +69,7 @@ public Function getHandler() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, imageURL: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, imageURL: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label, this.imageURL); } diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/tools/ToolSection.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/tools/ToolSection.java index a9df41f8a7..9bbcfc5872 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/tools/ToolSection.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/tools/ToolSection.java @@ -64,7 +64,7 @@ public static Builder newToolSection(ToolSection toolSection) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, imageURL: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, imageURL: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label, this.imageURL); } diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/test/java/org/eclipse/sirius/components/diagrams/architecture/ArchitectureConstants.java b/packages/diagrams/backend/sirius-components-diagrams/src/test/java/org/eclipse/sirius/components/diagrams/architecture/ArchitectureConstants.java index 598fdc3055..a585aaa313 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/test/java/org/eclipse/sirius/components/diagrams/architecture/ArchitectureConstants.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/test/java/org/eclipse/sirius/components/diagrams/architecture/ArchitectureConstants.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -22,7 +22,7 @@ * @author sbegaudeau */ public final class ArchitectureConstants { - public static final String SIRIUS_COMPONENTS_DIAGRAMS_ROOT_PACKAGE = "org.eclipse.sirius.components.diagrams.."; //$NON-NLS-1$ + public static final String SIRIUS_COMPONENTS_DIAGRAMS_ROOT_PACKAGE = "org.eclipse.sirius.components.diagrams.."; // @formatter:off public static final JavaClasses CLASSES = new ClassFileImporter() diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/test/java/org/eclipse/sirius/components/diagrams/renderer/DiagramElementChangeVisibilityTests.java b/packages/diagrams/backend/sirius-components-diagrams/src/test/java/org/eclipse/sirius/components/diagrams/renderer/DiagramElementChangeVisibilityTests.java index c299333858..994c119c61 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/test/java/org/eclipse/sirius/components/diagrams/renderer/DiagramElementChangeVisibilityTests.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/test/java/org/eclipse/sirius/components/diagrams/renderer/DiagramElementChangeVisibilityTests.java @@ -58,28 +58,28 @@ */ public class DiagramElementChangeVisibilityTests { - private static final String LABEL_TEXT = "Node"; //$NON-NLS-1$ + private static final String LABEL_TEXT = "Node"; - private static final String LABEL_ID = "labelId"; //$NON-NLS-1$ + private static final String LABEL_ID = "labelId"; private static final int LABEL_FONT_SIZE = 40; - private static final String COLOR = "#AFAFAF"; //$NON-NLS-1$ + private static final String COLOR = "#AFAFAF"; - private static final String NODE_IMAGE = "node:image"; //$NON-NLS-1$ + private static final String NODE_IMAGE = "node:image"; - private static final String DIAGRAM_LABEL = "Diagram"; //$NON-NLS-1$ + private static final String DIAGRAM_LABEL = "Diagram"; private static final Function TYPE_PROVIDER = variableManager -> NODE_IMAGE; private static final Function SIZE_PROVIDER = VariableManager -> Size.UNDEFINED; - private static final List OBJECT_IDS = List.of("First", "Second", "Third", "Fourth"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + private static final List OBJECT_IDS = List.of("First", "Second", "Third", "Fourth"); private static final Function STYLE_PROVIDER = variableManager -> { // @formatter:off return ImageNodeStyle.newImageNodeStyle() - .imageURL("test") //$NON-NLS-1$ + .imageURL("test") .scalingFactor(1) .build(); // @formatter:on @@ -102,7 +102,7 @@ private NodeDescription createNodeDescription(String elementId, List targetObjectIdProvider = variableManager -> { Object object = variableManager.getVariables().get(VariableManager.SELF); if (object instanceof String) { - return id.toString() + "__" + object; //$NON-NLS-1$ + return id.toString() + "__" + object; } return null; }; @@ -115,7 +115,7 @@ private NodeDescription createNodeDescription(String elementId, List true) .colorProvider(VariableManager -> COLOR) .fontSizeProvider(variableManager -> LABEL_FONT_SIZE) - .iconURLProvider(VariableManager -> "") //$NON-NLS-1$ + .iconURLProvider(VariableManager -> "") .build(); LabelDescription labelDescription = LabelDescription.newLabelDescription(UUID.randomUUID().toString()) @@ -128,8 +128,8 @@ private NodeDescription createNodeDescription(String elementId, List List.of(elementId)) .targetObjectIdProvider(targetObjectIdProvider) - .targetObjectKindProvider(variableManager -> "") //$NON-NLS-1$ - .targetObjectLabelProvider(variableManager -> "")//$NON-NLS-1$ + .targetObjectKindProvider(variableManager -> "") + .targetObjectLabelProvider(variableManager -> "") .labelDescription(labelDescription).styleProvider(STYLE_PROVIDER) .childrenLayoutStrategyProvider(variableManager -> new FreeFormLayoutStrategy()) .sizeProvider(SIZE_PROVIDER) @@ -175,7 +175,7 @@ private EdgeDescription createEdgeDescription(NodeDescription sourceDescription, .targetObjectKindProvider(TYPE_PROVIDER) .sourceNodesProvider(sourceNodesProvider) .targetNodesProvider(targetNodesProvider) - .targetObjectLabelProvider(variableManager -> "") //$NON-NLS-1$ + .targetObjectLabelProvider(variableManager -> "") .semanticElementsProvider(variableManager -> List.of(new Object())) .labelEditHandler((variableManager, newLabel) -> new Success()) .deleteHandler(variableManager -> new Success()) @@ -187,15 +187,15 @@ private EdgeDescription createEdgeDescription(NodeDescription sourceDescription, private Diagram createDiagram(Optional previousDiagram, List nodeDescriptions, List edgeDescriptions) { // @formatter:off DiagramDescription diagramDescription = DiagramDescription.newDiagramDescription(UUID.randomUUID().toString()) - .label("") //$NON-NLS-1$ + .label("") .canCreatePredicate(variableManager -> true) - .targetObjectIdProvider(variableManager -> "diagramTargetObjectId") //$NON-NLS-1$ + .targetObjectIdProvider(variableManager -> "diagramTargetObjectId") .labelProvider(variableManager -> DIAGRAM_LABEL) .nodeDescriptions(nodeDescriptions) .edgeDescriptions(edgeDescriptions) .toolSections(List.of()) .tools(List.of()) - .dropHandler(variableManager -> new Failure("")) //$NON-NLS-1$ + .dropHandler(variableManager -> new Failure("")) .build(); VariableManager variableManager = new VariableManager(); diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/test/java/org/eclipse/sirius/components/diagrams/renderer/DiagramRendererEdgeTests.java b/packages/diagrams/backend/sirius-components-diagrams/src/test/java/org/eclipse/sirius/components/diagrams/renderer/DiagramRendererEdgeTests.java index 8476192607..34d3a552db 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/test/java/org/eclipse/sirius/components/diagrams/renderer/DiagramRendererEdgeTests.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/test/java/org/eclipse/sirius/components/diagrams/renderer/DiagramRendererEdgeTests.java @@ -63,9 +63,9 @@ public class DiagramRendererEdgeTests { private static final UUID NODE_DESCRIPTION_ID2 = UUID.randomUUID(); - private static final String FIRST_OBJECT_ID = "First"; //$NON-NLS-1$ + private static final String FIRST_OBJECT_ID = "First"; - private static final String SECOND_OBJECT_ID = "Second"; //$NON-NLS-1$ + private static final String SECOND_OBJECT_ID = "Second"; /** * Creates a diagram with two nodes "First" and "Second" and with an edge between the two nodes. @@ -138,15 +138,15 @@ public void testNoDuplicateEdgeId() { private Diagram renderDiagram(List nodeDescriptions, List edgeDescriptions) { // @formatter:off DiagramDescription diagramDescription = DiagramDescription.newDiagramDescription(DIAGRAM_DESCRIPTION_ID) - .label("") //$NON-NLS-1$ + .label("") .canCreatePredicate(variableManager -> true) - .targetObjectIdProvider(variableManager -> "diagramTargetObjectId") //$NON-NLS-1$ - .labelProvider(variableManager -> "Diagram") //$NON-NLS-1$ + .targetObjectIdProvider(variableManager -> "diagramTargetObjectId") + .labelProvider(variableManager -> "Diagram") .nodeDescriptions(nodeDescriptions) .edgeDescriptions(edgeDescriptions) .toolSections(List.of()) .tools(List.of()) - .dropHandler(variableManager -> new Failure("")) //$NON-NLS-1$ + .dropHandler(variableManager -> new Failure("")) .build(); // @formatter:on @@ -169,25 +169,25 @@ private Diagram renderDiagram(List nodeDescriptions, List "#000000") //$NON-NLS-1$ + .colorProvider(variableManager -> "#000000") .fontSizeProvider(variableManager -> 16) .boldProvider(variableManager -> false) .italicProvider(variableManager -> false) .underlineProvider(variableManager -> false) .strikeThroughProvider(variableManager -> false) - .iconURLProvider(variableManager -> "") //$NON-NLS-1$ + .iconURLProvider(variableManager -> "") .build(); - LabelDescription labelDescription = LabelDescription.newLabelDescription("labelDescriptionId") //$NON-NLS-1$ - .idProvider(variableManager -> "labelId") //$NON-NLS-1$ - .textProvider(variableManager -> "Node") //$NON-NLS-1$ + LabelDescription labelDescription = LabelDescription.newLabelDescription("labelDescriptionId") + .idProvider(variableManager -> "labelId") + .textProvider(variableManager -> "Node") .styleDescriptionProvider(variableManager -> labelStyleDescription) .build(); Function nodeStyleProvider = variableManager -> { return RectangularNodeStyle.newRectangularNodeStyle() - .color("") //$NON-NLS-1$ - .borderColor("") //$NON-NLS-1$ + .color("") + .borderColor("") .borderSize(0) .borderStyle(LineStyle.Solid) .build(); @@ -196,17 +196,17 @@ private NodeDescription getNodeDescription(UUID nodeDescriptionId) { Function targetObjectIdProvider = variableManager -> { Object object = variableManager.getVariables().get(VariableManager.SELF); if (object instanceof String) { - return nodeDescriptionId + "__" + object; //$NON-NLS-1$ + return nodeDescriptionId + "__" + object; } return null; }; return NodeDescription.newNodeDescription(nodeDescriptionId) - .typeProvider(variableManager -> "") //$NON-NLS-1$ + .typeProvider(variableManager -> "") .semanticElementsProvider(variableManager -> List.of(FIRST_OBJECT_ID, SECOND_OBJECT_ID)) .targetObjectIdProvider(targetObjectIdProvider) - .targetObjectKindProvider(variableManager -> "") //$NON-NLS-1$ - .targetObjectLabelProvider(variableManager -> "")//$NON-NLS-1$ + .targetObjectKindProvider(variableManager -> "") + .targetObjectLabelProvider(variableManager -> "") .labelDescription(labelDescription) .styleProvider(nodeStyleProvider) .childrenLayoutStrategyProvider(variableManager -> new FreeFormLayoutStrategy()) @@ -251,7 +251,7 @@ private EdgeDescription getEdgeDescription(NodeDescription nodeDescription, UUID .lineStyle(LineStyle.Dash_Dot) .sourceArrow(ArrowStyle.InputArrowWithDiamond) .targetArrow(ArrowStyle.None) - .color("rgb(1, 2, 3)") //$NON-NLS-1$ + .color("rgb(1, 2, 3)") .build(); }; @@ -266,11 +266,11 @@ private EdgeDescription getEdgeDescription(NodeDescription nodeDescription, UUID .sourceNodeDescriptions(List.of(nodeDescription)) .targetNodeDescriptions(List.of(nodeDescription)) .targetObjectIdProvider(idProvider) - .targetObjectKindProvider(variableManager -> "") //$NON-NLS-1$ - .targetObjectLabelProvider(variableManager -> "")//$NON-NLS-1$ + .targetObjectKindProvider(variableManager -> "") + .targetObjectLabelProvider(variableManager -> "") .styleProvider(edgeStyleProvider) - .deleteHandler(variableManager -> new Failure("")) //$NON-NLS-1$ - .labelEditHandler((variableManager, newLabel) -> new Failure("")) //$NON-NLS-1$ + .deleteHandler(variableManager -> new Failure("")) + .labelEditHandler((variableManager, newLabel) -> new Failure("")) .build(); // @formatter:on } diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/test/java/org/eclipse/sirius/components/diagrams/renderer/DiagramRendererNodeTests.java b/packages/diagrams/backend/sirius-components-diagrams/src/test/java/org/eclipse/sirius/components/diagrams/renderer/DiagramRendererNodeTests.java index 5e84df4d09..f2ad32c668 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/test/java/org/eclipse/sirius/components/diagrams/renderer/DiagramRendererNodeTests.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/test/java/org/eclipse/sirius/components/diagrams/renderer/DiagramRendererNodeTests.java @@ -53,19 +53,19 @@ public class DiagramRendererNodeTests { private static final UUID NODE_DESCRIPTION_ID = UUID.randomUUID(); - private static final String LABEL_TEXT = "Node"; //$NON-NLS-1$ + private static final String LABEL_TEXT = "Node"; - private static final String LABEL_ID = "labelId"; //$NON-NLS-1$ + private static final String LABEL_ID = "labelId"; private static final int LABEL_FONT_SIZE = 40; - private static final String LABEL_COLOR = "#AFAFAF"; //$NON-NLS-1$ + private static final String LABEL_COLOR = "#AFAFAF"; - private static final String NODE_RECTANGULAR = "node:rectangular"; //$NON-NLS-1$ + private static final String NODE_RECTANGULAR = "node:rectangular"; - private static final String NODE_IMAGE = "node:image"; //$NON-NLS-1$ + private static final String NODE_IMAGE = "node:image"; - private static final String DIAGRAM_LABEL = "Diagram"; //$NON-NLS-1$ + private static final String DIAGRAM_LABEL = "Diagram"; /** * Creates a diagram with a single node. @@ -75,8 +75,8 @@ public void testSimpleNodeRendering() { Function styleProvider = variableManager -> { // @formatter:off return RectangularNodeStyle.newRectangularNodeStyle() - .color("") //$NON-NLS-1$ - .borderColor("") //$NON-NLS-1$ + .color("") + .borderColor("") .borderSize(0) .borderStyle(LineStyle.Solid) .build(); @@ -112,8 +112,8 @@ public void testSimpleNodeRenderingWithSizeProvider() { Function styleProvider = variableManager -> { // @formatter:off return RectangularNodeStyle.newRectangularNodeStyle() - .color("") //$NON-NLS-1$ - .borderColor("") //$NON-NLS-1$ + .color("") + .borderColor("") .borderSize(0) .borderStyle(LineStyle.Solid) .build(); @@ -149,8 +149,8 @@ public void testSimpleNodeRenderingWithSizeProviderWithPreviousDiagram() { Function styleProvider = variableManager -> { // @formatter:off return RectangularNodeStyle.newRectangularNodeStyle() - .color("") //$NON-NLS-1$ - .borderColor("") //$NON-NLS-1$ + .color("") + .borderColor("") .borderSize(0) .borderStyle(LineStyle.Solid) .build(); @@ -202,7 +202,7 @@ public void testImageNodeRendering() { Function styleProvider = variableManager -> { // @formatter:off return ImageNodeStyle.newImageNodeStyle() - .imageURL("test") //$NON-NLS-1$ + .imageURL("test") .scalingFactor(1) .build(); // @formatter:on @@ -245,10 +245,10 @@ private Diagram createDiagram(Function styleProvide .strikeThroughProvider(VariableManager -> true) .colorProvider(VariableManager -> LABEL_COLOR) .fontSizeProvider(variableManager -> LABEL_FONT_SIZE) - .iconURLProvider(VariableManager -> "") //$NON-NLS-1$ + .iconURLProvider(VariableManager -> "") .build(); - LabelDescription labelDescription = LabelDescription.newLabelDescription("labelDescriptionId") //$NON-NLS-1$ + LabelDescription labelDescription = LabelDescription.newLabelDescription("labelDescriptionId") .idProvider(variableManager -> LABEL_ID) .textProvider(variableManager -> LABEL_TEXT) .styleDescriptionProvider(variableManager -> labelStyleDescription) @@ -257,9 +257,9 @@ private Diagram createDiagram(Function styleProvide NodeDescription nodeDescription = NodeDescription.newNodeDescription(NODE_DESCRIPTION_ID) .typeProvider(typeProvider) .semanticElementsProvider(variableManager -> List.of(new Object())) - .targetObjectIdProvider(variableManager -> "targetObjectId") //$NON-NLS-1$ - .targetObjectKindProvider(variableManager -> "") //$NON-NLS-1$ - .targetObjectLabelProvider(variableManager -> "")//$NON-NLS-1$ + .targetObjectIdProvider(variableManager -> "targetObjectId") + .targetObjectKindProvider(variableManager -> "") + .targetObjectLabelProvider(variableManager -> "") .labelDescription(labelDescription) .styleProvider(styleProvider) .childrenLayoutStrategyProvider(variableManager -> new FreeFormLayoutStrategy()) @@ -271,15 +271,15 @@ private Diagram createDiagram(Function styleProvide .build(); DiagramDescription diagramDescription = DiagramDescription.newDiagramDescription(UUID.randomUUID().toString()) - .label("") //$NON-NLS-1$ + .label("") .canCreatePredicate(variableManager -> true) - .targetObjectIdProvider(variableManager -> "diagramTargetObjectId") //$NON-NLS-1$ + .targetObjectIdProvider(variableManager -> "diagramTargetObjectId") .labelProvider(variableManager -> DIAGRAM_LABEL) .nodeDescriptions(List.of(nodeDescription)) .edgeDescriptions(new ArrayList<>()) .toolSections(List.of()) .tools(List.of()) - .dropHandler(variableManager -> new Failure("")) //$NON-NLS-1$ + .dropHandler(variableManager -> new Failure("")) .build(); // @formatter:on diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/test/java/org/eclipse/sirius/components/diagrams/renderer/UnsynchronizedDiagramTests.java b/packages/diagrams/backend/sirius-components-diagrams/src/test/java/org/eclipse/sirius/components/diagrams/renderer/UnsynchronizedDiagramTests.java index 0de14b0b21..0bcb48a836 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/test/java/org/eclipse/sirius/components/diagrams/renderer/UnsynchronizedDiagramTests.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/test/java/org/eclipse/sirius/components/diagrams/renderer/UnsynchronizedDiagramTests.java @@ -50,9 +50,9 @@ */ public class UnsynchronizedDiagramTests { - private static final String NODE_TYPE = "node:rectangular"; //$NON-NLS-1$ + private static final String NODE_TYPE = "node:rectangular"; - private static final String TARGET_OBJECT_ID = "targetObjectId"; //$NON-NLS-1$ + private static final String TARGET_OBJECT_ID = "targetObjectId"; /** * This very simple test will validate that we can render synchronized diagram elements. We will use a diagram @@ -272,21 +272,21 @@ private DiagramDescription getDiagramDescription(Function true) .underlineProvider(VariableManager -> true) .strikeThroughProvider(VariableManager -> true) - .colorProvider(VariableManager -> "#FFFFFF") //$NON-NLS-1$ + .colorProvider(VariableManager -> "#FFFFFF") .fontSizeProvider(variableManager -> 10) - .iconURLProvider(VariableManager -> "") //$NON-NLS-1$ + .iconURLProvider(VariableManager -> "") .build(); - LabelDescription labelDescription = LabelDescription.newLabelDescription("labelDescriptionId") //$NON-NLS-1$ - .idProvider(variableManager -> "labelid") //$NON-NLS-1$ - .textProvider(variableManager -> "label") //$NON-NLS-1$ + LabelDescription labelDescription = LabelDescription.newLabelDescription("labelDescriptionId") + .idProvider(variableManager -> "labelid") + .textProvider(variableManager -> "label") .styleDescriptionProvider(variableManager -> labelStyleDescription) .build(); Function styleProvider = variableManager -> { return RectangularNodeStyle.newRectangularNodeStyle() - .color("") //$NON-NLS-1$ - .borderColor("") //$NON-NLS-1$ + .color("") + .borderColor("") .borderSize(0) .borderStyle(LineStyle.Solid) .build(); @@ -296,13 +296,13 @@ private DiagramDescription getDiagramDescription(Function NODE_TYPE) .semanticElementsProvider(semanticElementsProvider) .targetObjectIdProvider(variableManager -> TARGET_OBJECT_ID) - .targetObjectKindProvider(variableManager -> "") //$NON-NLS-1$ - .targetObjectLabelProvider(variableManager -> "")//$NON-NLS-1$ + .targetObjectKindProvider(variableManager -> "") + .targetObjectLabelProvider(variableManager -> "") .labelDescription(labelDescription) .styleProvider(styleProvider) .childrenLayoutStrategyProvider(childrenLayoutStrategyProvider) @@ -312,13 +312,13 @@ private DiagramDescription getDiagramDescription(Function new Success()) .deleteHandler(variableManager -> new Success()) .build(); - NodeDescription unsynchronizedNodeDescription = NodeDescription.newNodeDescription(UUID.nameUUIDFromBytes("unsynchronized".getBytes())) //$NON-NLS-1$ + NodeDescription unsynchronizedNodeDescription = NodeDescription.newNodeDescription(UUID.nameUUIDFromBytes("unsynchronized".getBytes())) .synchronizationPolicy(SynchronizationPolicy.UNSYNCHRONIZED) .typeProvider(variableManager -> NODE_TYPE) .semanticElementsProvider(semanticElementsProvider) .targetObjectIdProvider(variableManager -> TARGET_OBJECT_ID) - .targetObjectKindProvider(variableManager -> "") //$NON-NLS-1$ - .targetObjectLabelProvider(variableManager -> "")//$NON-NLS-1$ + .targetObjectKindProvider(variableManager -> "") + .targetObjectLabelProvider(variableManager -> "") .labelDescription(labelDescription) .styleProvider(styleProvider) .childrenLayoutStrategyProvider(childrenLayoutStrategyProvider) @@ -329,13 +329,13 @@ private DiagramDescription getDiagramDescription(Function new Success()) .build(); - NodeDescription synchronizedNodeDescription = NodeDescription.newNodeDescription(UUID.nameUUIDFromBytes("synchronized".getBytes())) //$NON-NLS-1$ + NodeDescription synchronizedNodeDescription = NodeDescription.newNodeDescription(UUID.nameUUIDFromBytes("synchronized".getBytes())) .synchronizationPolicy(SynchronizationPolicy.SYNCHRONIZED) .typeProvider(variableManager -> NODE_TYPE) .semanticElementsProvider(variableManager -> List.of(new Object())) .targetObjectIdProvider(variableManager -> TARGET_OBJECT_ID) - .targetObjectKindProvider(variableManager -> "") //$NON-NLS-1$ - .targetObjectLabelProvider(variableManager -> "")//$NON-NLS-1$ + .targetObjectKindProvider(variableManager -> "") + .targetObjectLabelProvider(variableManager -> "") .labelDescription(labelDescription) .styleProvider(styleProvider) .childrenLayoutStrategyProvider(childrenLayoutStrategyProvider) @@ -346,16 +346,16 @@ private DiagramDescription getDiagramDescription(Function new Success()) .build(); - DiagramDescription diagramDescription = DiagramDescription.newDiagramDescription(UUID.nameUUIDFromBytes("diagram".getBytes()).toString()) //$NON-NLS-1$ - .label("") //$NON-NLS-1$ + DiagramDescription diagramDescription = DiagramDescription.newDiagramDescription(UUID.nameUUIDFromBytes("diagram".getBytes()).toString()) + .label("") .canCreatePredicate(variableManager -> true) - .targetObjectIdProvider(variableManager -> "diagramTargetObjectId") //$NON-NLS-1$ - .labelProvider(variableManager -> "label") //$NON-NLS-1$ + .targetObjectIdProvider(variableManager -> "diagramTargetObjectId") + .labelProvider(variableManager -> "label") .nodeDescriptions(List.of(unsynchronizedNodeDescription, synchronizedNodeDescription)) .edgeDescriptions(List.of()) .toolSections(List.of()) .tools(List.of()) - .dropHandler(variableManager -> new Failure("")) //$NON-NLS-1$ + .dropHandler(variableManager -> new Failure("")) .build(); // @formatter:on diff --git a/packages/domain/backend/sirius-components-domain-design/src/main/java/org/eclipse/sirius/components/domain/design/services/DomainServices.java b/packages/domain/backend/sirius-components-domain-design/src/main/java/org/eclipse/sirius/components/domain/design/services/DomainServices.java index 6c9800472f..01bcdf6947 100644 --- a/packages/domain/backend/sirius-components-domain-design/src/main/java/org/eclipse/sirius/components/domain/design/services/DomainServices.java +++ b/packages/domain/backend/sirius-components-domain-design/src/main/java/org/eclipse/sirius/components/domain/design/services/DomainServices.java @@ -30,16 +30,16 @@ public String renderAttribute(Attribute attr) { } public Attribute editAttribute(Attribute attr, String newLabel) { - if ("0".equals(newLabel.trim())) { //$NON-NLS-1$ + if ("0".equals(newLabel.trim())) { attr.setOptional(true); - } else if ("1".equals(newLabel.trim())) { //$NON-NLS-1$ + } else if ("1".equals(newLabel.trim())) { attr.setOptional(false); - } else if ("11".equals(newLabel.trim())) { //$NON-NLS-1$ + } else if ("11".equals(newLabel.trim())) { attr.setOptional(false); attr.setMany(false); - } else if ("*".equals(newLabel.trim())) { //$NON-NLS-1$ + } else if ("*".equals(newLabel.trim())) { attr.setMany(true); - } else if ("-1".equals(newLabel.trim())) { //$NON-NLS-1$ + } else if ("-1".equals(newLabel.trim())) { attr.setMany(true); } else { int typeStart = newLabel.indexOf(':'); @@ -56,7 +56,7 @@ public Attribute editAttribute(Attribute attr, String newLabel) { } if (setType) { - String typePart = newLabel.substring(typeStart + ":".length(), newLabel.length()).trim(); //$NON-NLS-1$ + String typePart = newLabel.substring(typeStart + ":".length(), newLabel.length()).trim(); if (typePart != null) { DataType newType = DataType.getByName(typePart.toUpperCase()); if (newType != null) { @@ -76,19 +76,19 @@ public String renderRelation(Relation rel) { private void appendCardinality(Feature feature, StringBuilder sb) { if (feature.isOptional() || feature.isMany()) { - sb.append(" ["); //$NON-NLS-1$ + sb.append(" ["); if (feature.isOptional()) { - sb.append("0"); //$NON-NLS-1$ + sb.append("0"); } else { - sb.append("1"); //$NON-NLS-1$ + sb.append("1"); } - sb.append(".."); //$NON-NLS-1$ + sb.append(".."); if (feature.isMany()) { - sb.append("*"); //$NON-NLS-1$ + sb.append("*"); } else { - sb.append("1"); //$NON-NLS-1$ + sb.append("1"); } - sb.append("]"); //$NON-NLS-1$ + sb.append("]"); } } diff --git a/packages/domain/backend/sirius-components-domain-edit/src/main/java/org/eclipse/sirius/components/domain/provider/AttributeItemProvider.java b/packages/domain/backend/sirius-components-domain-edit/src/main/java/org/eclipse/sirius/components/domain/provider/AttributeItemProvider.java index 097928ba4a..0bb621ea0d 100644 --- a/packages/domain/backend/sirius-components-domain-edit/src/main/java/org/eclipse/sirius/components/domain/provider/AttributeItemProvider.java +++ b/packages/domain/backend/sirius-components-domain-edit/src/main/java/org/eclipse/sirius/components/domain/provider/AttributeItemProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -25,8 +25,8 @@ import org.eclipse.sirius.components.domain.DomainPackage; /** - * This is the item provider adapter for a {@link org.eclipse.sirius.components.domain.Attribute} object. + * This is the item provider adapter for a {@link org.eclipse.sirius.components.domain.Attribute} object. * * @generated */ @@ -61,10 +61,9 @@ public List getPropertyDescriptors(Object object) { * @generated */ protected void addTypePropertyDescriptor(Object object) { - this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_Attribute_type_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_Attribute_type_feature", "_UI_Attribute_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - DomainPackage.Literals.ATTRIBUTE__TYPE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), + this.getString("_UI_Attribute_type_feature"), this.getString("_UI_PropertyDescriptor_description", "_UI_Attribute_type_feature", "_UI_Attribute_type"), + DomainPackage.Literals.ATTRIBUTE__TYPE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** @@ -79,24 +78,24 @@ public Object getImage(Object object) { Attribute attr = (Attribute) object; switch (attr.getType()) { case BOOLEAN: - imageName = "Boolean"; //$NON-NLS-1$ + imageName = "Boolean"; break; case STRING: - imageName = "String"; //$NON-NLS-1$ + imageName = "String"; break; case NUMBER: - imageName = "Number"; //$NON-NLS-1$ + imageName = "Number"; break; default: - imageName = "Invalid"; //$NON-NLS-1$ + imageName = "Invalid"; break; } if (attr.isMany()) { - imageName = "Many" + imageName; //$NON-NLS-1$ + imageName = "Many" + imageName; } - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/" + imageName + "Attribute.svg")); //$NON-NLS-1$//$NON-NLS-2$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/" + imageName + "Attribute.svg")); } else { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Attribute")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Attribute")); } } @@ -118,8 +117,7 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((Attribute) object).getName(); - return label == null || label.length() == 0 ? this.getString("_UI_Attribute_type") : //$NON-NLS-1$ - this.getString("_UI_Attribute_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_Attribute_type") : this.getString("_UI_Attribute_type") + " " + label; } /** diff --git a/packages/domain/backend/sirius-components-domain-edit/src/main/java/org/eclipse/sirius/components/domain/provider/DomainEditPlugin.java b/packages/domain/backend/sirius-components-domain-edit/src/main/java/org/eclipse/sirius/components/domain/provider/DomainEditPlugin.java index b8fa4b500c..881e5f0535 100644 --- a/packages/domain/backend/sirius-components-domain-edit/src/main/java/org/eclipse/sirius/components/domain/provider/DomainEditPlugin.java +++ b/packages/domain/backend/sirius-components-domain-edit/src/main/java/org/eclipse/sirius/components/domain/provider/DomainEditPlugin.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -71,7 +71,7 @@ public static Implementation getPlugin() { @Override protected Object doGetImage(String key) throws IOException { - URL url = new URL(this.getBaseURL() + "icons/" + key + extensionFor(key)); //$NON-NLS-1$ + URL url = new URL(this.getBaseURL() + "icons/" + key + extensionFor(key)); InputStream inputStream = url.openStream(); inputStream.close(); return url; @@ -85,21 +85,21 @@ protected Object doGetImage(String key) throws IOException { * @return the file extension to be used with the key to specify an image resource. */ protected static String extensionFor(String key) { - String result = ".gif"; //$NON-NLS-1$ + String result = ".gif"; int index = key.lastIndexOf('.'); if (index != -1) { String extension = key.substring(index + 1); // @formatter:off - if ("png".equalsIgnoreCase(extension) || //$NON-NLS-1$ - "gif".equalsIgnoreCase(extension) || //$NON-NLS-1$ - "bmp".equalsIgnoreCase(extension) || //$NON-NLS-1$ - "ico".equalsIgnoreCase(extension) || //$NON-NLS-1$ - "jpg".equalsIgnoreCase(extension) || //$NON-NLS-1$ - "jpeg".equalsIgnoreCase(extension) || //$NON-NLS-1$ - "tif".equalsIgnoreCase(extension) || //$NON-NLS-1$ - "tiff".equalsIgnoreCase(extension) || //$NON-NLS-1$ - "svg".equalsIgnoreCase(extension)) { //$NON-NLS-1$ - result = ""; //$NON-NLS-1$ + if ("png".equalsIgnoreCase(extension) || + "gif".equalsIgnoreCase(extension) || + "bmp".equalsIgnoreCase(extension) || + "ico".equalsIgnoreCase(extension) || + "jpg".equalsIgnoreCase(extension) || + "jpeg".equalsIgnoreCase(extension) || + "tif".equalsIgnoreCase(extension) || + "tiff".equalsIgnoreCase(extension) || + "svg".equalsIgnoreCase(extension)) { + result = ""; } // @formatter:on } diff --git a/packages/domain/backend/sirius-components-domain-edit/src/main/java/org/eclipse/sirius/components/domain/provider/DomainItemProvider.java b/packages/domain/backend/sirius-components-domain-edit/src/main/java/org/eclipse/sirius/components/domain/provider/DomainItemProvider.java index f7758cba48..e3e2210f8b 100644 --- a/packages/domain/backend/sirius-components-domain-edit/src/main/java/org/eclipse/sirius/components/domain/provider/DomainItemProvider.java +++ b/packages/domain/backend/sirius-components-domain-edit/src/main/java/org/eclipse/sirius/components/domain/provider/DomainItemProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -92,7 +92,7 @@ protected EStructuralFeature getChildFeature(Object object, Object child) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Domain.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Domain.svg")); } /** @@ -113,8 +113,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((Domain) object).getName(); - return label == null || label.length() == 0 ? this.getString("_UI_Domain_type") : //$NON-NLS-1$ - this.getString("_UI_Domain_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_Domain_type") : + this.getString("_UI_Domain_type") + " " + label; } /** @@ -147,7 +147,7 @@ protected void collectNewChildDescriptors(Collection newChildDescriptors super.collectNewChildDescriptors(newChildDescriptors, object); Entity newEntity = DomainFactory.eINSTANCE.createEntity(); - newEntity.setName("NewEntity"); //$NON-NLS-1$ + newEntity.setName("NewEntity"); newChildDescriptors.add(this.createChildParameter(DomainPackage.Literals.DOMAIN__TYPES, newEntity)); } diff --git a/packages/domain/backend/sirius-components-domain-edit/src/main/java/org/eclipse/sirius/components/domain/provider/EntityItemProvider.java b/packages/domain/backend/sirius-components-domain-edit/src/main/java/org/eclipse/sirius/components/domain/provider/EntityItemProvider.java index 9667496a0b..6212d934a1 100644 --- a/packages/domain/backend/sirius-components-domain-edit/src/main/java/org/eclipse/sirius/components/domain/provider/EntityItemProvider.java +++ b/packages/domain/backend/sirius-components-domain-edit/src/main/java/org/eclipse/sirius/components/domain/provider/EntityItemProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -68,8 +68,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addSuperTypesPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_Entity_superTypes_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_Entity_superTypes_feature", "_UI_Entity_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_Entity_superTypes_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_Entity_superTypes_feature", "_UI_Entity_type"), DomainPackage.Literals.ENTITY__SUPER_TYPES, true, false, true, null, null, null)); } @@ -80,8 +80,8 @@ protected void addSuperTypesPropertyDescriptor(Object object) { */ protected void addAbstractPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_Entity_abstract_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_Entity_abstract_feature", "_UI_Entity_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_Entity_abstract_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_Entity_abstract_feature", "_UI_Entity_type"), DomainPackage.Literals.ENTITY__ABSTRACT, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -123,7 +123,7 @@ protected EStructuralFeature getChildFeature(Object object, Object child) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Entity.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Entity.svg")); } /** @@ -144,8 +144,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((Entity) object).getName(); - return label == null || label.length() == 0 ? this.getString("_UI_Entity_type") : //$NON-NLS-1$ - this.getString("_UI_Entity_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_Entity_type") : + this.getString("_UI_Entity_type") + " " + label; } /** @@ -182,12 +182,12 @@ protected void collectNewChildDescriptors(Collection newChildDescriptors super.collectNewChildDescriptors(newChildDescriptors, object); Attribute newAttribute = DomainFactory.eINSTANCE.createAttribute(); - newAttribute.setName("newString"); //$NON-NLS-1$ + newAttribute.setName("newString"); newAttribute.setType(DataType.STRING); newChildDescriptors.add(this.createChildParameter(DomainPackage.Literals.ENTITY__ATTRIBUTES, newAttribute)); Relation newRelation = DomainFactory.eINSTANCE.createRelation(); - newRelation.setName("relation"); //$NON-NLS-1$ + newRelation.setName("relation"); newRelation.setMany(true); if (object instanceof Entity) { Entity owner = (Entity) object; diff --git a/packages/domain/backend/sirius-components-domain-edit/src/main/java/org/eclipse/sirius/components/domain/provider/FeatureItemProvider.java b/packages/domain/backend/sirius-components-domain-edit/src/main/java/org/eclipse/sirius/components/domain/provider/FeatureItemProvider.java index 3b54fa6f5d..d9371977eb 100644 --- a/packages/domain/backend/sirius-components-domain-edit/src/main/java/org/eclipse/sirius/components/domain/provider/FeatureItemProvider.java +++ b/packages/domain/backend/sirius-components-domain-edit/src/main/java/org/eclipse/sirius/components/domain/provider/FeatureItemProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -63,8 +63,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addOptionalPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_Feature_optional_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_Feature_optional_feature", "_UI_Feature_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_Feature_optional_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_Feature_optional_feature", "_UI_Feature_type"), DomainPackage.Literals.FEATURE__OPTIONAL, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -75,8 +75,8 @@ protected void addOptionalPropertyDescriptor(Object object) { */ protected void addManyPropertyDescriptor(Object object) { this.itemPropertyDescriptors - .add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_Feature_many_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_Feature_many_feature", "_UI_Feature_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + .add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_Feature_many_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_Feature_many_feature", "_UI_Feature_type"), DomainPackage.Literals.FEATURE__MANY, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -87,7 +87,7 @@ protected void addManyPropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Feature")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Feature")); } /** @@ -108,8 +108,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((Feature) object).getName(); - return label == null || label.length() == 0 ? this.getString("_UI_Feature_type") : //$NON-NLS-1$ - this.getString("_UI_Feature_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_Feature_type") : + this.getString("_UI_Feature_type") + " " + label; } /** diff --git a/packages/domain/backend/sirius-components-domain-edit/src/main/java/org/eclipse/sirius/components/domain/provider/NamedElementItemProvider.java b/packages/domain/backend/sirius-components-domain-edit/src/main/java/org/eclipse/sirius/components/domain/provider/NamedElementItemProvider.java index 682f89f762..bd166b1067 100644 --- a/packages/domain/backend/sirius-components-domain-edit/src/main/java/org/eclipse/sirius/components/domain/provider/NamedElementItemProvider.java +++ b/packages/domain/backend/sirius-components-domain-edit/src/main/java/org/eclipse/sirius/components/domain/provider/NamedElementItemProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -70,8 +70,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addNamePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_NamedElement_name_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_NamedElement_name_feature", "_UI_NamedElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_NamedElement_name_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_NamedElement_name_feature", "_UI_NamedElement_type"), DomainPackage.Literals.NAMED_ELEMENT__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -82,7 +82,7 @@ protected void addNamePropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/NamedElement")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/NamedElement")); } /** @@ -103,8 +103,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((NamedElement) object).getName(); - return label == null || label.length() == 0 ? this.getString("_UI_NamedElement_type") : //$NON-NLS-1$ - this.getString("_UI_NamedElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_NamedElement_type") : + this.getString("_UI_NamedElement_type") + " " + label; } /** diff --git a/packages/domain/backend/sirius-components-domain-edit/src/main/java/org/eclipse/sirius/components/domain/provider/RelationItemProvider.java b/packages/domain/backend/sirius-components-domain-edit/src/main/java/org/eclipse/sirius/components/domain/provider/RelationItemProvider.java index 9ed2979548..34564ca5d3 100644 --- a/packages/domain/backend/sirius-components-domain-edit/src/main/java/org/eclipse/sirius/components/domain/provider/RelationItemProvider.java +++ b/packages/domain/backend/sirius-components-domain-edit/src/main/java/org/eclipse/sirius/components/domain/provider/RelationItemProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -63,8 +63,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addContainmentPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_Relation_containment_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_Relation_containment_feature", "_UI_Relation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_Relation_containment_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_Relation_containment_feature", "_UI_Relation_type"), DomainPackage.Literals.RELATION__CONTAINMENT, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -75,8 +75,8 @@ protected void addContainmentPropertyDescriptor(Object object) { */ protected void addTargetTypePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_Relation_targetType_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_Relation_targetType_feature", "_UI_Relation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_Relation_targetType_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_Relation_targetType_feature", "_UI_Relation_type"), DomainPackage.Literals.RELATION__TARGET_TYPE, true, false, true, null, null, null)); } @@ -87,7 +87,7 @@ protected void addTargetTypePropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Relation.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Relation.svg")); } /** @@ -108,8 +108,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((Relation) object).getName(); - return label == null || label.length() == 0 ? this.getString("_UI_Relation_type") : //$NON-NLS-1$ - this.getString("_UI_Relation_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_Relation_type") : + this.getString("_UI_Relation_type") + " " + label; } /** diff --git a/packages/domain/backend/sirius-components-domain-emf/src/main/java/org/eclipse/sirius/components/domain/emf/DomainConverter.java b/packages/domain/backend/sirius-components-domain-emf/src/main/java/org/eclipse/sirius/components/domain/emf/DomainConverter.java index 69160e83c0..e1c38725e5 100644 --- a/packages/domain/backend/sirius-components-domain-emf/src/main/java/org/eclipse/sirius/components/domain/emf/DomainConverter.java +++ b/packages/domain/backend/sirius-components-domain-emf/src/main/java/org/eclipse/sirius/components/domain/emf/DomainConverter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -40,15 +40,15 @@ */ public class DomainConverter { - public static final String DOMAIN_SCHEME = "domain"; //$NON-NLS-1$ + public static final String DOMAIN_SCHEME = "domain"; public Optional convert(Domain domain) { Optional result = Optional.empty(); EPackage ePackage = EcoreFactory.eINSTANCE.createEPackage(); ePackage.setName(domain.getName()); - ePackage.setNsPrefix(Optional.ofNullable(domain.getName()).orElse("").toLowerCase()); //$NON-NLS-1$ - ePackage.setNsURI(DOMAIN_SCHEME + "://" + domain.getName()); //$NON-NLS-1$ + ePackage.setNsPrefix(Optional.ofNullable(domain.getName()).orElse("").toLowerCase()); + ePackage.setNsURI(DOMAIN_SCHEME + "://" + domain.getName()); Map convertedTypes = new HashMap<>(); // First pass to create the EClasses and EAttributes diff --git a/packages/domain/backend/sirius-components-domain-emf/src/main/java/org/eclipse/sirius/components/domain/emf/DomainValidator.java b/packages/domain/backend/sirius-components-domain-emf/src/main/java/org/eclipse/sirius/components/domain/emf/DomainValidator.java index b42995d862..4e00c0c7d7 100644 --- a/packages/domain/backend/sirius-components-domain-emf/src/main/java/org/eclipse/sirius/components/domain/emf/DomainValidator.java +++ b/packages/domain/backend/sirius-components-domain-emf/src/main/java/org/eclipse/sirius/components/domain/emf/DomainValidator.java @@ -38,13 +38,13 @@ */ public class DomainValidator implements EValidator { - public static final String INVALID_NAME_ERROR_MESSAGE = "The name %1$s is not well-formed."; //$NON-NLS-1$ + public static final String INVALID_NAME_ERROR_MESSAGE = "The name %1$s is not well-formed."; - public static final String ENTITY_DISTINCT_NAME_ERROR_MESSAGE = "Two entities cannot have the same name in the same domain"; //$NON-NLS-1$ + public static final String ENTITY_DISTINCT_NAME_ERROR_MESSAGE = "Two entities cannot have the same name in the same domain"; - public static final String FEATURE_DISTINCT_NAME_ERROR_MESSAGE = "Two features cannot have the same name in the same entity"; //$NON-NLS-1$ + public static final String FEATURE_DISTINCT_NAME_ERROR_MESSAGE = "Two features cannot have the same name in the same entity"; - public static final String SIRIUS_COMPONENTS_EMF_PACKAGE = "org.eclipse.sirius.components.emf"; //$NON-NLS-1$ + public static final String SIRIUS_COMPONENTS_EMF_PACKAGE = "org.eclipse.sirius.components.emf"; @Override public boolean validate(EDataType eDataType, Object value, DiagnosticChain diagnostics, Map context) { diff --git a/packages/domain/backend/sirius-components-domain-emf/src/test/java/org/eclipse/sirius/components/domains/emf/DomainConverterTests.java b/packages/domain/backend/sirius-components-domain-emf/src/test/java/org/eclipse/sirius/components/domains/emf/DomainConverterTests.java index 2f8a171d75..c04bc4d81d 100644 --- a/packages/domain/backend/sirius-components-domain-emf/src/test/java/org/eclipse/sirius/components/domains/emf/DomainConverterTests.java +++ b/packages/domain/backend/sirius-components-domain-emf/src/test/java/org/eclipse/sirius/components/domains/emf/DomainConverterTests.java @@ -39,7 +39,7 @@ */ public class DomainConverterTests { - private static final String FIXTURE = "fixture"; //$NON-NLS-1$ + private static final String FIXTURE = "fixture"; private Optional convert(Domain domain) { return new DomainConverter().convert(domain); @@ -113,13 +113,13 @@ public void testConvertEntityWithValidName(String name) { @Test void testConvertSystemDomainDefinition() { Domain componentDomain = DomainFactory.eINSTANCE.createDomain(); - componentDomain.setName("component"); //$NON-NLS-1$ + componentDomain.setName("component"); Entity namedEntity = DomainFactory.eINSTANCE.createEntity(); - namedEntity.setName("Named"); //$NON-NLS-1$ + namedEntity.setName("Named"); namedEntity.setAbstract(true); Attribute nameAttribute = DomainFactory.eINSTANCE.createAttribute(); - nameAttribute.setName("name"); //$NON-NLS-1$ + nameAttribute.setName("name"); nameAttribute.setMany(false); nameAttribute.setOptional(false); nameAttribute.setType(DataType.STRING); @@ -128,17 +128,17 @@ void testConvertSystemDomainDefinition() { componentDomain.getTypes().add(namedEntity); Entity systemEntity = DomainFactory.eINSTANCE.createEntity(); - systemEntity.setName("System"); //$NON-NLS-1$ + systemEntity.setName("System"); systemEntity.getSuperTypes().add(namedEntity); componentDomain.getTypes().add(systemEntity); Entity componentEntity = DomainFactory.eINSTANCE.createEntity(); - componentEntity.setName("Component"); //$NON-NLS-1$ + componentEntity.setName("Component"); componentEntity.getSuperTypes().add(namedEntity); componentDomain.getTypes().add(componentEntity); Relation systemComponentsRelation = DomainFactory.eINSTANCE.createRelation(); - systemComponentsRelation.setName("parts"); //$NON-NLS-1$ + systemComponentsRelation.setName("parts"); systemComponentsRelation.setContainment(true); systemComponentsRelation.setMany(true); systemComponentsRelation.setOptional(true); diff --git a/packages/domain/backend/sirius-components-domain-emf/src/test/java/org/eclipse/sirius/components/domains/emf/DomainValidatorTests.java b/packages/domain/backend/sirius-components-domain-emf/src/test/java/org/eclipse/sirius/components/domains/emf/DomainValidatorTests.java index 1b30cde3e8..2404924266 100644 --- a/packages/domain/backend/sirius-components-domain-emf/src/test/java/org/eclipse/sirius/components/domains/emf/DomainValidatorTests.java +++ b/packages/domain/backend/sirius-components-domain-emf/src/test/java/org/eclipse/sirius/components/domains/emf/DomainValidatorTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -37,9 +37,9 @@ */ public class DomainValidatorTests { - private static final String FAMILY = "Family"; //$NON-NLS-1$ + private static final String FAMILY = "Family"; - private static final String PERSON = "Person"; //$NON-NLS-1$ + private static final String PERSON = "Person"; @Test public void testDomainShouldBeValid() { @@ -52,7 +52,7 @@ public void testDomainShouldBeValid() { @Test public void testDomainEmptyName() { Domain domain = DomainFactory.eINSTANCE.createDomain(); - domain.setName(""); //$NON-NLS-1$ + domain.setName(""); this.assertNameIsInvalid(domain); } @@ -60,7 +60,7 @@ public void testDomainEmptyName() { @Test public void testDomainNameWithSpaces() { Domain domain = DomainFactory.eINSTANCE.createDomain(); - domain.setName("Sample Family"); //$NON-NLS-1$ + domain.setName("Sample Family"); this.assertNameIsInvalid(domain); } @@ -68,7 +68,7 @@ public void testDomainNameWithSpaces() { @Test public void testDomainNameWithInvalidCharacters() { Domain domain = DomainFactory.eINSTANCE.createDomain(); - domain.setName("Domain.Family"); //$NON-NLS-1$ + domain.setName("Domain.Family"); this.assertNameIsInvalid(domain); } @@ -76,7 +76,7 @@ public void testDomainNameWithInvalidCharacters() { @Test public void testDomainNameWithUnderscore() { Domain domain = DomainFactory.eINSTANCE.createDomain(); - domain.setName("Basic_Family"); //$NON-NLS-1$ + domain.setName("Basic_Family"); this.assertNameIsValid(domain); } @@ -84,7 +84,7 @@ public void testDomainNameWithUnderscore() { @Test public void testEntityEmptyName() { Entity entity = DomainFactory.eINSTANCE.createEntity(); - entity.setName(""); //$NON-NLS-1$ + entity.setName(""); this.assertNameIsInvalid(entity); } @@ -92,7 +92,7 @@ public void testEntityEmptyName() { @Test public void testEntityNameWithSpaces() { Entity entity = DomainFactory.eINSTANCE.createEntity(); - entity.setName("A person"); //$NON-NLS-1$ + entity.setName("A person"); this.assertNameIsInvalid(entity); } @@ -100,7 +100,7 @@ public void testEntityNameWithSpaces() { @Test public void testEntityNameWithInvalidCharacters() { Entity entity = DomainFactory.eINSTANCE.createEntity(); - entity.setName("Grand-parent"); //$NON-NLS-1$ + entity.setName("Grand-parent"); this.assertNameIsInvalid(entity); } @@ -108,7 +108,7 @@ public void testEntityNameWithInvalidCharacters() { @Test public void testEntityNameWithUnderscore() { Entity entity = DomainFactory.eINSTANCE.createEntity(); - entity.setName("Grand_Parent"); //$NON-NLS-1$ + entity.setName("Grand_Parent"); this.assertNameIsValid(entity); } @@ -116,7 +116,7 @@ public void testEntityNameWithUnderscore() { @Test public void testAttributeEmptyName() { Attribute attribute = DomainFactory.eINSTANCE.createAttribute(); - attribute.setName(""); //$NON-NLS-1$ + attribute.setName(""); this.assertNameIsInvalid(attribute); } @@ -124,7 +124,7 @@ public void testAttributeEmptyName() { @Test public void testAttributeNameWithSpaces() { Attribute attribute = DomainFactory.eINSTANCE.createAttribute(); - attribute.setName("an attribute"); //$NON-NLS-1$ + attribute.setName("an attribute"); this.assertNameIsInvalid(attribute); } @@ -132,7 +132,7 @@ public void testAttributeNameWithSpaces() { @Test public void testAttributeNameWithInvalidCharacters() { Attribute attribute = DomainFactory.eINSTANCE.createAttribute(); - attribute.setName("an-attribute"); //$NON-NLS-1$ + attribute.setName("an-attribute"); this.assertNameIsInvalid(attribute); } @@ -140,7 +140,7 @@ public void testAttributeNameWithInvalidCharacters() { @Test public void testAttributeNameWithUnderscore() { Attribute attribute = DomainFactory.eINSTANCE.createAttribute(); - attribute.setName("an_attribute"); //$NON-NLS-1$ + attribute.setName("an_attribute"); this.assertNameIsValid(attribute); } @@ -148,7 +148,7 @@ public void testAttributeNameWithUnderscore() { @Test public void testRelationEmptyName() { Relation relation = DomainFactory.eINSTANCE.createRelation(); - relation.setName(""); //$NON-NLS-1$ + relation.setName(""); this.assertNameIsInvalid(relation); } @@ -156,7 +156,7 @@ public void testRelationEmptyName() { @Test public void testRelationNameWithSpaces() { Relation relation = DomainFactory.eINSTANCE.createRelation(); - relation.setName("a relation"); //$NON-NLS-1$ + relation.setName("a relation"); this.assertNameIsInvalid(relation); } @@ -164,7 +164,7 @@ public void testRelationNameWithSpaces() { @Test public void testRelationNameWithInvalidCharacters() { Relation relation = DomainFactory.eINSTANCE.createRelation(); - relation.setName("some-relation"); //$NON-NLS-1$ + relation.setName("some-relation"); this.assertNameIsInvalid(relation); } @@ -172,7 +172,7 @@ public void testRelationNameWithInvalidCharacters() { @Test public void testRelationNameWithUnderscore() { Relation relation = DomainFactory.eINSTANCE.createRelation(); - relation.setName("some_relation"); //$NON-NLS-1$ + relation.setName("some_relation"); this.assertNameIsValid(relation); } @@ -215,7 +215,7 @@ public void testAttributeNameUniqueAmongEntityAttributes() { Entity entity = DomainFactory.eINSTANCE.createEntity(); entity.setName(PERSON); - String sharedName = "name"; //$NON-NLS-1$ + String sharedName = "name"; Attribute name1 = DomainFactory.eINSTANCE.createAttribute(); name1.setName(sharedName); entity.getAttributes().add(name1); @@ -248,7 +248,7 @@ public void testRelationNameUniqueAmongEntityRelations() { Entity entity = DomainFactory.eINSTANCE.createEntity(); entity.setName(PERSON); - String sharedName = "reference"; //$NON-NLS-1$ + String sharedName = "reference"; Relation rel1 = DomainFactory.eINSTANCE.createRelation(); rel1.setName(sharedName); entity.getRelations().add(rel1); @@ -281,7 +281,7 @@ public void testRelationNameUniqueAmongEntityFeatures() { Entity entity = DomainFactory.eINSTANCE.createEntity(); entity.setName(PERSON); - String sharedName = "reference"; //$NON-NLS-1$ + String sharedName = "reference"; Relation rel = DomainFactory.eINSTANCE.createRelation(); rel.setName(sharedName); entity.getRelations().add(rel); diff --git a/packages/domain/backend/sirius-components-domain-emf/src/test/java/org/eclipse/sirius/components/domains/emf/architecture/ArchitectureConstants.java b/packages/domain/backend/sirius-components-domain-emf/src/test/java/org/eclipse/sirius/components/domains/emf/architecture/ArchitectureConstants.java index e20bf91a4d..60528d10d0 100644 --- a/packages/domain/backend/sirius-components-domain-emf/src/test/java/org/eclipse/sirius/components/domains/emf/architecture/ArchitectureConstants.java +++ b/packages/domain/backend/sirius-components-domain-emf/src/test/java/org/eclipse/sirius/components/domains/emf/architecture/ArchitectureConstants.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -22,7 +22,7 @@ * @author sbegaudeau */ public final class ArchitectureConstants { - public static final String SIRIUS_COMPONENTS_DOMAIN_EMF_ROOT_PACKAGE = "org.eclipse.sirius.components.domain.emf.."; //$NON-NLS-1$ + public static final String SIRIUS_COMPONENTS_DOMAIN_EMF_ROOT_PACKAGE = "org.eclipse.sirius.components.domain.emf.."; // @formatter:off public static final JavaClasses CLASSES = new ClassFileImporter() diff --git a/packages/domain/backend/sirius-components-domain/src/main/java/org/eclipse/sirius/components/domain/DataType.java b/packages/domain/backend/sirius-components-domain/src/main/java/org/eclipse/sirius/components/domain/DataType.java index 69b2e375ad..8f81c2b596 100644 --- a/packages/domain/backend/sirius-components-domain/src/main/java/org/eclipse/sirius/components/domain/DataType.java +++ b/packages/domain/backend/sirius-components-domain/src/main/java/org/eclipse/sirius/components/domain/DataType.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -34,7 +34,7 @@ public enum DataType implements Enumerator { * @generated * @ordered */ - STRING(0, "STRING", "STRING"), //$NON-NLS-1$ //$NON-NLS-2$ + STRING(0, "STRING", "STRING"), /** * The 'BOOLEAN' literal object. @@ -43,7 +43,7 @@ public enum DataType implements Enumerator { * @generated * @ordered */ - BOOLEAN(1, "BOOLEAN", "BOOLEAN"), //$NON-NLS-1$ //$NON-NLS-2$ + BOOLEAN(1, "BOOLEAN", "BOOLEAN"), /** * The 'NUMBER' literal object. @@ -52,7 +52,7 @@ public enum DataType implements Enumerator { * @generated * @ordered */ - NUMBER(2, "NUMBER", "NUMBER"); //$NON-NLS-1$ //$NON-NLS-2$ + NUMBER(2, "NUMBER", "NUMBER"); /** * The 'STRING' literal value. diff --git a/packages/domain/backend/sirius-components-domain/src/main/java/org/eclipse/sirius/components/domain/DomainPackage.java b/packages/domain/backend/sirius-components-domain/src/main/java/org/eclipse/sirius/components/domain/DomainPackage.java index a946618cdc..fd64b41abe 100644 --- a/packages/domain/backend/sirius-components-domain/src/main/java/org/eclipse/sirius/components/domain/DomainPackage.java +++ b/packages/domain/backend/sirius-components-domain/src/main/java/org/eclipse/sirius/components/domain/DomainPackage.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -39,21 +39,21 @@ public interface DomainPackage extends EPackage { * * @generated */ - String eNAME = "domain"; //$NON-NLS-1$ + String eNAME = "domain"; /** * The package namespace URI. * * @generated */ - String eNS_URI = "http://www.eclipse.org/sirius-web/domain"; //$NON-NLS-1$ + String eNS_URI = "http://www.eclipse.org/sirius-web/domain"; /** * The package namespace name. * * @generated */ - String eNS_PREFIX = "domain"; //$NON-NLS-1$ + String eNS_PREFIX = "domain"; /** * The singleton instance of the package. diff --git a/packages/domain/backend/sirius-components-domain/src/main/java/org/eclipse/sirius/components/domain/impl/AttributeImpl.java b/packages/domain/backend/sirius-components-domain/src/main/java/org/eclipse/sirius/components/domain/impl/AttributeImpl.java index dfdc431f32..6f9fb53bc8 100644 --- a/packages/domain/backend/sirius-components-domain/src/main/java/org/eclipse/sirius/components/domain/impl/AttributeImpl.java +++ b/packages/domain/backend/sirius-components-domain/src/main/java/org/eclipse/sirius/components/domain/impl/AttributeImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -162,7 +162,7 @@ public String toString() { return super.toString(); StringBuilder result = new StringBuilder(super.toString()); - result.append(" (type: "); //$NON-NLS-1$ + result.append(" (type: "); result.append(this.type); result.append(')'); return result.toString(); diff --git a/packages/domain/backend/sirius-components-domain/src/main/java/org/eclipse/sirius/components/domain/impl/DomainFactoryImpl.java b/packages/domain/backend/sirius-components-domain/src/main/java/org/eclipse/sirius/components/domain/impl/DomainFactoryImpl.java index 445b357a44..b069dfe8f6 100644 --- a/packages/domain/backend/sirius-components-domain/src/main/java/org/eclipse/sirius/components/domain/impl/DomainFactoryImpl.java +++ b/packages/domain/backend/sirius-components-domain/src/main/java/org/eclipse/sirius/components/domain/impl/DomainFactoryImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -75,7 +75,7 @@ public EObject create(EClass eClass) { case DomainPackage.RELATION: return this.createRelation(); default: - throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$ + throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); } } @@ -90,7 +90,7 @@ public Object createFromString(EDataType eDataType, String initialValue) { case DomainPackage.DATA_TYPE: return this.createDataTypeFromString(eDataType, initialValue); default: - throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$ + throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); } } @@ -105,7 +105,7 @@ public String convertToString(EDataType eDataType, Object instanceValue) { case DomainPackage.DATA_TYPE: return this.convertDataTypeToString(eDataType, instanceValue); default: - throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$ + throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); } } @@ -128,7 +128,7 @@ public Domain createDomain() { @Override public Entity createEntity() { EntityImpl entity = new EntityImpl(); - entity.setName("NewEntity"); //$NON-NLS-1$ + entity.setName("NewEntity"); return entity; } @@ -140,7 +140,7 @@ public Entity createEntity() { @Override public Attribute createAttribute() { AttributeImpl attribute = new AttributeImpl(); - attribute.setName("newAttribute"); //$NON-NLS-1$ + attribute.setName("newAttribute"); return attribute; } @@ -152,7 +152,7 @@ public Attribute createAttribute() { @Override public Relation createRelation() { RelationImpl relation = new RelationImpl(); - relation.setName("newRelation"); //$NON-NLS-1$ + relation.setName("newRelation"); return relation; } @@ -164,7 +164,7 @@ public Relation createRelation() { public DataType createDataTypeFromString(EDataType eDataType, String initialValue) { DataType result = DataType.get(initialValue); if (result == null) - throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); return result; } diff --git a/packages/domain/backend/sirius-components-domain/src/main/java/org/eclipse/sirius/components/domain/impl/DomainPackageImpl.java b/packages/domain/backend/sirius-components-domain/src/main/java/org/eclipse/sirius/components/domain/impl/DomainPackageImpl.java index c66da60ef7..53c9004548 100644 --- a/packages/domain/backend/sirius-components-domain/src/main/java/org/eclipse/sirius/components/domain/impl/DomainPackageImpl.java +++ b/packages/domain/backend/sirius-components-domain/src/main/java/org/eclipse/sirius/components/domain/impl/DomainPackageImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -415,42 +415,42 @@ public void initializePackageContents() { this.relationEClass.getESuperTypes().add(this.getFeature()); // Initialize classes, features, and operations; add parameters - this.initEClass(this.namedElementEClass, NamedElement.class, "NamedElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - this.initEAttribute(this.getNamedElement_Name(), this.ecorePackage.getEString(), "name", null, 1, 1, NamedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, //$NON-NLS-1$ + this.initEClass(this.namedElementEClass, NamedElement.class, "NamedElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + this.initEAttribute(this.getNamedElement_Name(), this.ecorePackage.getEString(), "name", null, 1, 1, NamedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - this.initEClass(this.domainEClass, Domain.class, "Domain", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - this.initEReference(this.getDomain_Types(), this.getEntity(), null, "types", null, 0, -1, Domain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, //$NON-NLS-1$ + this.initEClass(this.domainEClass, Domain.class, "Domain", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + this.initEReference(this.getDomain_Types(), this.getEntity(), null, "types", null, 0, -1, Domain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - this.initEClass(this.entityEClass, Entity.class, "Entity", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - this.initEReference(this.getEntity_Attributes(), this.getAttribute(), null, "attributes", null, 0, -1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, //$NON-NLS-1$ + this.initEClass(this.entityEClass, Entity.class, "Entity", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + this.initEReference(this.getEntity_Attributes(), this.getAttribute(), null, "attributes", null, 0, -1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - this.initEReference(this.getEntity_Relations(), this.getRelation(), null, "relations", null, 0, -1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, //$NON-NLS-1$ + this.initEReference(this.getEntity_Relations(), this.getRelation(), null, "relations", null, 0, -1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - this.initEReference(this.getEntity_SuperTypes(), this.getEntity(), null, "superTypes", null, 0, -1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, //$NON-NLS-1$ + this.initEReference(this.getEntity_SuperTypes(), this.getEntity(), null, "superTypes", null, 0, -1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - this.initEAttribute(this.getEntity_Abstract(), this.ecorePackage.getEBoolean(), "abstract", null, 1, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, //$NON-NLS-1$ + this.initEAttribute(this.getEntity_Abstract(), this.ecorePackage.getEBoolean(), "abstract", null, 1, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - this.initEClass(this.featureEClass, Feature.class, "Feature", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - this.initEAttribute(this.getFeature_Optional(), this.ecorePackage.getEBoolean(), "optional", "true", 1, 1, Feature.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, //$NON-NLS-1$//$NON-NLS-2$ + this.initEClass(this.featureEClass, Feature.class, "Feature", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + this.initEAttribute(this.getFeature_Optional(), this.ecorePackage.getEBoolean(), "optional", "true", 1, 1, Feature.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - this.initEAttribute(this.getFeature_Many(), this.ecorePackage.getEBoolean(), "many", "false", 1, 1, Feature.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, //$NON-NLS-1$//$NON-NLS-2$ + this.initEAttribute(this.getFeature_Many(), this.ecorePackage.getEBoolean(), "many", "false", 1, 1, Feature.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - this.initEClass(this.attributeEClass, Attribute.class, "Attribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - this.initEAttribute(this.getAttribute_Type(), this.getDataType(), "type", null, 0, 1, Attribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, //$NON-NLS-1$ + this.initEClass(this.attributeEClass, Attribute.class, "Attribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + this.initEAttribute(this.getAttribute_Type(), this.getDataType(), "type", null, 0, 1, Attribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - this.initEClass(this.relationEClass, Relation.class, "Relation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - this.initEAttribute(this.getRelation_Containment(), this.ecorePackage.getEBoolean(), "containment", null, 1, 1, Relation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, //$NON-NLS-1$ + this.initEClass(this.relationEClass, Relation.class, "Relation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + this.initEAttribute(this.getRelation_Containment(), this.ecorePackage.getEBoolean(), "containment", null, 1, 1, Relation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - this.initEReference(this.getRelation_TargetType(), this.getEntity(), null, "targetType", null, 1, 1, Relation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, //$NON-NLS-1$ + this.initEReference(this.getRelation_TargetType(), this.getEntity(), null, "targetType", null, 1, 1, Relation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); // Initialize enums and add enum literals - this.initEEnum(this.dataTypeEEnum, DataType.class, "DataType"); //$NON-NLS-1$ + this.initEEnum(this.dataTypeEEnum, DataType.class, "DataType"); this.addEEnumLiteral(this.dataTypeEEnum, DataType.STRING); this.addEEnumLiteral(this.dataTypeEEnum, DataType.BOOLEAN); this.addEEnumLiteral(this.dataTypeEEnum, DataType.NUMBER); diff --git a/packages/domain/backend/sirius-components-domain/src/main/java/org/eclipse/sirius/components/domain/impl/EntityImpl.java b/packages/domain/backend/sirius-components-domain/src/main/java/org/eclipse/sirius/components/domain/impl/EntityImpl.java index 2d11f1bb70..8638b0582a 100644 --- a/packages/domain/backend/sirius-components-domain/src/main/java/org/eclipse/sirius/components/domain/impl/EntityImpl.java +++ b/packages/domain/backend/sirius-components-domain/src/main/java/org/eclipse/sirius/components/domain/impl/EntityImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -293,7 +293,7 @@ public String toString() { return super.toString(); StringBuilder result = new StringBuilder(super.toString()); - result.append(" (abstract: "); //$NON-NLS-1$ + result.append(" (abstract: "); result.append(this.abstract_); result.append(')'); return result.toString(); diff --git a/packages/domain/backend/sirius-components-domain/src/main/java/org/eclipse/sirius/components/domain/impl/FeatureImpl.java b/packages/domain/backend/sirius-components-domain/src/main/java/org/eclipse/sirius/components/domain/impl/FeatureImpl.java index a9d7fdf5a9..0223963c6b 100644 --- a/packages/domain/backend/sirius-components-domain/src/main/java/org/eclipse/sirius/components/domain/impl/FeatureImpl.java +++ b/packages/domain/backend/sirius-components-domain/src/main/java/org/eclipse/sirius/components/domain/impl/FeatureImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -215,9 +215,9 @@ public String toString() { return super.toString(); StringBuilder result = new StringBuilder(super.toString()); - result.append(" (optional: "); //$NON-NLS-1$ + result.append(" (optional: "); result.append(this.optional); - result.append(", many: "); //$NON-NLS-1$ + result.append(", many: "); result.append(this.many); result.append(')'); return result.toString(); diff --git a/packages/domain/backend/sirius-components-domain/src/main/java/org/eclipse/sirius/components/domain/impl/NamedElementImpl.java b/packages/domain/backend/sirius-components-domain/src/main/java/org/eclipse/sirius/components/domain/impl/NamedElementImpl.java index bb86a4917d..7572aa93fa 100644 --- a/packages/domain/backend/sirius-components-domain/src/main/java/org/eclipse/sirius/components/domain/impl/NamedElementImpl.java +++ b/packages/domain/backend/sirius-components-domain/src/main/java/org/eclipse/sirius/components/domain/impl/NamedElementImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -162,7 +162,7 @@ public String toString() { return super.toString(); StringBuilder result = new StringBuilder(super.toString()); - result.append(" (name: "); //$NON-NLS-1$ + result.append(" (name: "); result.append(this.name); result.append(')'); return result.toString(); diff --git a/packages/domain/backend/sirius-components-domain/src/main/java/org/eclipse/sirius/components/domain/impl/RelationImpl.java b/packages/domain/backend/sirius-components-domain/src/main/java/org/eclipse/sirius/components/domain/impl/RelationImpl.java index 9813ebd728..30e93b6e61 100644 --- a/packages/domain/backend/sirius-components-domain/src/main/java/org/eclipse/sirius/components/domain/impl/RelationImpl.java +++ b/packages/domain/backend/sirius-components-domain/src/main/java/org/eclipse/sirius/components/domain/impl/RelationImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -226,7 +226,7 @@ public String toString() { return super.toString(); StringBuilder result = new StringBuilder(super.toString()); - result.append(" (containment: "); //$NON-NLS-1$ + result.append(" (containment: "); result.append(this.containment); result.append(')'); return result.toString(); diff --git a/packages/domain/backend/sirius-components-domain/src/main/resources/model/domain.genmodel b/packages/domain/backend/sirius-components-domain/src/main/resources/model/domain.genmodel index dfed6b5cb3..7bf62b1f3f 100644 --- a/packages/domain/backend/sirius-components-domain/src/main/resources/model/domain.genmodel +++ b/packages/domain/backend/sirius-components-domain/src/main/resources/model/domain.genmodel @@ -4,7 +4,7 @@ copyrightText="Copyright (c) 2021 Obeo. This program and the accompanying materials are made available under the terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at https://www.eclipse.org/legal/epl-2.0/ SPDX-License-Identifier: EPL-2.0 Contributors: Obeo - initial API and implementation" modelDirectory="/sirius-components-domain/src/main/java" creationIcons="false" editDirectory="/sirius-components-domain-edit/src/main/java" editorDirectory="/sirius-components-domain-editor/src-gen" modelPluginID="sirius-components-domain" - modelName="Domain" updateClasspath="false" nonNLSMarkers="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" + modelName="Domain" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" codeFormatting="true" importerID="org.eclipse.emf.importer.ecore" bundleManifest="false" complianceLevel="11.0" suppressGenModelAnnotations="false" copyrightFields="false" editPluginID="sirius-components-domain-edit" editorPluginID="sirius-components-domain-editor" diff --git a/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/configuration/EMFMessageServiceConfiguration.java b/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/configuration/EMFMessageServiceConfiguration.java index 7a2b404353..66f908ad3b 100644 --- a/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/configuration/EMFMessageServiceConfiguration.java +++ b/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/configuration/EMFMessageServiceConfiguration.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -24,7 +24,7 @@ */ @Configuration public class EMFMessageServiceConfiguration { - private static final String PATH = "messages/sirius-web-emf"; //$NON-NLS-1$ + private static final String PATH = "messages/sirius-web-emf"; @Bean public MessageSourceAccessor emfMessageSourceAccessor() { diff --git a/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/query/EMFQueryService.java b/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/query/EMFQueryService.java index 5eda3cb57d..5e5c76a4bc 100644 --- a/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/query/EMFQueryService.java +++ b/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/query/EMFQueryService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -49,7 +49,7 @@ @Service public class EMFQueryService implements IQueryService { - private static final String EVALUATION_ERROR_MESSAGE = "An error occured while evaluating the expression. Status : "; //$NON-NLS-1$ + private static final String EVALUATION_ERROR_MESSAGE = "An error occured while evaluating the expression. Status : "; private final IEditingContextEPackageService editingContextEPackageService; diff --git a/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/EMFImagePathService.java b/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/EMFImagePathService.java index ec8e9411d4..d0b521c35e 100644 --- a/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/EMFImagePathService.java +++ b/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/EMFImagePathService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -25,7 +25,7 @@ @Service public class EMFImagePathService implements IImagePathService { - private static final List IMAGES_PATHS = List.of("/icons/full/obj16"); //$NON-NLS-1$ + private static final List IMAGES_PATHS = List.of("/icons/full/obj16"); @Override public List getPaths() { diff --git a/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/EMFKindService.java b/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/EMFKindService.java index c355b59be2..bee2afd54e 100644 --- a/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/EMFKindService.java +++ b/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/EMFKindService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -39,7 +39,7 @@ public EMFKindService(IKindParser kindParser) { @Override public String getKind(EClass eClass) { - return URI.create(SemanticKindConstants.PREFIX + "?" + SemanticKindConstants.DOMAIN_ARGUMENT + "=" + eClass.getEPackage().getName() + "&" + SemanticKindConstants.ENTITY_ARGUMENT + "=" //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + return URI.create(SemanticKindConstants.PREFIX + "?" + SemanticKindConstants.DOMAIN_ARGUMENT + "=" + eClass.getEPackage().getName() + "&" + SemanticKindConstants.ENTITY_ARGUMENT + "=" + eClass.getName()).toString(); } diff --git a/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/EditService.java b/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/EditService.java index cfade8c2dc..8de1d40739 100644 --- a/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/EditService.java +++ b/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/EditService.java @@ -108,7 +108,7 @@ public List getChildCreationDescriptions(String editin AdapterFactoryEditingDomain editingDomain = new AdapterFactoryEditingDomain(this.composedAdapterFactory, new BasicCommandStack()); ResourceSet resourceSet = editingDomain.getResourceSet(); resourceSet.setPackageRegistry(ePackageRegistry); - Resource resource = new JsonResourceImpl(URI.createURI("inmemory"), Map.of()); //$NON-NLS-1$ + Resource resource = new JsonResourceImpl(URI.createURI("inmemory"), Map.of()); resourceSet.getResources().add(resource); // @formatter:off diff --git a/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/EditingContext.java b/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/EditingContext.java index c93456f7e9..87065ece60 100644 --- a/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/EditingContext.java +++ b/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/EditingContext.java @@ -28,7 +28,7 @@ public class EditingContext implements IEditingContext { * This scheme should be used to create an URI of a resource that corresponds to a document added in the * EditingContext ResourceSet. */ - public static final String RESOURCE_SCHEME = "sirius"; //$NON-NLS-1$ + public static final String RESOURCE_SCHEME = "sirius"; private final String id; diff --git a/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/JSONResourceFactory.java b/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/JSONResourceFactory.java index 03592d169a..b4b1ef6c17 100644 --- a/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/JSONResourceFactory.java +++ b/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/JSONResourceFactory.java @@ -38,7 +38,7 @@ public JsonResource createResource(URI uri) { .map(URI::scheme) .filter(Objects::nonNull) .filter(Predicate.not(String::isEmpty)) - .orElseThrow(() -> new IllegalArgumentException(String.format("Missing scheme for URI %s", uri))); //$NON-NLS-1$ + .orElseThrow(() -> new IllegalArgumentException(String.format("Missing scheme for URI %s", uri))); // @formatter:on Map options = new HashMap<>(); @@ -69,6 +69,6 @@ public JsonResource createResourceFromPath(String path) { */ public URI createResourceURI(String resourceId) { // There are three slashes because the URI authority is empty - return URI.createURI(EditingContext.RESOURCE_SCHEME + ":///" + resourceId); //$NON-NLS-1$ + return URI.createURI(EditingContext.RESOURCE_SCHEME + ":///" + resourceId); } } diff --git a/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/ObjectService.java b/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/ObjectService.java index d720dd5335..9ea682cc66 100644 --- a/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/ObjectService.java +++ b/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/ObjectService.java @@ -49,9 +49,9 @@ @Service public class ObjectService implements IObjectService { - private static final String DEFAULT_LABEL_FEATURE = "name"; //$NON-NLS-1$ + private static final String DEFAULT_LABEL_FEATURE = "name"; - private static final String ID_SEPARATOR = "#"; //$NON-NLS-1$ + private static final String ID_SEPARATOR = "#"; private final IEMFKindService emfKindService; @@ -91,7 +91,7 @@ public String getKind(Object object) { EObject eObject = (EObject) object; return this.emfKindService.getKind(eObject.eClass()); } - return ""; //$NON-NLS-1$ + return ""; } private String getIdFromIDAdapter(EObject eObject) { @@ -129,7 +129,7 @@ public String getLabel(Object object) { .map(EObject.class::cast) .flatMap(eObject -> this.getLabelEAttribute(eObject).map(eObject::eGet)) .map(Object::toString) - .orElse(""); //$NON-NLS-1$ + .orElse(""); // @formatter:on } @@ -140,7 +140,7 @@ public String getFullLabel(Object object) { fullLabel = ((EObject) object).eClass().getName(); String label = this.getLabel(object); if (label != null && !label.isEmpty()) { - fullLabel += " " + label; //$NON-NLS-1$ + fullLabel += " " + label; } } else { fullLabel = this.getLabel(object); @@ -163,7 +163,7 @@ public String getImagePath(Object object) { return this.getImageRelativePath(imageFullPath); } } catch (MissingResourceException exception) { - this.logger.warn("Missing icon for {}", eObject); //$NON-NLS-1$ + this.logger.warn("Missing icon for {}", eObject); } } } @@ -172,12 +172,12 @@ public String getImagePath(Object object) { private String getImageRelativePath(String imageFullPath) { String imageRelativePath = null; - String[] uriSplit = imageFullPath.split("!"); //$NON-NLS-1$ + String[] uriSplit = imageFullPath.split("!"); if (uriSplit.length > 1) { imageRelativePath = uriSplit[uriSplit.length - 1]; } else { // in development mode, when the image is not contained in a jar - uriSplit = imageFullPath.split("target/classes"); //$NON-NLS-1$ + uriSplit = imageFullPath.split("target/classes"); if (uriSplit.length > 1) { imageRelativePath = uriSplit[uriSplit.length - 1]; } diff --git a/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/api/IEMFKindService.java b/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/api/IEMFKindService.java index 5dbd9634a1..aa5f847d67 100644 --- a/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/api/IEMFKindService.java +++ b/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/api/IEMFKindService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -41,17 +41,17 @@ class NoOp implements IEMFKindService { @Override public String getKind(EClass eClass) { - return ""; //$NON-NLS-1$ + return ""; } @Override public String getEPackageName(String kind) { - return ""; //$NON-NLS-1$ + return ""; } @Override public String getEClassName(String kind) { - return ""; //$NON-NLS-1$ + return ""; } @Override diff --git a/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/messages/EMFMessageService.java b/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/messages/EMFMessageService.java index 35b5cac35f..81548596e0 100644 --- a/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/messages/EMFMessageService.java +++ b/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/messages/EMFMessageService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -34,17 +34,17 @@ public EMFMessageService(@Qualifier("emfMessageSourceAccessor") MessageSourceAcc @Override public String unexpectedError() { - return this.messageSourceAccessor.getMessage("UNEXPECTED_ERROR"); //$NON-NLS-1$ + return this.messageSourceAccessor.getMessage("UNEXPECTED_ERROR"); } @Override public String invalidInput(String expectedInputTypeName, String receivedInputTypeName) { - return this.messageSourceAccessor.getMessage("INVALID_INPUT", new Object[] { expectedInputTypeName, receivedInputTypeName }); //$NON-NLS-1$ + return this.messageSourceAccessor.getMessage("INVALID_INPUT", new Object[] { expectedInputTypeName, receivedInputTypeName }); } @Override public String invalidNumber(String newValue) { - return this.messageSourceAccessor.getMessage("INVALID_NUMBER", new Object[] { newValue }); //$NON-NLS-1$ + return this.messageSourceAccessor.getMessage("INVALID_NUMBER", new Object[] { newValue }); } } diff --git a/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/messages/IEMFMessageService.java b/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/messages/IEMFMessageService.java index 0711f0e3e2..69ce12e216 100644 --- a/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/messages/IEMFMessageService.java +++ b/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/messages/IEMFMessageService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -33,17 +33,17 @@ public interface IEMFMessageService { class NoOp implements IEMFMessageService { @Override public String unexpectedError() { - return ""; //$NON-NLS-1$ + return ""; } @Override public String invalidInput(String expectedInputTypeName, String receivedInputTypeName) { - return ""; //$NON-NLS-1$ + return ""; } @Override public String invalidNumber(String newValue) { - return ""; //$NON-NLS-1$ + return ""; } } } diff --git a/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/utils/EMFResourceUtils.java b/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/utils/EMFResourceUtils.java index ff8cf611f4..00c67164de 100644 --- a/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/utils/EMFResourceUtils.java +++ b/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/utils/EMFResourceUtils.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -35,10 +35,10 @@ public class EMFResourceUtils { */ // @formatter:off private static final Map SAFE_SAX_PARSER_FEATURES = Map.of( - "http://xml.org/sax/features/external-general-entities", false, //$NON-NLS-1$ - "http://xml.org/sax/features/external-parameter-entities", false, //$NON-NLS-1$ - "http://apache.org/xml/features/nonvalidating/load-external-dtd", false, //$NON-NLS-1$ - "http://apache.org/xml/features/disallow-doctype-decl", true); //$NON-NLS-1$ + "http://xml.org/sax/features/external-general-entities", false, + "http://xml.org/sax/features/external-parameter-entities", false, + "http://apache.org/xml/features/nonvalidating/load-external-dtd", false, + "http://apache.org/xml/features/disallow-doctype-decl", true); // @formatter:on public Map getXMILoadOptions() { diff --git a/packages/emf/backend/sirius-components-emf/src/test/java/org/eclipse/sirius/components/emf/architecture/ArchitectureConstants.java b/packages/emf/backend/sirius-components-emf/src/test/java/org/eclipse/sirius/components/emf/architecture/ArchitectureConstants.java index 9c1d991190..76b9c248d5 100644 --- a/packages/emf/backend/sirius-components-emf/src/test/java/org/eclipse/sirius/components/emf/architecture/ArchitectureConstants.java +++ b/packages/emf/backend/sirius-components-emf/src/test/java/org/eclipse/sirius/components/emf/architecture/ArchitectureConstants.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -22,7 +22,7 @@ * @author sbegaudeau */ public final class ArchitectureConstants { - public static final String SIRIUS_COMPONENTS_EMF_ROOT_PACKAGE = "org.eclipse.sirius.components.emf.."; //$NON-NLS-1$ + public static final String SIRIUS_COMPONENTS_EMF_ROOT_PACKAGE = "org.eclipse.sirius.components.emf.."; // @formatter:off public static final JavaClasses CLASSES = new ClassFileImporter() diff --git a/packages/emf/backend/sirius-components-emf/src/test/java/org/eclipse/sirius/components/emf/query/EMFQueryServiceTests.java b/packages/emf/backend/sirius-components-emf/src/test/java/org/eclipse/sirius/components/emf/query/EMFQueryServiceTests.java index 7b07312736..7091344089 100644 --- a/packages/emf/backend/sirius-components-emf/src/test/java/org/eclipse/sirius/components/emf/query/EMFQueryServiceTests.java +++ b/packages/emf/backend/sirius-components-emf/src/test/java/org/eclipse/sirius/components/emf/query/EMFQueryServiceTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -63,7 +63,7 @@ public List getEPackages(String editingContextId) { }; IQueryService queryService = new EMFQueryService(editingContextEPackageService, List.of()); - QueryBasedIntInput input = new QueryBasedIntInput(UUID.randomUUID(), "aql:editingContext.allContents()->size()", Map.of()); //$NON-NLS-1$ + QueryBasedIntInput input = new QueryBasedIntInput(UUID.randomUUID(), "aql:editingContext.allContents()->size()", Map.of()); IPayload payload = queryService.execute(editingContext, input); assertTrue(payload instanceof QueryBasedIntSuccessPayload); assertEquals(8, ((QueryBasedIntSuccessPayload) payload).getResult()); @@ -82,7 +82,7 @@ public List getEPackages(String editingContextId) { }; IQueryService queryService = new EMFQueryService(editingContextEPackageService, List.of()); - QueryBasedIntInput input = new QueryBasedIntInput(UUID.randomUUID(), "aql:editingContext.contents()->size()", Map.of()); //$NON-NLS-1$ + QueryBasedIntInput input = new QueryBasedIntInput(UUID.randomUUID(), "aql:editingContext.contents()->size()", Map.of()); IPayload payload = queryService.execute(editingContext, input); assertTrue(payload instanceof QueryBasedIntSuccessPayload); assertEquals(2, ((QueryBasedIntSuccessPayload) payload).getResult()); @@ -111,16 +111,16 @@ public List getEPackages(String editingContextId) { .map(IDAdapter.class::cast) .findFirst(); - String id = optionalIDAdapter.map(IDAdapter::getId).map(Object::toString).orElse(""); //$NON-NLS-1$ + String id = optionalIDAdapter.map(IDAdapter::getId).map(Object::toString).orElse(""); // @formatter:on - QueryBasedObjectInput input = new QueryBasedObjectInput(UUID.randomUUID(), "aql:editingContext.getObjectById('" + id + "')", Map.of()); //$NON-NLS-1$ //$NON-NLS-2$ + QueryBasedObjectInput input = new QueryBasedObjectInput(UUID.randomUUID(), "aql:editingContext.getObjectById('" + id + "')", Map.of()); IPayload payload = queryService.execute(editingContext, input); assertTrue(payload instanceof QueryBasedObjectSuccessPayload); assertEquals(eObjectToRetrieve, ((QueryBasedObjectSuccessPayload) payload).getResult()); - input = new QueryBasedObjectInput(UUID.randomUUID(), "aql:editingContext.getObjectById('" + id + "wrong')", Map.of()); //$NON-NLS-1$ //$NON-NLS-2$ + input = new QueryBasedObjectInput(UUID.randomUUID(), "aql:editingContext.getObjectById('" + id + "wrong')", Map.of()); payload = queryService.execute(editingContext, input); assertTrue(payload instanceof ErrorPayload); } @@ -136,22 +136,22 @@ private Resource createResourceWith4Elements() { Map cache = new HashMap<>(); EPackage ePackage = EcoreFactory.eINSTANCE.createEPackage(); - UUID ePackageUUID = UUID.nameUUIDFromBytes("ePackage".getBytes()); //$NON-NLS-1$ + UUID ePackageUUID = UUID.nameUUIDFromBytes("ePackage".getBytes()); ePackage.eAdapters().add(new IDAdapter(ePackageUUID)); cache.put(ePackageUUID.toString(), ePackage); EClass class1 = EcoreFactory.eINSTANCE.createEClass(); - UUID class1UUID = UUID.nameUUIDFromBytes("class1".getBytes()); //$NON-NLS-1$ + UUID class1UUID = UUID.nameUUIDFromBytes("class1".getBytes()); class1.eAdapters().add(new IDAdapter(class1UUID)); cache.put(class1UUID.toString(), ePackage); EClass class2 = EcoreFactory.eINSTANCE.createEClass(); - UUID class2UUID = UUID.nameUUIDFromBytes("class2".getBytes()); //$NON-NLS-1$ + UUID class2UUID = UUID.nameUUIDFromBytes("class2".getBytes()); class2.eAdapters().add(new IDAdapter(class2UUID)); cache.put(class2UUID.toString(), ePackage); EClass class3 = EcoreFactory.eINSTANCE.createEClass(); - UUID class3UUID = UUID.nameUUIDFromBytes("class3".getBytes()); //$NON-NLS-1$ + UUID class3UUID = UUID.nameUUIDFromBytes("class3".getBytes()); class3.eAdapters().add(new IDAdapter(class3UUID)); cache.put(class3UUID.toString(), ePackage); diff --git a/packages/emf/backend/sirius-components-emf/src/test/java/org/eclipse/sirius/components/emf/services/EditingContextCrossReferenceAdapterTest.java b/packages/emf/backend/sirius-components-emf/src/test/java/org/eclipse/sirius/components/emf/services/EditingContextCrossReferenceAdapterTest.java index d2151b5e26..55aaa3a814 100644 --- a/packages/emf/backend/sirius-components-emf/src/test/java/org/eclipse/sirius/components/emf/services/EditingContextCrossReferenceAdapterTest.java +++ b/packages/emf/backend/sirius-components-emf/src/test/java/org/eclipse/sirius/components/emf/services/EditingContextCrossReferenceAdapterTest.java @@ -96,7 +96,7 @@ private void createModel(ResourceSet resourceSet) { EPackage ePackage = EcoreFactory.eINSTANCE.createEPackage(); this.referencedResource.getContents().add(ePackage); this.referencedClass = EcoreFactory.eINSTANCE.createEClass(); - this.referencedClass.setName("referencedClass"); //$NON-NLS-1$ + this.referencedClass.setName("referencedClass"); ePackage.getEClassifiers().add(this.referencedClass); Resource referencingResource = new JSONResourceFactory().createResourceFromPath(UUID.randomUUID().toString()); diff --git a/packages/emf/backend/sirius-components-emf/src/test/java/org/eclipse/sirius/components/emf/services/IDManagerTests.java b/packages/emf/backend/sirius-components-emf/src/test/java/org/eclipse/sirius/components/emf/services/IDManagerTests.java index 2eed5d90f3..de73b1ad5f 100644 --- a/packages/emf/backend/sirius-components-emf/src/test/java/org/eclipse/sirius/components/emf/services/IDManagerTests.java +++ b/packages/emf/backend/sirius-components-emf/src/test/java/org/eclipse/sirius/components/emf/services/IDManagerTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -43,11 +43,11 @@ public class IDManagerTests { public IDManagerTests() { this.ePackage = EcoreFactory.eINSTANCE.createEPackage(); - this.ePackage.setName("test"); //$NON-NLS-1$ - this.ePackage.setNsPrefix("test"); //$NON-NLS-1$ - this.ePackage.setNsURI("http//:test"); //$NON-NLS-1$ + this.ePackage.setName("test"); + this.ePackage.setNsPrefix("test"); + this.ePackage.setNsURI("http//:test"); this.eClass = EcoreFactory.eINSTANCE.createEClass(); - this.eClass.setName("Test"); //$NON-NLS-1$ + this.eClass.setName("Test"); this.ePackage.getEClassifiers().add(this.eClass); this.resourceSet = new ResourceSetImpl(); this.resourceSet.getPackageRegistry().put(this.ePackage.getNsURI(), this.ePackage); @@ -84,7 +84,7 @@ private EObject createEOject() { private Resource createResource() { var options = new HashMap<>(); options.put(JsonResource.OPTION_ID_MANAGER, new EObjectIDManager()); - JsonResourceImpl resource = new JsonResourceImpl(URI.createURI(""), options); //$NON-NLS-1$ + JsonResourceImpl resource = new JsonResourceImpl(URI.createURI(""), options); this.resourceSet.getResources().add(resource); return resource; } diff --git a/packages/emf/backend/sirius-components-emf/src/test/java/org/eclipse/sirius/components/emf/services/ObjectServiceTests.java b/packages/emf/backend/sirius-components-emf/src/test/java/org/eclipse/sirius/components/emf/services/ObjectServiceTests.java index 2f7e7d13b8..7f8133e725 100644 --- a/packages/emf/backend/sirius-components-emf/src/test/java/org/eclipse/sirius/components/emf/services/ObjectServiceTests.java +++ b/packages/emf/backend/sirius-components-emf/src/test/java/org/eclipse/sirius/components/emf/services/ObjectServiceTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -47,7 +47,7 @@ public void testFindImagePathOnCompositeImage() { // @formatter:off assertThat(imagePath) .isNotNull() - .endsWith("/icons/full/obj16/EAttribute.gif"); //$NON-NLS-1$ + .endsWith("/icons/full/obj16/EAttribute.gif"); // @formatter:on } @@ -58,7 +58,7 @@ public void testGetIdOnEMFProxy() { composedAdapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory()); ObjectService objectService = new ObjectService(new IEMFKindService.NoOp(), composedAdapterFactory, new LabelFeatureProviderRegistry()); Resource resource = new XMIResourceImpl(); - resource.setURI(URI.createURI("test.xmi")); //$NON-NLS-1$ + resource.setURI(URI.createURI("test.xmi")); EObject eObject = EcoreFactory.eINSTANCE.createEClass(); resource.getContents().add(eObject); resource.unload(); diff --git a/packages/emf/backend/sirius-components-interpreter/src/main/java/org/eclipse/sirius/components/interpreter/AQLInterpreter.java b/packages/emf/backend/sirius-components-interpreter/src/main/java/org/eclipse/sirius/components/interpreter/AQLInterpreter.java index e0a94aa4bd..900fae0e59 100644 --- a/packages/emf/backend/sirius-components-interpreter/src/main/java/org/eclipse/sirius/components/interpreter/AQLInterpreter.java +++ b/packages/emf/backend/sirius-components-interpreter/src/main/java/org/eclipse/sirius/components/interpreter/AQLInterpreter.java @@ -57,7 +57,7 @@ public class AQLInterpreter { /** * The prefix used by AQL expressions. */ - private static final String AQL_PREFIX = "aql:"; //$NON-NLS-1$ + private static final String AQL_PREFIX = "aql:"; private final Logger logger = LoggerFactory.getLogger(AQLInterpreter.class); @@ -158,11 +158,11 @@ public Result evaluateExpression(Map variables, String expressio private void log(String expression, Diagnostic diagnostic) { if (diagnostic.getMessage() != null) { if (Diagnostic.INFO == diagnostic.getSeverity()) { - this.logger.info("An info has occurred with the expression '{}': {}", expression, diagnostic.getMessage()); //$NON-NLS-1$ + this.logger.info("An info has occurred with the expression '{}': {}", expression, diagnostic.getMessage()); } else if (Diagnostic.WARNING == diagnostic.getSeverity()) { - this.logger.warn("A warning has occurred with the expression '{}': {}", expression, diagnostic.getMessage()); //$NON-NLS-1$ + this.logger.warn("A warning has occurred with the expression '{}': {}", expression, diagnostic.getMessage()); } else if (Diagnostic.ERROR == diagnostic.getSeverity() || Diagnostic.CANCEL == diagnostic.getSeverity()) { - this.logger.warn("An error has occurred with the expression '{}': {}", expression, diagnostic.getMessage()); //$NON-NLS-1$ + this.logger.warn("An error has occurred with the expression '{}': {}", expression, diagnostic.getMessage()); } } @@ -174,7 +174,7 @@ public ICompletionResult getProposals(String expression, int offset) { Map> variableTypes = new LinkedHashMap<>(); final Set potentialTypes = new LinkedHashSet<>(1); potentialTypes.add(new EClassifierType(this.queryEnvironment, EcorePackage.Literals.EOBJECT)); - variableTypes.put("self", potentialTypes); //$NON-NLS-1$ + variableTypes.put("self", potentialTypes); return engine.getCompletion(expression, offset, variableTypes); } diff --git a/packages/emf/backend/sirius-components-interpreter/src/main/java/org/eclipse/sirius/components/interpreter/ExpressionConverter.java b/packages/emf/backend/sirius-components-interpreter/src/main/java/org/eclipse/sirius/components/interpreter/ExpressionConverter.java index 14ae2ae89e..06dd07dd2b 100644 --- a/packages/emf/backend/sirius-components-interpreter/src/main/java/org/eclipse/sirius/components/interpreter/ExpressionConverter.java +++ b/packages/emf/backend/sirius-components-interpreter/src/main/java/org/eclipse/sirius/components/interpreter/ExpressionConverter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -26,40 +26,40 @@ public class ExpressionConverter { /** * The prefix used by AQL expressions. */ - private static final String AQL_PREFIX = "aql:"; //$NON-NLS-1$ + private static final String AQL_PREFIX = "aql:"; /** * The prefix used by feature expressions. */ - private static final String FEATURE_PREFIX = "feature:"; //$NON-NLS-1$ + private static final String FEATURE_PREFIX = "feature:"; /** * List of "special" features that must be post-processed */ - private static final List SPECIAL_FEATURE_NAMES = List.of("eContainer", "eContents", "eAllContents", "eClass", "eCrossReferences"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ + private static final List SPECIAL_FEATURE_NAMES = List.of("eContainer", "eContents", "eAllContents", "eClass", "eCrossReferences"); /** * The prefix used by var expressions. */ - private static final String VAR_PREFIX = "var:"; //$NON-NLS-1$ + private static final String VAR_PREFIX = "var:"; /** * The prefix used by service expressions. */ - private static final String SERVICE_PREFIX = "service:"; //$NON-NLS-1$ + private static final String SERVICE_PREFIX = "service:"; - private static final String QUOTE = "'"; //$NON-NLS-1$ + private static final String QUOTE = "'"; - private static final String ESCAPED_QUOTE = "\\'"; //$NON-NLS-1$ + private static final String ESCAPED_QUOTE = "\\'"; public String convertExpression(String expressionBody) { - String processedExpression = Optional.ofNullable(expressionBody).orElse(""); //$NON-NLS-1$ + String processedExpression = Optional.ofNullable(expressionBody).orElse(""); if (processedExpression.startsWith(VAR_PREFIX)) { // var:variableName -> aql:variableName String variableName = processedExpression.substring(VAR_PREFIX.length(), processedExpression.length()); - if (variableName.matches("[0-9]+")) { //$NON-NLS-1$ - variableName = "arg" + variableName; //$NON-NLS-1$ + if (variableName.matches("[0-9]+")) { + variableName = "arg" + variableName; } processedExpression = AQL_PREFIX + variableName; } else if (processedExpression.startsWith(FEATURE_PREFIX)) { @@ -67,9 +67,9 @@ public String convertExpression(String expressionBody) { String featureName = processedExpression.substring(FEATURE_PREFIX.length(), processedExpression.length()); if (SPECIAL_FEATURE_NAMES.contains(featureName)) { // feature:featureName -> aql:self.featureName() - featureName = featureName + "()"; //$NON-NLS-1$ + featureName = featureName + "()"; } - processedExpression = AQL_PREFIX + "self." + featureName; //$NON-NLS-1$ + processedExpression = AQL_PREFIX + "self." + featureName; } else if (!processedExpression.startsWith(AQL_PREFIX) && !processedExpression.startsWith(SERVICE_PREFIX)) { // true -> aql:'true', let's go -> aql:'let\'s go' processedExpression = processedExpression.replace(QUOTE, ESCAPED_QUOTE); diff --git a/packages/emf/backend/sirius-components-interpreter/src/main/java/org/eclipse/sirius/components/interpreter/Result.java b/packages/emf/backend/sirius-components-interpreter/src/main/java/org/eclipse/sirius/components/interpreter/Result.java index 64cf086931..b452eeac51 100644 --- a/packages/emf/backend/sirius-components-interpreter/src/main/java/org/eclipse/sirius/components/interpreter/Result.java +++ b/packages/emf/backend/sirius-components-interpreter/src/main/java/org/eclipse/sirius/components/interpreter/Result.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -128,9 +128,9 @@ public Optional asBoolean() { result = ((Boolean) value).booleanValue(); } else { String toString = value.toString(); - if ("true".equalsIgnoreCase(toString)) { //$NON-NLS-1$ + if ("true".equalsIgnoreCase(toString)) { result = true; - } else if ("false".equalsIgnoreCase(toString)) { //$NON-NLS-1$ + } else if ("false".equalsIgnoreCase(toString)) { result = false; } else { /* @@ -147,6 +147,6 @@ public Optional asBoolean() { @Override public String toString() { - return MessageFormat.format("Result { status: {0}, rawValue: {1}}", this.status, this.rawValue); //$NON-NLS-1$ + return MessageFormat.format("Result { status: {0}, rawValue: {1}}", this.status, this.rawValue); } } diff --git a/packages/emf/backend/sirius-components-interpreter/src/test/java/org/eclipse/sirius/components/interpreter/AQLInterpreterTests.java b/packages/emf/backend/sirius-components-interpreter/src/test/java/org/eclipse/sirius/components/interpreter/AQLInterpreterTests.java index 1e0f49457f..ed9b63fbae 100644 --- a/packages/emf/backend/sirius-components-interpreter/src/test/java/org/eclipse/sirius/components/interpreter/AQLInterpreterTests.java +++ b/packages/emf/backend/sirius-components-interpreter/src/test/java/org/eclipse/sirius/components/interpreter/AQLInterpreterTests.java @@ -30,12 +30,12 @@ */ public class AQLInterpreterTests { - private static final String SELF = "self"; //$NON-NLS-1$ + private static final String SELF = "self"; @Test public void testNameFeatureExpression() { AQLInterpreter interpreter = new AQLInterpreter(List.of(), List.of(EcorePackage.eINSTANCE)); - Result result = interpreter.evaluateExpression(Map.of(SELF, EcorePackage.eINSTANCE.getEModelElement()), "feature:name"); //$NON-NLS-1$ + Result result = interpreter.evaluateExpression(Map.of(SELF, EcorePackage.eINSTANCE.getEModelElement()), "feature:name"); Optional asString = result.asString(); assertThat(asString).isPresent().hasValue(EcorePackage.eINSTANCE.getEModelElement().getName()); } @@ -43,7 +43,7 @@ public void testNameFeatureExpression() { @Test public void testEContentsFeatureExpression() { AQLInterpreter interpreter = new AQLInterpreter(List.of(), List.of(EcorePackage.eINSTANCE)); - Result result = interpreter.evaluateExpression(Map.of(SELF, EcorePackage.eINSTANCE.getEModelElement()), "feature:eContents"); //$NON-NLS-1$ + Result result = interpreter.evaluateExpression(Map.of(SELF, EcorePackage.eINSTANCE.getEModelElement()), "feature:eContents"); Optional> asObjects = result.asObjects(); assertThat(asObjects).isPresent(); assertThat(asObjects.get()).contains(EcorePackage.Literals.EMODEL_ELEMENT__EANNOTATIONS, EcorePackage.Literals.EMODEL_ELEMENT___GET_EANNOTATION__STRING); @@ -52,7 +52,7 @@ public void testEContentsFeatureExpression() { @Test public void testEAllContentsFeatureExpression() { AQLInterpreter interpreter = new AQLInterpreter(List.of(), List.of(EcorePackage.eINSTANCE)); - Result result = interpreter.evaluateExpression(Map.of(SELF, EcorePackage.eINSTANCE.getEModelElement()), "feature:eAllContents"); //$NON-NLS-1$ + Result result = interpreter.evaluateExpression(Map.of(SELF, EcorePackage.eINSTANCE.getEModelElement()), "feature:eAllContents"); Optional> asObjects = result.asObjects(); assertThat(asObjects).isPresent(); assertThat(asObjects.get()).contains(EcorePackage.Literals.EMODEL_ELEMENT__EANNOTATIONS, EcorePackage.Literals.EMODEL_ELEMENT___GET_EANNOTATION__STRING); @@ -61,7 +61,7 @@ public void testEAllContentsFeatureExpression() { @Test public void testEContainerFeatureExpression() { AQLInterpreter interpreter = new AQLInterpreter(List.of(), List.of(EcorePackage.eINSTANCE)); - Result result = interpreter.evaluateExpression(Map.of(SELF, EcorePackage.eINSTANCE.getEModelElement()), "feature:eContainer"); //$NON-NLS-1$ + Result result = interpreter.evaluateExpression(Map.of(SELF, EcorePackage.eINSTANCE.getEModelElement()), "feature:eContainer"); Optional> asObjects = result.asObjects(); assertThat(asObjects).isPresent(); assertThat(asObjects.get()).contains(EcorePackage.eINSTANCE); @@ -70,7 +70,7 @@ public void testEContainerFeatureExpression() { @Test public void testEClassFeatureExpression() { AQLInterpreter interpreter = new AQLInterpreter(List.of(), List.of(EcorePackage.eINSTANCE)); - Result result = interpreter.evaluateExpression(Map.of(SELF, EcorePackage.eINSTANCE.getEModelElement()), "feature:eClass"); //$NON-NLS-1$ + Result result = interpreter.evaluateExpression(Map.of(SELF, EcorePackage.eINSTANCE.getEModelElement()), "feature:eClass"); Optional> asObjects = result.asObjects(); assertThat(asObjects).isPresent(); assertThat(asObjects.get()).contains(EcorePackage.Literals.ECLASS); @@ -79,7 +79,7 @@ public void testEClassFeatureExpression() { @Test public void testECrossReferencesFeatureExpression() { AQLInterpreter interpreter = new AQLInterpreter(List.of(), List.of(EcorePackage.eINSTANCE)); - Result result = interpreter.evaluateExpression(Map.of(SELF, EcorePackage.eINSTANCE.getEEnumLiteral()), "feature:eCrossReferences"); //$NON-NLS-1$ + Result result = interpreter.evaluateExpression(Map.of(SELF, EcorePackage.eINSTANCE.getEEnumLiteral()), "feature:eCrossReferences"); Optional> asObjects = result.asObjects(); assertThat(asObjects).isPresent(); assertThat(asObjects.get()).contains(EcorePackage.Literals.EENUM_LITERAL__EENUM); @@ -103,7 +103,7 @@ public void testNullExpressionEvaluatesToTrue() { @Test public void testEmptyExpressionEvaluatesToTrue() { AQLInterpreter interpreter = new AQLInterpreter(List.of(), List.of(EcorePackage.eINSTANCE)); - Result result = interpreter.evaluateExpression(Map.of(), ""); //$NON-NLS-1$ + Result result = interpreter.evaluateExpression(Map.of(), ""); assertThat(result).isNotNull(); assertThat(result.asBoolean()).contains(Boolean.TRUE); } @@ -111,17 +111,17 @@ public void testEmptyExpressionEvaluatesToTrue() { @Test public void testInvokeServiceFromClass() { AQLInterpreter interpreter = new AQLInterpreter(List.of(TestServices.class), List.of(EcorePackage.eINSTANCE)); - Result result = interpreter.evaluateExpression(Map.of(SELF, EcorePackage.eINSTANCE), "aql:self.getCreationMessage()"); //$NON-NLS-1$ + Result result = interpreter.evaluateExpression(Map.of(SELF, EcorePackage.eINSTANCE), "aql:self.getCreationMessage()"); assertThat(result).isNotNull(); - assertThat(result.asString()).contains("none"); //$NON-NLS-1$ + assertThat(result.asString()).contains("none"); } @Test public void testInvokeServiceFromInstance() { - AQLInterpreter interpreter = new AQLInterpreter(List.of(), List.of(new TestServices("instance")), List.of(EcorePackage.eINSTANCE)); //$NON-NLS-1$ - Result result = interpreter.evaluateExpression(Map.of(SELF, EcorePackage.eINSTANCE), "aql:self.getCreationMessage()"); //$NON-NLS-1$ + AQLInterpreter interpreter = new AQLInterpreter(List.of(), List.of(new TestServices("instance")), List.of(EcorePackage.eINSTANCE)); + Result result = interpreter.evaluateExpression(Map.of(SELF, EcorePackage.eINSTANCE), "aql:self.getCreationMessage()"); assertThat(result).isNotNull(); - assertThat(result.asString()).contains("instance"); //$NON-NLS-1$ + assertThat(result.asString()).contains("instance"); } } diff --git a/packages/emf/backend/sirius-components-interpreter/src/test/java/org/eclipse/sirius/components/interpreter/ExpressionConverterTests.java b/packages/emf/backend/sirius-components-interpreter/src/test/java/org/eclipse/sirius/components/interpreter/ExpressionConverterTests.java index 83dcc3972d..ae39189181 100644 --- a/packages/emf/backend/sirius-components-interpreter/src/test/java/org/eclipse/sirius/components/interpreter/ExpressionConverterTests.java +++ b/packages/emf/backend/sirius-components-interpreter/src/test/java/org/eclipse/sirius/components/interpreter/ExpressionConverterTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -25,74 +25,74 @@ public class ExpressionConverterTests { @Test public void testVarExpressionConvertion() { - String varExpression = "var:variableName"; //$NON-NLS-1$ + String varExpression = "var:variableName"; String aqlExpression = new ExpressionConverter().convertExpression(varExpression); - assertThat(aqlExpression).isEqualTo("aql:variableName"); //$NON-NLS-1$ + assertThat(aqlExpression).isEqualTo("aql:variableName"); } @Test public void testFeatureExpressionConvertion() { - String featureExpression = "feature:featureName"; //$NON-NLS-1$ + String featureExpression = "feature:featureName"; String aqlExpression = new ExpressionConverter().convertExpression(featureExpression); - assertThat(aqlExpression).isEqualTo("aql:self.featureName"); //$NON-NLS-1$ + assertThat(aqlExpression).isEqualTo("aql:self.featureName"); } @Test public void testEContainerFeatureExpressionConvertion() { - this.testSpecialFeatureExpressionConvertion("eContainer"); //$NON-NLS-1$ + this.testSpecialFeatureExpressionConvertion("eContainer"); } @Test public void testEContentsFeatureExpressionConvertion() { - this.testSpecialFeatureExpressionConvertion("eContents"); //$NON-NLS-1$ + this.testSpecialFeatureExpressionConvertion("eContents"); } @Test public void testEAllContentsFeatureExpressionConvertion() { - this.testSpecialFeatureExpressionConvertion("eAllContents"); //$NON-NLS-1$ + this.testSpecialFeatureExpressionConvertion("eAllContents"); } @Test public void testEClassFeatureExpressionConvertion() { - this.testSpecialFeatureExpressionConvertion("eClass"); //$NON-NLS-1$ + this.testSpecialFeatureExpressionConvertion("eClass"); } @Test public void testECrossReferencesFeatureExpressionConvertion() { - this.testSpecialFeatureExpressionConvertion("eCrossReferences"); //$NON-NLS-1$ + this.testSpecialFeatureExpressionConvertion("eCrossReferences"); } private void testSpecialFeatureExpressionConvertion(String featureName) { - String featureExpression = "feature:" + featureName; //$NON-NLS-1$ + String featureExpression = "feature:" + featureName; String aqlExpression = new ExpressionConverter().convertExpression(featureExpression); - assertThat(aqlExpression).isEqualTo("aql:self." + featureName + "()"); //$NON-NLS-1$ //$NON-NLS-2$ + assertThat(aqlExpression).isEqualTo("aql:self." + featureName + "()"); } @Test public void testStringExpressionConvertion() { - String stringExpression = "true"; //$NON-NLS-1$ + String stringExpression = "true"; String aqlExpression = new ExpressionConverter().convertExpression(stringExpression); - assertThat(aqlExpression).isEqualTo("aql:'true'"); //$NON-NLS-1$ + assertThat(aqlExpression).isEqualTo("aql:'true'"); } @Test public void testStringExpressionWithQuotesConvertion() { - String stringExpression = "Let's get started, let's go!"; //$NON-NLS-1$ + String stringExpression = "Let's get started, let's go!"; String aqlExpression = new ExpressionConverter().convertExpression(stringExpression); - assertThat(aqlExpression).isEqualTo("aql:'Let\\'s get started, let\\'s go!'"); //$NON-NLS-1$ + assertThat(aqlExpression).isEqualTo("aql:'Let\\'s get started, let\\'s go!'"); } @Test public void testVarExpressionForDirectEditConvertion() { - String varExpression = "var:0"; //$NON-NLS-1$ + String varExpression = "var:0"; String aqlExpression = new ExpressionConverter().convertExpression(varExpression); - assertThat(aqlExpression).isEqualTo("aql:arg0"); //$NON-NLS-1$ + assertThat(aqlExpression).isEqualTo("aql:arg0"); } @Test public void testNullExpressionConvertedToEmptyStringExpression() { String expression = null; String aqlExpression = new ExpressionConverter().convertExpression(expression); - assertThat(aqlExpression).isEqualTo("aql:''"); //$NON-NLS-1$ + assertThat(aqlExpression).isEqualTo("aql:''"); } } diff --git a/packages/emf/backend/sirius-components-interpreter/src/test/java/org/eclipse/sirius/components/interpreter/ResultTests.java b/packages/emf/backend/sirius-components-interpreter/src/test/java/org/eclipse/sirius/components/interpreter/ResultTests.java index 6b55c6a56f..d86a862d46 100644 --- a/packages/emf/backend/sirius-components-interpreter/src/test/java/org/eclipse/sirius/components/interpreter/ResultTests.java +++ b/packages/emf/backend/sirius-components-interpreter/src/test/java/org/eclipse/sirius/components/interpreter/ResultTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -46,7 +46,7 @@ public void testEmptyResult() { @Test public void testStringResult() { - String stringValue = "Luke Cage"; //$NON-NLS-1$ + String stringValue = "Luke Cage"; Result result = new Result(Optional.of(stringValue), Status.OK); assertThat(result.asString()).isPresent(); @@ -63,7 +63,7 @@ public void testStringResult() { @Test public void testIntResult() { - String stringValue = "42"; //$NON-NLS-1$ + String stringValue = "42"; Result result = new Result(Optional.of(stringValue), Status.OK); assertThat(result.asString()).isPresent(); diff --git a/packages/emf/backend/sirius-components-interpreter/src/test/java/org/eclipse/sirius/components/interpreter/TestServices.java b/packages/emf/backend/sirius-components-interpreter/src/test/java/org/eclipse/sirius/components/interpreter/TestServices.java index f173f25629..42523bf7c2 100644 --- a/packages/emf/backend/sirius-components-interpreter/src/test/java/org/eclipse/sirius/components/interpreter/TestServices.java +++ b/packages/emf/backend/sirius-components-interpreter/src/test/java/org/eclipse/sirius/components/interpreter/TestServices.java @@ -23,7 +23,7 @@ public class TestServices { private final String creationMessage; public TestServices() { - this.creationMessage = "none"; //$NON-NLS-1$ + this.creationMessage = "none"; } public TestServices(String creationMessage) { diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/FormDescriptionEditorCreationService.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/FormDescriptionEditorCreationService.java index 1399c95e99..772aa6d980 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/FormDescriptionEditorCreationService.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/FormDescriptionEditorCreationService.java @@ -62,7 +62,7 @@ public FormDescriptionEditorCreationService(IRepresentationDescriptionSearchServ // @formatter:off this.timer = Timer.builder(Monitoring.REPRESENTATION_EVENT_PROCESSOR_REFRESH) - .tag(Monitoring.NAME, "formdescriptioneditor") //$NON-NLS-1$ + .tag(Monitoring.NAME, "formdescriptioneditor") .register(meterRegistry); // @formatter:on } diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/FormDescriptionEditorEventFlux.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/FormDescriptionEditorEventFlux.java index ce028dc006..40e54e06ac 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/FormDescriptionEditorEventFlux.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/FormDescriptionEditorEventFlux.java @@ -49,7 +49,7 @@ public void formDescriptionEditorRefreshed(IInput input, FormDescriptionEditor n if (this.sink.currentSubscriberCount() > 0) { EmitResult emitResult = this.sink.tryEmitNext(new FormDescriptionEditorRefreshedEventPayload(input.getId(), this.currentFormDescriptionEditor)); if (emitResult.isFailure()) { - String pattern = "An error has occurred while emitting a FormDescriptionEditorRefreshedEventPayload: {}"; //$NON-NLS-1$ + String pattern = "An error has occurred while emitting a FormDescriptionEditorRefreshedEventPayload: {}"; this.logger.warn(pattern, emitResult); } } @@ -63,7 +63,7 @@ public Flux getFlux(IInput input) { public void dispose() { EmitResult emitResult = this.sink.tryEmitComplete(); if (emitResult.isFailure()) { - String pattern = "An error has occurred while marking the publisher as complete: {}"; //$NON-NLS-1$ + String pattern = "An error has occurred while marking the publisher as complete: {}"; this.logger.warn(pattern, emitResult); } } diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/FormDescriptionEditorEventProcessor.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/FormDescriptionEditorEventProcessor.java index c7c11591b4..acaa105f2f 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/FormDescriptionEditorEventProcessor.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/FormDescriptionEditorEventProcessor.java @@ -72,7 +72,7 @@ public FormDescriptionEditorEventProcessor(IEditingContext editingContext, IForm List formDescriptionEditorEventHandlers, ISubscriptionManager subscriptionManager, IFormDescriptionEditorCreationService formDescriptionEditorCreationService, IRepresentationDescriptionSearchService representationDescriptionSearchService, IRepresentationRefreshPolicyRegistry representationRefreshPolicyRegistry) { - this.logger.trace("Creating the form description editor event processor {}", formDescriptionEditorContext.getFormDescriptionEditor().getId()); //$NON-NLS-1$ + this.logger.trace("Creating the form description editor event processor {}", formDescriptionEditorContext.getFormDescriptionEditor().getId()); this.editingContext = Objects.requireNonNull(editingContext); this.formDescriptionEditorContext = Objects.requireNonNull(formDescriptionEditorContext); this.formDescriptionEditorEventHandlers = Objects.requireNonNull(formDescriptionEditorEventHandlers); @@ -88,7 +88,7 @@ public FormDescriptionEditorEventProcessor(IEditingContext editingContext, IForm this.formDescriptionEditorEventFlux = new FormDescriptionEditorEventFlux(formDescriptionEditor); if (formDescriptionEditor != null) { - this.logger.trace("FormDescriptionEditor refreshed: {})", formDescriptionEditor.getId()); //$NON-NLS-1$ + this.logger.trace("FormDescriptionEditor refreshed: {})", formDescriptionEditor.getId()); } } @@ -115,7 +115,7 @@ public void handle(One payloadSink, Many changeDesc IFormDescriptionEditorEventHandler formDescriptionEditorEventHandler = optionalFormEventHandler.get(); formDescriptionEditorEventHandler.handle(payloadSink, changeDescriptionSink, this.editingContext, this.formDescriptionEditorContext, formDescriptionEditorInput); } else { - this.logger.warn("No handler found for event: {}", formDescriptionEditorInput); //$NON-NLS-1$ + this.logger.warn("No handler found for event: {}", formDescriptionEditorInput); } } } @@ -125,7 +125,7 @@ public void refresh(ChangeDescription changeDescription) { if (this.shouldRefresh(changeDescription)) { FormDescriptionEditor refreshedFormDescriptionEditor = this.formDescriptionEditorCreationService.refresh(this.editingContext, this.formDescriptionEditorContext); if (refreshedFormDescriptionEditor != null) { - this.logger.trace("FormDescriptionEditor refreshed: {}", refreshedFormDescriptionEditor.getId()); //$NON-NLS-1$ + this.logger.trace("FormDescriptionEditor refreshed: {}", refreshedFormDescriptionEditor.getId()); this.formDescriptionEditorContext.update(refreshedFormDescriptionEditor); this.formDescriptionEditorEventFlux.formDescriptionEditorRefreshed(changeDescription.getInput(), refreshedFormDescriptionEditor); } @@ -169,7 +169,7 @@ public Flux getOutputEvents(IInput input) { @Override public void dispose() { - this.logger.trace("Disposing the form description editor event processor {}", this.formDescriptionEditorContext.getFormDescriptionEditor().getId()); //$NON-NLS-1$ + this.logger.trace("Disposing the form description editor event processor {}", this.formDescriptionEditorContext.getFormDescriptionEditor().getId()); this.subscriptionManager.dispose(); diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/FormDescriptionEditorImagePathService.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/FormDescriptionEditorImagePathService.java index 058b8bdcb1..f9e206c0fa 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/FormDescriptionEditorImagePathService.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/FormDescriptionEditorImagePathService.java @@ -26,7 +26,7 @@ public class FormDescriptionEditorImagePathService implements IImagePathService { @Override public List getPaths() { - return List.of("/formdescriptioneditor-images/"); //$NON-NLS-1$ + return List.of("/formdescriptioneditor-images/"); } } diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/FormDescriptionEditorImageProvider.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/FormDescriptionEditorImageProvider.java index 81b23b3cfd..bf82930504 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/FormDescriptionEditorImageProvider.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/FormDescriptionEditorImageProvider.java @@ -29,7 +29,7 @@ public class FormDescriptionEditorImageProvider implements IRepresentationImageP @Override public Optional getImageURL(String kind) { if (FormDescriptionEditor.KIND.equals(kind)) { - return Optional.of("/formdescriptioneditor-images/formDescriptionEditor.svg"); //$NON-NLS-1$ + return Optional.of("/formdescriptioneditor-images/formDescriptionEditor.svg"); } return Optional.empty(); } diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/api/FormDescriptionEditorCreationParameters.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/api/FormDescriptionEditorCreationParameters.java index f5598be2db..7d4e1dc482 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/api/FormDescriptionEditorCreationParameters.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/api/FormDescriptionEditorCreationParameters.java @@ -70,7 +70,7 @@ public static Builder newFormDescriptionEditorCreationParameters(FormDescription @Override public String toString() { - String pattern = "{0} '{'id: {1}, formDescriptionEditorDescriptionId: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, formDescriptionEditorDescriptionId: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.formDescriptionEditorDescription.getId()); } diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/api/IFormDescriptionEditorContext.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/api/IFormDescriptionEditorContext.java index 059a6de5e1..02a5d7f333 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/api/IFormDescriptionEditorContext.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/api/IFormDescriptionEditorContext.java @@ -24,7 +24,7 @@ public interface IFormDescriptionEditorContext { /** * The name of the variable used to store and retrieve the form description editor context from a variable manager. */ - String FORMDESCRIPTIONEDITOR_CONTEXT = "formDescriptionEditorContext"; //$NON-NLS-1$ + String FORMDESCRIPTIONEDITOR_CONTEXT = "formDescriptionEditorContext"; FormDescriptionEditor getFormDescriptionEditor(); diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/configuration/CollaborativeFormDescriptionEditorMessageServiceConfiguration.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/configuration/CollaborativeFormDescriptionEditorMessageServiceConfiguration.java index f1a31e43ce..e6fa4fa33d 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/configuration/CollaborativeFormDescriptionEditorMessageServiceConfiguration.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/configuration/CollaborativeFormDescriptionEditorMessageServiceConfiguration.java @@ -24,7 +24,7 @@ */ @Configuration public class CollaborativeFormDescriptionEditorMessageServiceConfiguration { - private static final String PATH = "messages/sirius-web-spring-collaborative-formdescriptioneditors"; //$NON-NLS-1$ + private static final String PATH = "messages/sirius-web-spring-collaborative-formdescriptioneditors"; @Bean public MessageSourceAccessor collaborativeFormDescriptionEditorMessageSourceAccessor() { diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/AddGroupInput.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/AddGroupInput.java index 55016a5a9c..2849bf7dd1 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/AddGroupInput.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/AddGroupInput.java @@ -64,7 +64,7 @@ public int getIndex() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, index: {4}}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, index: {4}}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.representationId, this.index); } diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/AddGroupSuccessPayload.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/AddGroupSuccessPayload.java index bc715cdb2d..01b69ed2a1 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/AddGroupSuccessPayload.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/AddGroupSuccessPayload.java @@ -37,7 +37,7 @@ public UUID getId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/AddToolbarActionInput.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/AddToolbarActionInput.java index e8953b4e8d..1b58d5153e 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/AddToolbarActionInput.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/AddToolbarActionInput.java @@ -64,7 +64,7 @@ public String getContainerId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, containerId: {4}}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, containerId: {4}}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.representationId, this.containerId); } diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/AddToolbarActionSuccessPayload.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/AddToolbarActionSuccessPayload.java index 4bfb9c7cd0..b7318fb4fe 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/AddToolbarActionSuccessPayload.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/AddToolbarActionSuccessPayload.java @@ -37,7 +37,7 @@ public UUID getId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/AddWidgetInput.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/AddWidgetInput.java index d91f192606..1005844db9 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/AddWidgetInput.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/AddWidgetInput.java @@ -78,7 +78,7 @@ public int getIndex() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, containerId: {4}, kind: {5}, index: {6}}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, containerId: {4}, kind: {5}, index: {6}}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.representationId, this.containerId, this.kind, this.index); } diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/AddWidgetSuccessPayload.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/AddWidgetSuccessPayload.java index d921ef09eb..20f1214891 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/AddWidgetSuccessPayload.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/AddWidgetSuccessPayload.java @@ -37,7 +37,7 @@ public UUID getId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/DeleteGroupInput.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/DeleteGroupInput.java index a46b2d787b..695076c966 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/DeleteGroupInput.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/DeleteGroupInput.java @@ -64,7 +64,7 @@ public String getGroupId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}; groupId: {4}}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}; groupId: {4}}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.representationId, this.groupId); } diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/DeleteGroupSuccessPayload.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/DeleteGroupSuccessPayload.java index 99c0da0ef0..06aff65c66 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/DeleteGroupSuccessPayload.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/DeleteGroupSuccessPayload.java @@ -37,7 +37,7 @@ public UUID getId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/DeleteToolbarActionInput.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/DeleteToolbarActionInput.java index 481d960682..1dd3ff64b9 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/DeleteToolbarActionInput.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/DeleteToolbarActionInput.java @@ -64,7 +64,7 @@ public String getToolbarActionId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}; toolbarActionId: {4}}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}; toolbarActionId: {4}}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.representationId, this.toolbarActionId); } diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/DeleteToolbarActionSuccessPayload.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/DeleteToolbarActionSuccessPayload.java index 466acf0160..548de4ac44 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/DeleteToolbarActionSuccessPayload.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/DeleteToolbarActionSuccessPayload.java @@ -37,7 +37,7 @@ public UUID getId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/DeleteWidgetInput.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/DeleteWidgetInput.java index 944bb43ef4..6816e843d2 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/DeleteWidgetInput.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/DeleteWidgetInput.java @@ -64,7 +64,7 @@ public String getWidgetId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}; widgetId: {4}}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}; widgetId: {4}}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.representationId, this.widgetId); } diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/DeleteWidgetSuccessPayload.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/DeleteWidgetSuccessPayload.java index 3bfd70604e..63ac6ec2b2 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/DeleteWidgetSuccessPayload.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/DeleteWidgetSuccessPayload.java @@ -37,7 +37,7 @@ public UUID getId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/FormDescriptionEditorEventInput.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/FormDescriptionEditorEventInput.java index f1e84ddfd8..cb7cc22da6 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/FormDescriptionEditorEventInput.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/FormDescriptionEditorEventInput.java @@ -55,7 +55,7 @@ public String getFormDescriptionEditorId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, formDescriptionEditorId: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, formDescriptionEditorId: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.editingContextId, this.formDescriptionEditorId); } } diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/FormDescriptionEditorRefreshedEventPayload.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/FormDescriptionEditorRefreshedEventPayload.java index 6678dff0c7..fe83bcef44 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/FormDescriptionEditorRefreshedEventPayload.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/FormDescriptionEditorRefreshedEventPayload.java @@ -45,7 +45,7 @@ public FormDescriptionEditor getFormDescriptionEditor() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, formDescriptionEditor: '{'id: {2}, label: {3}'}''}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, formDescriptionEditor: '{'id: {2}, label: {3}'}''}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.formDescriptionEditor.getId(), this.formDescriptionEditor.getLabel()); } } diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/MoveGroupInput.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/MoveGroupInput.java index 2be671a180..4358870b07 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/MoveGroupInput.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/MoveGroupInput.java @@ -71,7 +71,7 @@ public int getIndex() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, groupId: {4}, index: {5}}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, groupId: {4}, index: {5}}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.representationId, this.groupId, this.index); } diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/MoveGroupSuccessPayload.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/MoveGroupSuccessPayload.java index 0bf3e7393b..8d6a9af54c 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/MoveGroupSuccessPayload.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/MoveGroupSuccessPayload.java @@ -37,7 +37,7 @@ public UUID getId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/MoveToolbarActionInput.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/MoveToolbarActionInput.java index c3a34de452..fd674f8ab0 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/MoveToolbarActionInput.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/MoveToolbarActionInput.java @@ -78,7 +78,7 @@ public int getIndex() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, containerId: {4}, toolbarActionId: {5}, index: {6}}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, containerId: {4}, toolbarActionId: {5}, index: {6}}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.representationId, this.containerId, this.toolbarActionId, this.index); } diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/MoveToolbarActionSuccessPayload.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/MoveToolbarActionSuccessPayload.java index 801ffd42f1..b38580a334 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/MoveToolbarActionSuccessPayload.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/MoveToolbarActionSuccessPayload.java @@ -37,7 +37,7 @@ public UUID getId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/MoveWidgetInput.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/MoveWidgetInput.java index a34105b5e6..8b825a70e0 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/MoveWidgetInput.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/MoveWidgetInput.java @@ -78,7 +78,7 @@ public int getIndex() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, containerId: {4}, widgetId: {5}, index: {6}}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, containerId: {4}, widgetId: {5}, index: {6}}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.representationId, this.containerId, this.widgetId, this.index); } diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/MoveWidgetSuccessPayload.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/MoveWidgetSuccessPayload.java index c89d117a73..3ab0f22d79 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/MoveWidgetSuccessPayload.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/MoveWidgetSuccessPayload.java @@ -37,7 +37,7 @@ public UUID getId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/RenameFormDescriptionEditorInput.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/RenameFormDescriptionEditorInput.java index 0c268de387..453fa93d2f 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/RenameFormDescriptionEditorInput.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/dto/RenameFormDescriptionEditorInput.java @@ -64,7 +64,7 @@ public String getNewLabel() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, formDescriptionEditorId: {3}, newLabel: {4}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, formDescriptionEditorId: {3}, newLabel: {4}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.formDescriptionEditorId, this.newLabel); } } diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/AddToolbarActionEventHandler.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/AddToolbarActionEventHandler.java index aa8fc1ec36..4b9f35223f 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/AddToolbarActionEventHandler.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/AddToolbarActionEventHandler.java @@ -101,7 +101,7 @@ private boolean addToolbarAction(IEditingContext editingContext, IFormDescriptio Object container = optionalSelf.get(); if (container instanceof GroupDescription) { var toolbarActionDescription = ViewFactory.eINSTANCE.createButtonDescription(); - toolbarActionDescription.setName("ToolbarAction"); //$NON-NLS-1$ + toolbarActionDescription.setName("ToolbarAction"); var toolbarActionDescriptionStyle = ViewFactory.eINSTANCE.createButtonDescriptionStyle(); toolbarActionDescription.setStyle(toolbarActionDescriptionStyle); ((GroupDescription) container).getToolbarActions().add(toolbarActionDescription); diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/AddWidgetEventHandler.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/AddWidgetEventHandler.java index 1a981c6ab4..a0c1701e51 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/AddWidgetEventHandler.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/AddWidgetEventHandler.java @@ -103,7 +103,7 @@ private boolean addWidget(IEditingContext editingContext, IFormDescriptionEditor var optionalSelf = this.objectService.getObject(editingContext, containerId); if (optionalSelf.isPresent()) { Object container = optionalSelf.get(); - EClassifier eClassifier = ViewPackage.eINSTANCE.getEClassifier(kind + "Description"); //$NON-NLS-1$ + EClassifier eClassifier = ViewPackage.eINSTANCE.getEClassifier(kind + "Description"); if (eClassifier instanceof EClass) { var widgetDescription = ViewFactory.eINSTANCE.create((EClass) eClassifier); if (widgetDescription instanceof FlexboxContainerDescription) { @@ -125,7 +125,7 @@ private boolean addWidget(IEditingContext editingContext, IFormDescriptionEditor } private void createStyle(WidgetDescription widgetDescription) { - EStructuralFeature styleFeature = widgetDescription.eClass().getEStructuralFeature("style"); //$NON-NLS-1$ + EStructuralFeature styleFeature = widgetDescription.eClass().getEStructuralFeature("style"); if (styleFeature instanceof EReference) { EClassifier eClassifier = styleFeature.getEType(); if (eClassifier instanceof EClass) { diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/messages/CollaborativeFormDescriptionEditorMessageService.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/messages/CollaborativeFormDescriptionEditorMessageService.java index 57b2009240..611bcf5f90 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/messages/CollaborativeFormDescriptionEditorMessageService.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/messages/CollaborativeFormDescriptionEditorMessageService.java @@ -33,6 +33,6 @@ public CollaborativeFormDescriptionEditorMessageService(@Qualifier("collaborativ @Override public String invalidInput(String expectedInputTypeName, String receivedInputTypeName) { - return this.messageSourceAccessor.getMessage("INVALID_INPUT", new Object[] { expectedInputTypeName, receivedInputTypeName }); //$NON-NLS-1$ + return this.messageSourceAccessor.getMessage("INVALID_INPUT", new Object[] { expectedInputTypeName, receivedInputTypeName }); } } diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/messages/ICollaborativeFormDescriptionEditorMessageService.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/messages/ICollaborativeFormDescriptionEditorMessageService.java index 31ca3b1488..9332376efb 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/messages/ICollaborativeFormDescriptionEditorMessageService.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/messages/ICollaborativeFormDescriptionEditorMessageService.java @@ -29,7 +29,7 @@ class NoOp implements ICollaborativeFormDescriptionEditorMessageService { @Override public String invalidInput(String expectedInputTypeName, String receivedInputTypeName) { - return ""; //$NON-NLS-1$ + return ""; } } diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/services/FormDescriptionEditorDeserializer.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/services/FormDescriptionEditorDeserializer.java index a965b3fd8c..d91cc87f74 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/services/FormDescriptionEditorDeserializer.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/services/FormDescriptionEditorDeserializer.java @@ -39,7 +39,7 @@ public class FormDescriptionEditorDeserializer implements IRepresentationDeseria @Override public boolean canHandle(ObjectNode root) { // @formatter:off - return Optional.ofNullable(root.get("kind")) //$NON-NLS-1$ + return Optional.ofNullable(root.get("kind")) .map(JsonNode::asText) .filter(FormDescriptionEditor.KIND::equals) .isPresent(); diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/services/FormDescriptionEditorRepresentationDescriptionsProvider.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/services/FormDescriptionEditorRepresentationDescriptionsProvider.java index 369e0bef9d..701b9ab8d3 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/services/FormDescriptionEditorRepresentationDescriptionsProvider.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/services/FormDescriptionEditorRepresentationDescriptionsProvider.java @@ -31,7 +31,7 @@ public class FormDescriptionEditorRepresentationDescriptionsProvider implements @Override public boolean canHandle(IRepresentationDescription representationDescription) { - return representationDescription.getId().equals(UUID.nameUUIDFromBytes("FormDescriptionEditor".getBytes()).toString()); //$NON-NLS-1$ + return representationDescription.getId().equals(UUID.nameUUIDFromBytes("FormDescriptionEditor".getBytes()).toString()); } @Override diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/FormDescriptionEditorEventProcessorTests.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/FormDescriptionEditorEventProcessorTests.java index 7c61374f4c..e48e96dd56 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/FormDescriptionEditorEventProcessorTests.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/FormDescriptionEditorEventProcessorTests.java @@ -48,7 +48,7 @@ public class FormDescriptionEditorEventProcessorTests { private static final FormDescriptionEditor INITIAL_TEST_FORMDESCRIPTIONEDITOR = FormDescriptionEditor.newFormDescriptionEditor(FORMDESCRIPTIONEDITOR_ID) .descriptionId(FORMDESCRIPTIONEDITOR_DESCRIPTION_ID) .label(String.valueOf(0)) - .targetObjectId("targetObjectId") //$NON-NLS-1$ + .targetObjectId("targetObjectId") .groups(List.of()) .build(); // @formatter:on diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/TestFormDescriptionEditorBuilder.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/TestFormDescriptionEditorBuilder.java index dce221f2bb..b5370ad2ec 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/TestFormDescriptionEditorBuilder.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/TestFormDescriptionEditorBuilder.java @@ -25,24 +25,24 @@ */ public class TestFormDescriptionEditorBuilder { - public static final String IMAGE_PNG = "/image.png"; //$NON-NLS-1$ + public static final String IMAGE_PNG = "/image.png"; public static final String TOOL_IMAGE_URL = IMAGE_PNG; - public static final String TOOL_LABEL = "toolLabel"; //$NON-NLS-1$ + public static final String TOOL_LABEL = "toolLabel"; public FormDescriptionEditor getFormDescriptionEditor(String id) { // @formatter:off Group group = Group.newGroup(UUID.randomUUID().toString()) - .label("group1") //$NON-NLS-1$ + .label("group1") .widgets(List.of()) .toolbarActions(List.of()) .build(); return FormDescriptionEditor.newFormDescriptionEditor(id) - .label("formDescriptionEditorLabel") //$NON-NLS-1$ + .label("formDescriptionEditorLabel") .descriptionId(UUID.randomUUID().toString()) - .targetObjectId("formDescriptionEditorTargetObjectId") //$NON-NLS-1$ + .targetObjectId("formDescriptionEditorTargetObjectId") .groups(List.of(group)) .build(); // @formatter:on diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/TestFormDescriptionEditorDescriptionBuilder.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/TestFormDescriptionEditorDescriptionBuilder.java index d3e5eb36b9..084caba8a3 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/TestFormDescriptionEditorDescriptionBuilder.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/TestFormDescriptionEditorDescriptionBuilder.java @@ -24,9 +24,9 @@ public class TestFormDescriptionEditorDescriptionBuilder { public FormDescriptionEditorDescription getFormDescriptionEditorDescription(String formDescriptionEditorDescriptionId) { // @formatter:off return FormDescriptionEditorDescription.newFormDescriptionEditorDescription(formDescriptionEditorDescriptionId) - .label("") //$NON-NLS-1$ + .label("") .canCreatePredicate(variableManager -> Boolean.TRUE) - .targetObjectIdProvider(variableManager -> "targetObjectId") //$NON-NLS-1$ + .targetObjectIdProvider(variableManager -> "targetObjectId") .build(); // @formatter:on } diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/architecture/ArchitectureConstants.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/architecture/ArchitectureConstants.java index 15533d8961..16c97672f0 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/architecture/ArchitectureConstants.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/architecture/ArchitectureConstants.java @@ -22,7 +22,7 @@ * @author arichard */ public final class ArchitectureConstants { - public static final String SIRIUS_COMPONENTS_COLLABORATIVE_FORMDESCRIPTIONEDITORS_ROOT_PACKAGE = "org.eclipse.sirius.components.collaborative.formdescriptioneditors.."; //$NON-NLS-1$ + public static final String SIRIUS_COMPONENTS_COLLABORATIVE_FORMDESCRIPTIONEDITORS_ROOT_PACKAGE = "org.eclipse.sirius.components.collaborative.formdescriptioneditors.."; // @formatter:off public static final JavaClasses CLASSES = new ClassFileImporter() diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/AddToolbarActionEventHandlerTests.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/AddToolbarActionEventHandlerTests.java index 5423286555..8a08b16c1b 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/AddToolbarActionEventHandlerTests.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/AddToolbarActionEventHandlerTests.java @@ -56,7 +56,7 @@ public Optional getObject(IEditingContext editingContext, String objectI } }; var handler = new AddToolbarActionEventHandler(objectService, new ICollaborativeFormDescriptionEditorMessageService.NoOp(), new SimpleMeterRegistry()); - var input = new AddToolbarActionInput(UUID.randomUUID(), "editingContextId", "representationId", "containerId"); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ + var input = new AddToolbarActionInput(UUID.randomUUID(), "editingContextId", "representationId", "containerId"); assertThat(handler.canHandle(input)).isTrue(); diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/AddWidgetEventHandlerTests.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/AddWidgetEventHandlerTests.java index 2b07450af8..167612dc80 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/AddWidgetEventHandlerTests.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/AddWidgetEventHandlerTests.java @@ -51,7 +51,7 @@ public Optional getObject(IEditingContext editingContext, String objectI } }; var handler = new AddWidgetEventHandler(objectService, new ICollaborativeFormDescriptionEditorMessageService.NoOp(), new SimpleMeterRegistry()); - var input = new AddWidgetInput(UUID.randomUUID(), "editingContextId", "representationId", "containerId", "Checkbox", 0); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + var input = new AddWidgetInput(UUID.randomUUID(), "editingContextId", "representationId", "containerId", "Checkbox", 0); assertThat(handler.canHandle(input)).isTrue(); diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/CreateFormDescriptionEditorEventHandlerTests.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/CreateFormDescriptionEditorEventHandlerTests.java index 0a0e376a80..a0579e0bf2 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/CreateFormDescriptionEditorEventHandlerTests.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/CreateFormDescriptionEditorEventHandlerTests.java @@ -52,9 +52,9 @@ public void testFormDescriptionEditorCreation() { public Optional findById(IEditingContext editingContext, String id) { // @formatter:off FormDescriptionEditorDescription formDescriptionEditorDescription = FormDescriptionEditorDescription.newFormDescriptionEditorDescription(UUID.randomUUID().toString()) - .label("label") //$NON-NLS-1$ + .label("label") .canCreatePredicate(variableManager -> Boolean.TRUE) - .targetObjectIdProvider(variableManager -> "targetObjectId") //$NON-NLS-1$ + .targetObjectIdProvider(variableManager -> "targetObjectId") .build(); // @formatter:on @@ -82,7 +82,7 @@ public Optional getObject(IEditingContext editingContext, String objectI CreateFormDescriptionEditorEventHandler handler = new CreateFormDescriptionEditorEventHandler(representationDescriptionSearchService, objectService, new ICollaborativeFormDescriptionEditorMessageService.NoOp(), formDescriptionEditorCreationService, new SimpleMeterRegistry()); - var input = new CreateRepresentationInput(UUID.randomUUID(), UUID.randomUUID().toString(), UUID.randomUUID().toString(), "objectId", "representationName"); //$NON-NLS-1$//$NON-NLS-2$ + var input = new CreateRepresentationInput(UUID.randomUUID(), UUID.randomUUID().toString(), UUID.randomUUID().toString(), "objectId", "representationName"); assertThat(handler.canHandle(null, input)).isTrue(); Many changeDescriptionSink = Sinks.many().unicast().onBackpressureBuffer(); diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/DeleteToolbarActionEventHandlerTests.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/DeleteToolbarActionEventHandlerTests.java index d830719bc9..107372f5b9 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/DeleteToolbarActionEventHandlerTests.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/DeleteToolbarActionEventHandlerTests.java @@ -48,7 +48,7 @@ * @author arichard */ public class DeleteToolbarActionEventHandlerTests { - private static final String TOOLBAR_ACTION_ID = "toolbarActionId"; //$NON-NLS-1$ + private static final String TOOLBAR_ACTION_ID = "toolbarActionId"; @Test public void testDeleteToolbarAction() { @@ -81,7 +81,7 @@ public void delete(Object object) { } }; var handler = new DeleteToolbarActionEventHandler(objectService, editService, new ICollaborativeFormDescriptionEditorMessageService.NoOp(), new SimpleMeterRegistry()); - var input = new DeleteToolbarActionInput(UUID.randomUUID(), "editingContextId", "representationId", TOOLBAR_ACTION_ID); //$NON-NLS-1$//$NON-NLS-2$ + var input = new DeleteToolbarActionInput(UUID.randomUUID(), "editingContextId", "representationId", TOOLBAR_ACTION_ID); assertThat(handler.canHandle(input)).isTrue(); diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/DeleteWidgetEventHandlerTests.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/DeleteWidgetEventHandlerTests.java index f2cd88eb3b..11a1b2ea01 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/DeleteWidgetEventHandlerTests.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/DeleteWidgetEventHandlerTests.java @@ -49,7 +49,7 @@ protected boolean deleteWidget(IEditingContext editingContext, IFormDescriptionE return true; } }; - var input = new DeleteWidgetInput(UUID.randomUUID(), "editingContextId", "representationId", "widgetId"); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ + var input = new DeleteWidgetInput(UUID.randomUUID(), "editingContextId", "representationId", "widgetId"); assertThat(handler.canHandle(input)).isTrue(); diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/MoveToolbarActionEventHandlerTests.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/MoveToolbarActionEventHandlerTests.java index 5ca332e29d..792fdf8315 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/MoveToolbarActionEventHandlerTests.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/MoveToolbarActionEventHandlerTests.java @@ -69,11 +69,11 @@ public Optional getObject(IEditingContext editingContext, String objectI Optional result = Optional.empty(); if (formDescriptionEditor.getDescriptionId().equals(objectId)) { result = Optional.of(formDescription); - } else if ("button1".equals(objectId)) { //$NON-NLS-1$ + } else if ("button1".equals(objectId)) { result = Optional.of(toolbarButton1); - } else if ("button2".equals(objectId)) { //$NON-NLS-1$ + } else if ("button2".equals(objectId)) { result = Optional.of(toolbarButton2); - } else if ("button3".equals(objectId)) { //$NON-NLS-1$ + } else if ("button3".equals(objectId)) { result = Optional.of(toolbarButton3); } else if (formDescriptionEditor.getGroups().get(0).getId().equals(objectId)) { result = Optional.of(groupDescription); @@ -82,15 +82,15 @@ public Optional getObject(IEditingContext editingContext, String objectI } }; - this.invokMove(formDescriptionEditor, objectService, "button2", 0); //$NON-NLS-1$ + this.invokMove(formDescriptionEditor, objectService, "button2", 0); assertThat(groupDescription.getToolbarActions()).isEqualTo(List.of(toolbarButton2, toolbarButton1, toolbarButton3)); - this.invokMove(formDescriptionEditor, objectService, "button1", 2); //$NON-NLS-1$ + this.invokMove(formDescriptionEditor, objectService, "button1", 2); assertThat(groupDescription.getToolbarActions()).isEqualTo(List.of(toolbarButton2, toolbarButton3, toolbarButton1)); } private void invokMove(FormDescriptionEditor formDescriptionEditor, NoOp objectService, String toolbarActionId, int index) { var handler = new MoveToolbarActionEventHandler(objectService, new ICollaborativeFormDescriptionEditorMessageService.NoOp(), new SimpleMeterRegistry()); - var input = new MoveToolbarActionInput(UUID.randomUUID(), "editingContextId", formDescriptionEditor.getId(), formDescriptionEditor.getGroups().get(0).getId(), toolbarActionId, index); //$NON-NLS-1$ + var input = new MoveToolbarActionInput(UUID.randomUUID(), "editingContextId", formDescriptionEditor.getId(), formDescriptionEditor.getGroups().get(0).getId(), toolbarActionId, index); assertThat(handler.canHandle(input)).isTrue(); diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/MoveWidgetEventHandlerTests.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/MoveWidgetEventHandlerTests.java index 8d1e57a2a6..eef923f4fe 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/MoveWidgetEventHandlerTests.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/MoveWidgetEventHandlerTests.java @@ -52,7 +52,7 @@ public Optional getObject(IEditingContext editingContext, String objectI }; var handler = new MoveWidgetEventHandler(objectService, new ICollaborativeFormDescriptionEditorMessageService.NoOp(), new SimpleMeterRegistry()); - var input = new MoveWidgetInput(UUID.randomUUID(), "editingContextId", "representationId", "containerId", "widgetId", 0); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + var input = new MoveWidgetInput(UUID.randomUUID(), "editingContextId", "representationId", "containerId", "widgetId", 0); assertThat(handler.canHandle(input)).isTrue(); diff --git a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/RenameFormDescriptionEditorEventHandlerTests.java b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/RenameFormDescriptionEditorEventHandlerTests.java index 829e99539a..34c4267598 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/RenameFormDescriptionEditorEventHandlerTests.java +++ b/packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/collaborative/formdescriptioneditors/handlers/RenameFormDescriptionEditorEventHandlerTests.java @@ -40,9 +40,9 @@ * @author arichard */ public class RenameFormDescriptionEditorEventHandlerTests { - private static final String OLD_LABEL = "oldLabel"; //$NON-NLS-1$ + private static final String OLD_LABEL = "oldLabel"; - private static final String NEW_LABEL = "newLabel"; //$NON-NLS-1$ + private static final String NEW_LABEL = "newLabel"; @Test public void testRenameRepresentation() { diff --git a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/mutation/MutationAddGroupDataFetcher.java b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/mutation/MutationAddGroupDataFetcher.java index 7ab261547d..35a63e17ba 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/mutation/MutationAddGroupDataFetcher.java +++ b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/mutation/MutationAddGroupDataFetcher.java @@ -34,7 +34,7 @@ @MutationDataFetcher(type = "Mutation", field = "addGroup") public class MutationAddGroupDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/mutation/MutationAddToolbarActionDataFetcher.java b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/mutation/MutationAddToolbarActionDataFetcher.java index 5b273aebfb..25dc913629 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/mutation/MutationAddToolbarActionDataFetcher.java +++ b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/mutation/MutationAddToolbarActionDataFetcher.java @@ -34,7 +34,7 @@ @MutationDataFetcher(type = "Mutation", field = "addToolbarAction") public class MutationAddToolbarActionDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/mutation/MutationAddWidgetDataFetcher.java b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/mutation/MutationAddWidgetDataFetcher.java index 91260caba3..425fc0ccda 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/mutation/MutationAddWidgetDataFetcher.java +++ b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/mutation/MutationAddWidgetDataFetcher.java @@ -34,7 +34,7 @@ @MutationDataFetcher(type = "Mutation", field = "addWidget") public class MutationAddWidgetDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/mutation/MutationDeleteGroupDataFetcher.java b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/mutation/MutationDeleteGroupDataFetcher.java index ec9b20ce86..d6b68dfbe0 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/mutation/MutationDeleteGroupDataFetcher.java +++ b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/mutation/MutationDeleteGroupDataFetcher.java @@ -34,7 +34,7 @@ @MutationDataFetcher(type = "Mutation", field = "deleteGroup") public class MutationDeleteGroupDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/mutation/MutationDeleteToolbarActionDataFetcher.java b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/mutation/MutationDeleteToolbarActionDataFetcher.java index 7fd6e33dc6..6c54db5a4b 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/mutation/MutationDeleteToolbarActionDataFetcher.java +++ b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/mutation/MutationDeleteToolbarActionDataFetcher.java @@ -34,7 +34,7 @@ @MutationDataFetcher(type = "Mutation", field = "deleteToolbarAction") public class MutationDeleteToolbarActionDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/mutation/MutationDeleteWidgetDataFetcher.java b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/mutation/MutationDeleteWidgetDataFetcher.java index dac740fe6e..28e40069c6 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/mutation/MutationDeleteWidgetDataFetcher.java +++ b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/mutation/MutationDeleteWidgetDataFetcher.java @@ -34,7 +34,7 @@ @MutationDataFetcher(type = "Mutation", field = "deleteWidget") public class MutationDeleteWidgetDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/mutation/MutationMoveGroupDataFetcher.java b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/mutation/MutationMoveGroupDataFetcher.java index a9bd304755..b95f23941c 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/mutation/MutationMoveGroupDataFetcher.java +++ b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/mutation/MutationMoveGroupDataFetcher.java @@ -34,7 +34,7 @@ @MutationDataFetcher(type = "Mutation", field = "moveGroup") public class MutationMoveGroupDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/mutation/MutationMoveToolbarActionDataFetcher.java b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/mutation/MutationMoveToolbarActionDataFetcher.java index 20a9fcf2e0..eb1c0e7a99 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/mutation/MutationMoveToolbarActionDataFetcher.java +++ b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/mutation/MutationMoveToolbarActionDataFetcher.java @@ -34,7 +34,7 @@ @MutationDataFetcher(type = "Mutation", field = "moveToolbarAction") public class MutationMoveToolbarActionDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/mutation/MutationMoveWidgetDataFetcher.java b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/mutation/MutationMoveWidgetDataFetcher.java index 0978e2bd7f..ccfb03c967 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/mutation/MutationMoveWidgetDataFetcher.java +++ b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/mutation/MutationMoveWidgetDataFetcher.java @@ -34,7 +34,7 @@ @MutationDataFetcher(type = "Mutation", field = "moveWidget") public class MutationMoveWidgetDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/subscription/SubscriptionFormDescriptionEditorEventDataFetcher.java b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/subscription/SubscriptionFormDescriptionEditorEventDataFetcher.java index 22b6472d8b..d298a42c8e 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/subscription/SubscriptionFormDescriptionEditorEventDataFetcher.java +++ b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/datafetchers/subscription/SubscriptionFormDescriptionEditorEventDataFetcher.java @@ -45,7 +45,7 @@ @SubscriptionDataFetcher(type = "Subscription", field = "formDescriptionEditorEvent") public class SubscriptionFormDescriptionEditorEventDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/test/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/architecture/ArchitectureConstants.java b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/test/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/architecture/ArchitectureConstants.java index 6d16444be5..e42d8eb6e4 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/test/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/architecture/ArchitectureConstants.java +++ b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors-graphql/src/test/java/org/eclipse/sirius/components/formdescriptioneditors/graphql/architecture/ArchitectureConstants.java @@ -22,7 +22,7 @@ * @author gcoutable */ public final class ArchitectureConstants { - public static final String SIRIUS_COMPONENTS_FORMDESCRIPTIONEDITORS_GRAPHQL_ROOT_PACKAGE = "org.eclipse.sirius.components.formdescriptioneditors.graphql.."; //$NON-NLS-1$ + public static final String SIRIUS_COMPONENTS_FORMDESCRIPTIONEDITORS_GRAPHQL_ROOT_PACKAGE = "org.eclipse.sirius.components.formdescriptioneditors.graphql.."; // @formatter:off public static final JavaClasses CLASSES = new ClassFileImporter() diff --git a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/FormDescriptionEditor.java b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/FormDescriptionEditor.java index c50f241999..ea018260d6 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/FormDescriptionEditor.java +++ b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/FormDescriptionEditor.java @@ -29,9 +29,9 @@ @Immutable public final class FormDescriptionEditor implements IRepresentation, ISemanticRepresentation { - public static final String KIND = IRepresentation.KIND_PREFIX + "?type=FormDescriptionEditor"; //$NON-NLS-1$ + public static final String KIND = IRepresentation.KIND_PREFIX + "?type=FormDescriptionEditor"; - public static final String LABEL = "label"; //$NON-NLS-1$ + public static final String LABEL = "label"; private String id; @@ -88,7 +88,7 @@ public static Builder newFormDescriptionEditor(FormDescriptionEditor formDescrip @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, targetObjectId: {3}, descriptionId: {4}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, targetObjectId: {3}, descriptionId: {4}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label, this.targetObjectId, this.descriptionId); } diff --git a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/components/FormDescriptionEditorComponent.java b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/components/FormDescriptionEditorComponent.java index 3a677cb01f..5d75d55e0b 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/components/FormDescriptionEditorComponent.java +++ b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/components/FormDescriptionEditorComponent.java @@ -50,7 +50,7 @@ public Element render() { // @formatter:off String label = optionalPreviousFormDescriptionEditor.map(FormDescriptionEditor::getLabel) .orElseGet(() -> variableManager.get(FormDescriptionEditor.LABEL, String.class) - .orElse("Form Description Editor")); //$NON-NLS-1$ + .orElse("Form Description Editor")); // @formatter:on Function targetObjectIdProvider = formDescriptionEditorDescription.getTargetObjectIdProvider(); String targetObjectId = targetObjectIdProvider.apply(variableManager); diff --git a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/components/FormDescriptionEditorGroupComponent.java b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/components/FormDescriptionEditorGroupComponent.java index fa5d217f5c..0194258d40 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/components/FormDescriptionEditorGroupComponent.java +++ b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/components/FormDescriptionEditorGroupComponent.java @@ -35,7 +35,7 @@ */ public class FormDescriptionEditorGroupComponent implements IComponent { - private static final String AQL_PREFIX = "aql:"; //$NON-NLS-1$ + private static final String AQL_PREFIX = "aql:"; private final FormDescriptionEditorGroupComponentProps props; @@ -51,7 +51,7 @@ public Element render() { VariableManager variableManager = this.props.getVariableManager(); var groupDescription = variableManager.get(VariableManager.SELF, GroupDescription.class).get(); String id = this.props.getFormDescriptionEditorDescription().getTargetObjectIdProvider().apply(variableManager); - String label = this.getGroupLabel(groupDescription, "Group"); //$NON-NLS-1$ + String label = this.getGroupLabel(groupDescription, "Group"); List childrenWidgets = new ArrayList<>(); groupDescription.getToolbarActions().forEach(viewToolbarActionDescription -> { diff --git a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/components/ViewFormDescriptionEditorConverterSwitch.java b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/components/ViewFormDescriptionEditorConverterSwitch.java index d22b2eedc8..4ec05c8ff6 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/components/ViewFormDescriptionEditorConverterSwitch.java +++ b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/components/ViewFormDescriptionEditorConverterSwitch.java @@ -73,7 +73,7 @@ */ public class ViewFormDescriptionEditorConverterSwitch extends ViewSwitch { - private static final String AQL_PREFIX = "aql:"; //$NON-NLS-1$ + private static final String AQL_PREFIX = "aql:"; private final FormDescriptionEditorDescription formDescriptionEditorDescription; @@ -101,12 +101,12 @@ public AbstractWidgetDescription caseTextfieldDescription(org.eclipse.sirius.com // @formatter:off return TextfieldDescription.newTextfieldDescription(UUID.randomUUID().toString()) .idProvider(vm -> id) - .labelProvider(vm -> this.getWidgetLabel(viewTextfieldDescription, "Textfield")) //$NON-NLS-1$ - .valueProvider(vm -> "") //$NON-NLS-1$ + .labelProvider(vm -> this.getWidgetLabel(viewTextfieldDescription, "Textfield")) + .valueProvider(vm -> "") .newValueHandler((vm, value) -> new Success()) .diagnosticsProvider(vm -> List.of()) - .kindProvider(object -> "") //$NON-NLS-1$ - .messageProvider(object -> "") //$NON-NLS-1$ + .kindProvider(object -> "") + .messageProvider(object -> "") .styleProvider(styleProvider) .build(); // @formatter:on @@ -129,12 +129,12 @@ public AbstractWidgetDescription caseCheckboxDescription(org.eclipse.sirius.comp // @formatter:off return CheckboxDescription.newCheckboxDescription(UUID.randomUUID().toString()) .idProvider(vm -> id) - .labelProvider(vm -> this.getWidgetLabel(viewCheckboxDescription, "Checkbox")) //$NON-NLS-1$ + .labelProvider(vm -> this.getWidgetLabel(viewCheckboxDescription, "Checkbox")) .valueProvider(vm -> true) .newValueHandler((vm, value) -> new Success()) .diagnosticsProvider(vm -> List.of()) - .kindProvider(object -> "") //$NON-NLS-1$ - .messageProvider(object -> "") //$NON-NLS-1$ + .kindProvider(object -> "") + .messageProvider(object -> "") .styleProvider(styleProvider) .build(); // @formatter:on @@ -157,15 +157,15 @@ public AbstractWidgetDescription caseSelectDescription(org.eclipse.sirius.compon // @formatter:off return SelectDescription.newSelectDescription(UUID.randomUUID().toString()) .idProvider(vm -> id) - .labelProvider(vm -> this.getWidgetLabel(viewSelectDescription, "Select")) //$NON-NLS-1$ - .valueProvider(vm -> "") //$NON-NLS-1$ - .optionIdProvider(vm -> "") //$NON-NLS-1$ - .optionLabelProvider(vm -> "") //$NON-NLS-1$ + .labelProvider(vm -> this.getWidgetLabel(viewSelectDescription, "Select")) + .valueProvider(vm -> "") + .optionIdProvider(vm -> "") + .optionLabelProvider(vm -> "") .optionsProvider(vm -> List.of()) .newValueHandler((vm, value) -> new Success()) .diagnosticsProvider(vm -> List.of()) - .kindProvider(object -> "") //$NON-NLS-1$ - .messageProvider(object -> "") //$NON-NLS-1$ + .kindProvider(object -> "") + .messageProvider(object -> "") .styleProvider(styleProvider) .build(); // @formatter:on @@ -188,12 +188,12 @@ public AbstractWidgetDescription caseTextAreaDescription(org.eclipse.sirius.comp // @formatter:off return TextareaDescription.newTextareaDescription(UUID.randomUUID().toString()) .idProvider(vm -> id) - .labelProvider(vm -> this.getWidgetLabel(viewTextareaDescription, "Textarea")) //$NON-NLS-1$ - .valueProvider(vm -> "") //$NON-NLS-1$ + .labelProvider(vm -> this.getWidgetLabel(viewTextareaDescription, "Textarea")) + .valueProvider(vm -> "") .newValueHandler((vm, value) -> new Success()) .diagnosticsProvider(vm -> List.of()) - .kindProvider(object -> "") //$NON-NLS-1$ - .messageProvider(object -> "") //$NON-NLS-1$ + .kindProvider(object -> "") + .messageProvider(object -> "") .styleProvider(styleProvider) .build(); // @formatter:on @@ -216,15 +216,15 @@ public AbstractWidgetDescription caseMultiSelectDescription(org.eclipse.sirius.c // @formatter:off return MultiSelectDescription.newMultiSelectDescription(UUID.randomUUID().toString()) .idProvider(vm -> id) - .labelProvider(vm -> this.getWidgetLabel(viewMultiSelectDescription, "MultiSelect")) //$NON-NLS-1$ + .labelProvider(vm -> this.getWidgetLabel(viewMultiSelectDescription, "MultiSelect")) .valuesProvider(vm -> List.of()) - .optionIdProvider(vm -> "") //$NON-NLS-1$ - .optionLabelProvider(vm -> "") //$NON-NLS-1$ + .optionIdProvider(vm -> "") + .optionLabelProvider(vm -> "") .optionsProvider(vm -> List.of()) .newValuesHandler((vm, values) -> new Success()) .diagnosticsProvider(vm -> List.of()) - .kindProvider(object -> "") //$NON-NLS-1$ - .messageProvider(object -> "") //$NON-NLS-1$ + .kindProvider(object -> "") + .messageProvider(object -> "") .styleProvider(styleProvider) .build(); // @formatter:on @@ -247,15 +247,15 @@ public AbstractWidgetDescription caseRadioDescription(org.eclipse.sirius.compone // @formatter:off return RadioDescription.newRadioDescription(UUID.randomUUID().toString()) .idProvider(vm -> id) - .labelProvider(vm -> this.getWidgetLabel(viewRadioDescription, "Radio")) //$NON-NLS-1$ - .optionIdProvider(vm -> "") //$NON-NLS-1$ - .optionLabelProvider(vm -> "") //$NON-NLS-1$ + .labelProvider(vm -> this.getWidgetLabel(viewRadioDescription, "Radio")) + .optionIdProvider(vm -> "") + .optionLabelProvider(vm -> "") .optionSelectedProvider(vm -> true) .optionsProvider(vm -> List.of()) .newValueHandler((vm, value) -> new Success()) .diagnosticsProvider(vm -> List.of()) - .kindProvider(object -> "") //$NON-NLS-1$ - .messageProvider(object -> "") //$NON-NLS-1$ + .kindProvider(object -> "") + .messageProvider(object -> "") .styleProvider(styleProvider) .build(); // @formatter:on @@ -278,12 +278,12 @@ public AbstractWidgetDescription caseFlexboxContainerDescription(org.eclipse.sir // @formatter:off return FlexboxContainerDescription.newFlexboxContainerDescription(UUID.randomUUID().toString()) .idProvider(vm -> id) - .labelProvider(vm -> this.getWidgetLabel(viewFlexboxContainerDescription, "FlexboxContainer")) //$NON-NLS-1$ + .labelProvider(vm -> this.getWidgetLabel(viewFlexboxContainerDescription, "FlexboxContainer")) .flexDirection(flexDirection) .children(children) .diagnosticsProvider(vm -> List.of()) - .kindProvider(object -> "") //$NON-NLS-1$ - .messageProvider(object -> "") //$NON-NLS-1$ + .kindProvider(object -> "") + .messageProvider(object -> "") .build(); // @formatter:on } @@ -305,13 +305,13 @@ public AbstractWidgetDescription caseButtonDescription(org.eclipse.sirius.compon // @formatter:off return ButtonDescription.newButtonDescription(UUID.randomUUID().toString()) .idProvider(vm -> id) - .labelProvider(vm -> this.getWidgetLabel(viewButtonDescription, "Button")) //$NON-NLS-1$ + .labelProvider(vm -> this.getWidgetLabel(viewButtonDescription, "Button")) .buttonLabelProvider(vm -> viewButtonDescription.getButtonLabelExpression()) .imageURLProvider(vm -> viewButtonDescription.getImageExpression()) .pushButtonHandler(vm -> new Success()) .diagnosticsProvider(vm -> List.of()) - .kindProvider(object -> "") //$NON-NLS-1$ - .messageProvider(object -> "") //$NON-NLS-1$ + .kindProvider(object -> "") + .messageProvider(object -> "") .styleProvider(styleProvider) .build(); // @formatter:on @@ -334,11 +334,11 @@ public AbstractWidgetDescription caseLabelDescription(org.eclipse.sirius.compone // @formatter:off return LabelDescription.newLabelDescription(UUID.randomUUID().toString()) .idProvider(vm -> id) - .labelProvider(vm -> this.getWidgetLabel(viewLabelDescription, "Label")) //$NON-NLS-1$ - .valueProvider(vm -> "") //$NON-NLS-1$ + .labelProvider(vm -> this.getWidgetLabel(viewLabelDescription, "Label")) + .valueProvider(vm -> "") .diagnosticsProvider(vm -> List.of()) - .kindProvider(object -> "") //$NON-NLS-1$ - .messageProvider(object -> "") //$NON-NLS-1$ + .kindProvider(object -> "") + .messageProvider(object -> "") .styleProvider(styleProvider) .build(); // @formatter:on @@ -361,11 +361,11 @@ public AbstractWidgetDescription caseLinkDescription(org.eclipse.sirius.componen // @formatter:off return LinkDescription.newLinkDescription(UUID.randomUUID().toString()) .idProvider(vm -> id) - .labelProvider(vm -> this.getWidgetLabel(viewLinkDescription, "Link")) //$NON-NLS-1$ - .urlProvider(vm -> "") //$NON-NLS-1$ + .labelProvider(vm -> this.getWidgetLabel(viewLinkDescription, "Link")) + .urlProvider(vm -> "") .diagnosticsProvider(vm -> List.of()) - .kindProvider(object -> "") //$NON-NLS-1$ - .messageProvider(object -> "") //$NON-NLS-1$ + .kindProvider(object -> "") + .messageProvider(object -> "") .styleProvider(styleProvider) .build(); // @formatter:on @@ -388,18 +388,18 @@ public AbstractWidgetDescription caseListDescription(org.eclipse.sirius.componen // @formatter:off ListDescription.Builder builder = ListDescription.newListDescription(UUID.randomUUID().toString()) .idProvider(vm -> id) - .labelProvider(vm -> this.getWidgetLabel(viewListDescription, "List")) //$NON-NLS-1$ + .labelProvider(vm -> this.getWidgetLabel(viewListDescription, "List")) .itemsProvider(vm -> List.of()) - .itemKindProvider(vm -> "") //$NON-NLS-1$ + .itemKindProvider(vm -> "") .itemDeleteHandlerProvider(vm -> new Success()) - .itemImageURLProvider(vm -> "") //$NON-NLS-1$ - .itemIdProvider(vm -> "") //$NON-NLS-1$ - .itemLabelProvider(vm -> "") //$NON-NLS-1$ + .itemImageURLProvider(vm -> "") + .itemIdProvider(vm -> "") + .itemLabelProvider(vm -> "") .itemDeletableProvider(vm -> false) .itemClickHandlerProvider(vm -> new Success()) .diagnosticsProvider(vm -> List.of()) - .kindProvider(object -> "") //$NON-NLS-1$ - .messageProvider(object -> "") //$NON-NLS-1$ + .kindProvider(object -> "") + .messageProvider(object -> "") .styleProvider(styleProvider); // @formatter:on @@ -415,11 +415,11 @@ public AbstractWidgetDescription caseImageDescription(org.eclipse.sirius.compone // @formatter:off return ImageDescription.newImageDescription(UUID.randomUUID().toString()) .idProvider(vm -> id) - .labelProvider(vm -> this.getWidgetLabel(viewImageDescription, "Image")) //$NON-NLS-1$ - .urlProvider(vm -> Optional.ofNullable(viewImageDescription.getUrlExpression()).orElse("")) //$NON-NLS-1$ + .labelProvider(vm -> this.getWidgetLabel(viewImageDescription, "Image")) + .urlProvider(vm -> Optional.ofNullable(viewImageDescription.getUrlExpression()).orElse("")) .maxWidthProvider(vm -> viewImageDescription.getMaxWidthExpression()) - .diagnosticsProvider(vm -> List.of()).kindProvider(object -> "") //$NON-NLS-1$ - .messageProvider(object -> "") //$NON-NLS-1$ + .diagnosticsProvider(vm -> List.of()).kindProvider(object -> "") + .messageProvider(object -> "") .build(); // @formatter:on } @@ -433,12 +433,12 @@ public AbstractWidgetDescription caseRichTextDescription(org.eclipse.sirius.comp // @formatter:off return RichTextDescription.newRichTextDescription(UUID.randomUUID().toString()) .idProvider(vm -> id) - .labelProvider(vm -> this.getWidgetLabel(viewRichTextDescription, "RichText")) //$NON-NLS-1$ - .valueProvider(vm -> "") //$NON-NLS-1$ + .labelProvider(vm -> this.getWidgetLabel(viewRichTextDescription, "RichText")) + .valueProvider(vm -> "") .newValueHandler((vm, value) -> new Success()) .diagnosticsProvider(vm -> List.of()) - .kindProvider(object -> "") //$NON-NLS-1$ - .messageProvider(object -> "") //$NON-NLS-1$ + .kindProvider(object -> "") + .messageProvider(object -> "") .build(); // @formatter:on } @@ -455,8 +455,8 @@ public AbstractWidgetDescription caseBarChartDescription(org.eclipse.sirius.comp // @formatter:off IChartDescription chartDescription = BarChartDescription.newBarChartDescription(UUID.randomUUID().toString()) - .label(Optional.ofNullable(viewBarChartDescription.getName()).orElse("")) //$NON-NLS-1$ - .labelProvider(vm -> this.getWidgetLabel(viewBarChartDescription, "BarChart")) //$NON-NLS-1$ + .label(Optional.ofNullable(viewBarChartDescription.getName()).orElse("")) + .labelProvider(vm -> this.getWidgetLabel(viewBarChartDescription, "BarChart")) .keysProvider(vm -> List.of()) .valuesProvider(vm -> List.of()) .styleProvider(styleProvider) @@ -479,7 +479,7 @@ public AbstractWidgetDescription casePieChartDescription(org.eclipse.sirius.comp // @formatter:off IChartDescription chartDescription = PieChartDescription.newPieChartDescription(UUID.randomUUID().toString()) - .label(this.getWidgetLabel(viewPieChartDescription, "PieChart")) //$NON-NLS-1$ + .label(this.getWidgetLabel(viewPieChartDescription, "PieChart")) .keysProvider(vm -> List.of()) .valuesProvider(vm -> List.of()) .styleProvider(styleProvider) @@ -496,11 +496,11 @@ private AbstractWidgetDescription createChartWidgetDescription(org.eclipse.siriu // @formatter:off return ChartWidgetDescription.newChartWidgetDescription(chartDescription.getId()) .idProvider(vm -> id) - .labelProvider(vm -> this.getWidgetLabel(widgetDescription, "Chart")) //$NON-NLS-1$ + .labelProvider(vm -> this.getWidgetLabel(widgetDescription, "Chart")) .chartDescription(chartDescription) .diagnosticsProvider(vm -> List.of()) - .kindProvider(object -> "") //$NON-NLS-1$ - .messageProvider(object -> "") //$NON-NLS-1$ + .kindProvider(object -> "") + .messageProvider(object -> "") .build(); // @formatter:on } diff --git a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/configuration/FormDescriptionEditorDescriptionRegistryConfigurer.java b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/configuration/FormDescriptionEditorDescriptionRegistryConfigurer.java index 9eb0a17fd2..9f749d9fb0 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/configuration/FormDescriptionEditorDescriptionRegistryConfigurer.java +++ b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/configuration/FormDescriptionEditorDescriptionRegistryConfigurer.java @@ -42,8 +42,8 @@ public FormDescriptionEditorDescriptionRegistryConfigurer(IObjectService objectS @Override public void addRepresentationDescriptions(IRepresentationDescriptionRegistry registry) { - UUID id = UUID.nameUUIDFromBytes("FormDescriptionEditor".getBytes()); //$NON-NLS-1$ - String label = "FormDescriptionEditor"; //$NON-NLS-1$ + UUID id = UUID.nameUUIDFromBytes("FormDescriptionEditor".getBytes()); + String label = "FormDescriptionEditor"; //@// @formatter:off Predicate canCreatePredicate = variableManager -> variableManager.get(IRepresentationDescription.CLASS, Object.class) diff --git a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/description/FormDescriptionEditorDescription.java b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/description/FormDescriptionEditorDescription.java index 4c1194c24e..984f1cd755 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/description/FormDescriptionEditorDescription.java +++ b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/description/FormDescriptionEditorDescription.java @@ -68,7 +68,7 @@ public static Builder newFormDescriptionEditorDescription(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label); } diff --git a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/elements/FormDescriptionEditorElementProps.java b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/elements/FormDescriptionEditorElementProps.java index cff4ebed51..bfaee1d677 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/elements/FormDescriptionEditorElementProps.java +++ b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/elements/FormDescriptionEditorElementProps.java @@ -27,7 +27,7 @@ */ @Immutable public final class FormDescriptionEditorElementProps implements IProps { - public static final String TYPE = "FormDescriptionEditor"; //$NON-NLS-1$ + public static final String TYPE = "FormDescriptionEditor"; private String id; @@ -70,7 +70,7 @@ public static Builder newFormDescriptionEditorElementProps(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label); } diff --git a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/formdescriptioneditors/architecture/ArchitectureConstants.java b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/formdescriptioneditors/architecture/ArchitectureConstants.java index baf7b6dee9..bb2fadc880 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/formdescriptioneditors/architecture/ArchitectureConstants.java +++ b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/formdescriptioneditors/architecture/ArchitectureConstants.java @@ -22,7 +22,7 @@ * @author arichard */ public final class ArchitectureConstants { - public static final String SIRIUS_COMPONENTS_FORMDESCRIPTIONEDITORS_ROOT_PACKAGE = "org.eclipse.sirius.components.formdescriptioneditors.."; //$NON-NLS-1$ + public static final String SIRIUS_COMPONENTS_FORMDESCRIPTIONEDITORS_ROOT_PACKAGE = "org.eclipse.sirius.components.formdescriptioneditors.."; // @formatter:off public static final JavaClasses CLASSES = new ClassFileImporter() diff --git a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/formdescriptioneditors/components/ViewFormDescriptionEditorConverterSwitchTests.java b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/formdescriptioneditors/components/ViewFormDescriptionEditorConverterSwitchTests.java index 96d90966f6..614ec30571 100644 --- a/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/formdescriptioneditors/components/ViewFormDescriptionEditorConverterSwitchTests.java +++ b/packages/formdescriptioneditors/backend/sirius-components-formdescriptioneditors/src/test/java/org/eclipse/sirius/components/formdescriptioneditors/components/ViewFormDescriptionEditorConverterSwitchTests.java @@ -29,28 +29,28 @@ */ public class ViewFormDescriptionEditorConverterSwitchTests { - private static final String NAME = "Name"; //$NON-NLS-1$ + private static final String NAME = "Name"; - private static final String LABEL_EXPRESSION = "Label"; //$NON-NLS-1$ + private static final String LABEL_EXPRESSION = "Label"; - private static final String AQL_EXPRESSION = "aql:"; //$NON-NLS-1$ + private static final String AQL_EXPRESSION = "aql:"; - private static final String BLANK_STRING = " "; //$NON-NLS-1$ + private static final String BLANK_STRING = " "; - private static final String DEFAULT_LABEL = "defaultLabel"; //$NON-NLS-1$ + private static final String DEFAULT_LABEL = "defaultLabel"; private static Stream notValidValues() { // @formatter:off return Stream.of( Arguments.of(null, null), - Arguments.of(null, ""), //$NON-NLS-1$ - Arguments.of("", null), //$NON-NLS-1$ + Arguments.of(null, ""), + Arguments.of("", null), Arguments.of(null, BLANK_STRING), Arguments.of(BLANK_STRING, null), - Arguments.of("", ""), //$NON-NLS-1$ //$NON-NLS-2$ + Arguments.of("", ""), Arguments.of(BLANK_STRING, BLANK_STRING), Arguments.of(null, AQL_EXPRESSION), - Arguments.of("", AQL_EXPRESSION), //$NON-NLS-1$ + Arguments.of("", AQL_EXPRESSION), Arguments.of(BLANK_STRING, AQL_EXPRESSION)); // @formatter:on } @@ -59,7 +59,7 @@ private static Stream validLabelExpressionValues() { // @formatter:off return Stream.of( Arguments.of(null, LABEL_EXPRESSION), - Arguments.of("", LABEL_EXPRESSION), //$NON-NLS-1$ + Arguments.of("", LABEL_EXPRESSION), Arguments.of(BLANK_STRING, LABEL_EXPRESSION), Arguments.of(NAME, LABEL_EXPRESSION)); // @formatter:on @@ -69,7 +69,7 @@ private static Stream notValidLabelExpressionValues() { // @formatter:off return Stream.of( Arguments.of(NAME, null), - Arguments.of(NAME, ""), //$NON-NLS-1$ + Arguments.of(NAME, ""), Arguments.of(NAME, BLANK_STRING), Arguments.of(NAME, AQL_EXPRESSION)); // @formatter:on diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/FormDescriptionAggregator.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/FormDescriptionAggregator.java index 8db35ca89b..fdeaf49d6d 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/FormDescriptionAggregator.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/FormDescriptionAggregator.java @@ -57,7 +57,7 @@ public Optional aggregate(List formDescription .map(self -> (List) self) .flatMap(self -> self.stream().findFirst()) .map(objectService::getFullLabel) - .orElse("Properties"); //$NON-NLS-1$ + .orElse("Properties"); // @formatter:on // @formatter:off @@ -69,7 +69,7 @@ public Optional aggregate(List formDescription .orElse(null); return Optional.of(FormDescription.newFormDescription(PropertiesEventProcessorFactory.DETAILS_VIEW_ID) - .label("Aggregated form description") //$NON-NLS-1$ + .label("Aggregated form description") .idProvider(new GetOrCreateRandomIdProvider()) .labelProvider(labelProvider) .targetObjectIdProvider(targetObjectIdProvider) diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/FormEventProcessor.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/FormEventProcessor.java index f6bf8bef0e..5c507a7106 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/FormEventProcessor.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/FormEventProcessor.java @@ -82,7 +82,7 @@ public class FormEventProcessor implements IFormEventProcessor { public FormEventProcessor(IEditingContext editingContext, FormCreationParameters formCreationParameters, List formEventHandlers, ISubscriptionManager subscriptionManager, IWidgetSubscriptionManager widgetSubscriptionManager, IRepresentationRefreshPolicyRegistry representationRefreshPolicyRegistry) { - this.logger.trace("Creating the form event processor {}", formCreationParameters.getId()); //$NON-NLS-1$ + this.logger.trace("Creating the form event processor {}", formCreationParameters.getId()); this.editingContext = Objects.requireNonNull(editingContext); this.formCreationParameters = Objects.requireNonNull(formCreationParameters); @@ -130,7 +130,7 @@ public void handle(One payloadSink, Many changeDesc IFormEventHandler formEventHandler = optionalFormEventHandler.get(); formEventHandler.handle(payloadSink, changeDescriptionSink, this.editingContext, this.currentForm.get(), formInput); } else { - this.logger.warn("No handler found for event: {}", formInput); //$NON-NLS-1$ + this.logger.warn("No handler found for event: {}", formInput); } } } @@ -146,7 +146,7 @@ public void refresh(ChangeDescription changeDescription) { if (this.sink.currentSubscriberCount() > 0) { EmitResult emitResult = this.sink.tryEmitNext(new FormRefreshedEventPayload(changeDescription.getInput().getId(), form)); if (emitResult.isFailure()) { - String pattern = "An error has occurred while emitting a FormRefreshedEventPayload: {}"; //$NON-NLS-1$ + String pattern = "An error has occurred while emitting a FormRefreshedEventPayload: {}"; this.logger.warn(pattern, emitResult); } } @@ -176,7 +176,7 @@ private Form refreshForm() { Element element = new Element(FormComponent.class, formComponentProps); Form form = new FormRenderer().render(element); - this.logger.trace("Form refreshed: {}", form.getId()); //$NON-NLS-1$ + this.logger.trace("Form refreshed: {}", form.getId()); return form; } @@ -197,14 +197,14 @@ public Flux getOutputEvents(IInput input) { @Override public void dispose() { - this.logger.trace("Disposing the form event processor {}", this.formCreationParameters.getId()); //$NON-NLS-1$ + this.logger.trace("Disposing the form event processor {}", this.formCreationParameters.getId()); this.subscriptionManager.dispose(); this.widgetSubscriptionManager.dispose(); EmitResult emitResult = this.sink.tryEmitComplete(); if (emitResult.isFailure()) { - String pattern = "An error has occurred while marking the publisher as complete: {}"; //$NON-NLS-1$ + String pattern = "An error has occurred while marking the publisher as complete: {}"; this.logger.warn(pattern, emitResult); } } diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/FormImagePathService.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/FormImagePathService.java index bc51c29f1e..c9f3633520 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/FormImagePathService.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/FormImagePathService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -26,6 +26,6 @@ public class FormImagePathService implements IImagePathService { @Override public List getPaths() { - return List.of("/form-images/"); //$NON-NLS-1$ + return List.of("/form-images/"); } } diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/FormImageProvider.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/FormImageProvider.java index 36abcc21af..d7b6a8779b 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/FormImageProvider.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/FormImageProvider.java @@ -29,7 +29,7 @@ public class FormImageProvider implements IRepresentationImageProvider { @Override public Optional getImageURL(String kind) { if (Form.KIND.equals(kind)) { - return Optional.of("/form-images/form.svg"); //$NON-NLS-1$ + return Optional.of("/form-images/form.svg"); } return Optional.empty(); } diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/FormQueryService.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/FormQueryService.java index 1b64701160..6857c3e8d3 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/FormQueryService.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/FormQueryService.java @@ -48,7 +48,7 @@ public Optional findWidget(Form form, String widgetId) { // @formatter:on if (optionalWidget.isEmpty()) { - this.logger.warn("The widget with the id {} has not been found", widgetId); //$NON-NLS-1$ + this.logger.warn("The widget with the id {} has not been found", widgetId); } return optionalWidget; diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/PropertiesEventProcessorFactory.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/PropertiesEventProcessorFactory.java index d239a6c3ab..0e3ce94ec0 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/PropertiesEventProcessorFactory.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/PropertiesEventProcessorFactory.java @@ -42,7 +42,7 @@ */ @Service public class PropertiesEventProcessorFactory implements IRepresentationEventProcessorFactory { - public static final String DETAILS_VIEW_ID = UUID.nameUUIDFromBytes("details-view".getBytes()).toString(); //$NON-NLS-1$ + public static final String DETAILS_VIEW_ID = UUID.nameUUIDFromBytes("details-view".getBytes()).toString(); private final IPropertiesDescriptionService propertiesDescriptionService; diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/WidgetSubscriptionManager.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/WidgetSubscriptionManager.java index 9cc345f0d5..30d9592c82 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/WidgetSubscriptionManager.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/WidgetSubscriptionManager.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -49,7 +49,7 @@ public Flux getFlux(IInput input) { public void dispose() { EmitResult emitResult = this.sink.tryEmitComplete(); if (emitResult.isFailure()) { - String pattern = "An error has occurred while marking the publisher as complete: {}"; //$NON-NLS-1$ + String pattern = "An error has occurred while marking the publisher as complete: {}"; this.logger.warn(pattern, emitResult); } } diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/api/FormCreationParameters.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/api/FormCreationParameters.java index b1f82a682f..860854d85a 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/api/FormCreationParameters.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/api/FormCreationParameters.java @@ -74,7 +74,7 @@ public static Builder newFormCreationParameters(FormCreationParameters formCreat @Override public String toString() { - String pattern = "{0} '{'id: {1}, formDescriptionId: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, formDescriptionId: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.formDescription.getId()); } diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/api/PropertiesConfiguration.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/api/PropertiesConfiguration.java index c30babff3c..d48106997a 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/api/PropertiesConfiguration.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/api/PropertiesConfiguration.java @@ -25,7 +25,7 @@ */ public class PropertiesConfiguration implements IRepresentationConfiguration { - private static final String PROPERTIES_PREFIX = "properties:"; //$NON-NLS-1$ + private static final String PROPERTIES_PREFIX = "properties:"; private final String formId; diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/api/RelatedElementsConfiguration.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/api/RelatedElementsConfiguration.java index 95ca02112f..41de00c9ca 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/api/RelatedElementsConfiguration.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/api/RelatedElementsConfiguration.java @@ -25,7 +25,7 @@ */ public class RelatedElementsConfiguration implements IRepresentationConfiguration { - private static final String RELATED_PREFIX = "related:"; //$NON-NLS-1$ + private static final String RELATED_PREFIX = "related:"; private final String formId; diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/api/RepresentationsConfiguration.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/api/RepresentationsConfiguration.java index 5c7459fa9f..1f1f257e1a 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/api/RepresentationsConfiguration.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/api/RepresentationsConfiguration.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -24,7 +24,7 @@ */ public class RepresentationsConfiguration implements IRepresentationConfiguration { - private static final String REPRESENTATIONS_PREFIX = "representations:"; //$NON-NLS-1$ + private static final String REPRESENTATIONS_PREFIX = "representations:"; private final String objectId; diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/configuration/CollaborativeFormMessageServiceConfiguration.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/configuration/CollaborativeFormMessageServiceConfiguration.java index f85bf68341..857aacd920 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/configuration/CollaborativeFormMessageServiceConfiguration.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/configuration/CollaborativeFormMessageServiceConfiguration.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -24,7 +24,7 @@ */ @Configuration public class CollaborativeFormMessageServiceConfiguration { - private static final String PATH = "messages/sirius-web-spring-collaborative-forms"; //$NON-NLS-1$ + private static final String PATH = "messages/sirius-web-spring-collaborative-forms"; @Bean public MessageSourceAccessor collaborativeFormMessageSourceAccessor() { diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/ClickListItemInput.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/ClickListItemInput.java index e549ee2f23..adf33ff7d0 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/ClickListItemInput.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/ClickListItemInput.java @@ -78,7 +78,7 @@ public ClickEventKind getClickEventKind() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, representationId: {2}, editingContextId: {3}, listId: {5}, listItemId: {4}, clickEventKind: {5}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, representationId: {2}, editingContextId: {3}, listId: {5}, listItemId: {4}, clickEventKind: {5}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.representationId, this.editingContextId, this.listId, this.listItemId, this.clickEventKind); } diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/ClickListItemSuccessPayload.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/ClickListItemSuccessPayload.java index 06169484c0..d79e393def 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/ClickListItemSuccessPayload.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/ClickListItemSuccessPayload.java @@ -37,7 +37,7 @@ public UUID getId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/CompletionRequestInput.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/CompletionRequestInput.java index 6189e4ab16..e2cbc3aef2 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/CompletionRequestInput.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/CompletionRequestInput.java @@ -77,7 +77,7 @@ public int getCursorPosition() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, widgetId: {4}, currentText: {5}, cursorPosition: {6}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, widgetId: {4}, currentText: {5}, cursorPosition: {6}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.representationId, this.widgetId, this.currentText, this.cursorPosition); } } diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/CompletionRequestSuccessPayload.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/CompletionRequestSuccessPayload.java index d03f73be92..88f0850ff7 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/CompletionRequestSuccessPayload.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/CompletionRequestSuccessPayload.java @@ -46,7 +46,7 @@ public List getProposals() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, proposals: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, proposals: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.proposals); } diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/DeleteListItemInput.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/DeleteListItemInput.java index 09bd4e3063..05df209bb7 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/DeleteListItemInput.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/DeleteListItemInput.java @@ -70,7 +70,7 @@ public String getListItemId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, representationId: {2}, editingContextId: {3}, listId: {5}, listItemId: {4}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, representationId: {2}, editingContextId: {3}, listId: {5}, listItemId: {4}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.representationId, this.editingContextId, this.listId, this.listItemId); } diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/DeleteListItemSuccessPayload.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/DeleteListItemSuccessPayload.java index f9fc7e9ab3..05c8cb6df0 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/DeleteListItemSuccessPayload.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/DeleteListItemSuccessPayload.java @@ -37,7 +37,7 @@ public UUID getId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditCheckboxInput.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditCheckboxInput.java index be708c630a..5460d4df1a 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditCheckboxInput.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditCheckboxInput.java @@ -70,7 +70,7 @@ public boolean getNewValue() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, checkboxId: {4}, newValue: {5}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, checkboxId: {4}, newValue: {5}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.representationId, this.checkboxId, this.newValue); } } diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditCheckboxSuccessPayload.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditCheckboxSuccessPayload.java index 68aaab3ab3..e040d62e79 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditCheckboxSuccessPayload.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditCheckboxSuccessPayload.java @@ -37,7 +37,7 @@ public UUID getId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } } diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditMultiSelectInput.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditMultiSelectInput.java index 216fe41687..ca8cc8f91e 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditMultiSelectInput.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditMultiSelectInput.java @@ -71,7 +71,7 @@ public List getNewValues() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, selectId: {4}, newValues: {5}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, selectId: {4}, newValues: {5}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.representationId, this.selectId, this.newValues); } } diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditMultiSelectSuccessPayload.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditMultiSelectSuccessPayload.java index b1f665e9f5..94fa34970d 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditMultiSelectSuccessPayload.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditMultiSelectSuccessPayload.java @@ -38,7 +38,7 @@ public UUID getId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } } diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditRadioInput.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditRadioInput.java index 8fd86ec142..d6c964e272 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditRadioInput.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditRadioInput.java @@ -70,7 +70,7 @@ public String getNewValue() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, radioId: {4}, newValue: {5}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, radioId: {4}, newValue: {5}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.representationId, this.radioId, this.newValue); } } diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditRadioSuccessPayload.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditRadioSuccessPayload.java index d8ca52f2fe..67a3ba34fe 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditRadioSuccessPayload.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditRadioSuccessPayload.java @@ -37,7 +37,7 @@ public UUID getId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } } diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditRichTextInput.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditRichTextInput.java index 759ddade42..2329c4fbc4 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditRichTextInput.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditRichTextInput.java @@ -70,7 +70,7 @@ public String getNewValue() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, richTextId: {4}, newValue: {5}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, richTextId: {4}, newValue: {5}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.representationId, this.richTextId, this.newValue); } } diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditRichTextSuccessPayload.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditRichTextSuccessPayload.java index bff7bbac08..8de071f2e6 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditRichTextSuccessPayload.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditRichTextSuccessPayload.java @@ -37,7 +37,7 @@ public UUID getId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } } diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditSelectInput.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditSelectInput.java index cab88ddb75..5422b2b3fb 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditSelectInput.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditSelectInput.java @@ -70,7 +70,7 @@ public String getNewValue() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, selectId: {4}, newValue: {5}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, selectId: {4}, newValue: {5}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.representationId, this.selectId, this.newValue); } } diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditSelectSuccessPayload.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditSelectSuccessPayload.java index 86eaefe2b1..c87c42eb10 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditSelectSuccessPayload.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditSelectSuccessPayload.java @@ -38,7 +38,7 @@ public UUID getId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } } diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditTextfieldInput.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditTextfieldInput.java index 6b82d9ef3c..ae15566840 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditTextfieldInput.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditTextfieldInput.java @@ -70,7 +70,7 @@ public String getNewValue() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, textfieldId: {4}, newValue: {5}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, textfieldId: {4}, newValue: {5}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.representationId, this.textfieldId, this.newValue); } } diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditTextfieldSuccessPayload.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditTextfieldSuccessPayload.java index effab60cb1..0a6d430687 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditTextfieldSuccessPayload.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/EditTextfieldSuccessPayload.java @@ -37,7 +37,7 @@ public UUID getId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } } diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/FormEventInput.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/FormEventInput.java index b6d012a410..bc9b339f11 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/FormEventInput.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/FormEventInput.java @@ -57,7 +57,7 @@ public String getFormId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, formId: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, formId: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.formId); } } diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/FormRefreshedEventPayload.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/FormRefreshedEventPayload.java index 4540ed11fc..7c8aa0b169 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/FormRefreshedEventPayload.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/FormRefreshedEventPayload.java @@ -45,7 +45,7 @@ public Form getForm() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, form: '{'id: {2}, label: {3}'}''}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, form: '{'id: {2}, label: {3}'}''}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.form.getId(), this.form.getLabel()); } } diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/PropertiesEventInput.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/PropertiesEventInput.java index 750fd743bc..efdb110861 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/PropertiesEventInput.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/PropertiesEventInput.java @@ -45,7 +45,7 @@ public List getObjectIds() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, objectIds: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, objectIds: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.objectIds); } } diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/PropertiesRefreshedEventPayload.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/PropertiesRefreshedEventPayload.java index a69acf2204..0cb8f8a72f 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/PropertiesRefreshedEventPayload.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/PropertiesRefreshedEventPayload.java @@ -45,7 +45,7 @@ public Form getForm() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, form: '{'id: {2}, label: {3}'}''}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, form: '{'id: {2}, label: {3}'}''}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.form.getId(), this.form.getLabel()); } } diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/PushButtonInput.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/PushButtonInput.java index 5515ac3a5c..4d2e7a8318 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/PushButtonInput.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/PushButtonInput.java @@ -63,7 +63,7 @@ public String getButtonId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, buttonId: {4}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, buttonId: {4}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.representationId, this.buttonId); } } diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/PushButtonSuccessPayload.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/PushButtonSuccessPayload.java index 8ab1bbf332..d6307d87e7 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/PushButtonSuccessPayload.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/PushButtonSuccessPayload.java @@ -37,7 +37,7 @@ public UUID getId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } } diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/RenameFormInput.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/RenameFormInput.java index ee19882231..c6a678b2e1 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/RenameFormInput.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/RenameFormInput.java @@ -64,7 +64,7 @@ public String getNewLabel() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, formId: {3}, newLabel: {4}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, formId: {3}, newLabel: {4}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.formId, this.newLabel); } } diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/RepresentationsEventInput.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/RepresentationsEventInput.java index c974e6da60..b9d9bedd46 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/RepresentationsEventInput.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/RepresentationsEventInput.java @@ -45,7 +45,7 @@ public String getObjectId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, objectId: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, objectId: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.objectId); } diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/UpdateWidgetFocusInput.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/UpdateWidgetFocusInput.java index c377214c2b..690fd5a69f 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/UpdateWidgetFocusInput.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/UpdateWidgetFocusInput.java @@ -57,7 +57,7 @@ public boolean isSelected() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, widgetId: {4}, selected: {5}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, widgetId: {4}, selected: {5}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.representationId, this.widgetId, this.selected); } diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/UpdateWidgetFocusSuccessPayload.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/UpdateWidgetFocusSuccessPayload.java index b64dd35bdf..59494a184e 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/UpdateWidgetFocusSuccessPayload.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/UpdateWidgetFocusSuccessPayload.java @@ -44,7 +44,7 @@ public String getUpdateFocusWidgetId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, widgetId: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, widgetId: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.widgetId); } } diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/WidgetSubscription.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/WidgetSubscription.java index 885d36a3ac..e31018590e 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/WidgetSubscription.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/WidgetSubscription.java @@ -43,7 +43,7 @@ public List getSubscribers() { @Override public String toString() { - String pattern = "{0} '{'widgetId: {1}, subscribers: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'widgetId: {1}, subscribers: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.widgetId, this.subscribers); } } diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/WidgetSubscriptionsUpdatedEventPayload.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/WidgetSubscriptionsUpdatedEventPayload.java index b01e7550a6..298eb3e8af 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/WidgetSubscriptionsUpdatedEventPayload.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/dto/WidgetSubscriptionsUpdatedEventPayload.java @@ -45,7 +45,7 @@ public List getWidgetSubscriptions() { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } } diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/handlers/ClickListItemEventHandler.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/handlers/ClickListItemEventHandler.java index 2a57f2121c..5443da82f3 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/handlers/ClickListItemEventHandler.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/handlers/ClickListItemEventHandler.java @@ -92,7 +92,7 @@ public void handle(One payloadSink, Many changeDesc var status = optionalListItem.map(ListItem::getClickHandler) .map(handler -> handler.apply(input.getClickEventKind())) - .orElse(new Failure("")); //$NON-NLS-1$ + .orElse(new Failure("")); // @formatter:on if (status instanceof Success) { diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/handlers/DeleteListItemEventHandler.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/handlers/DeleteListItemEventHandler.java index b438f808e6..bd21aeb33d 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/handlers/DeleteListItemEventHandler.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/handlers/DeleteListItemEventHandler.java @@ -92,7 +92,7 @@ public void handle(One payloadSink, Many changeDesc var status = optionalListItem.map(ListItem::getDeleteHandler) .map(handler -> handler.get()) - .orElse(new Failure("")); //$NON-NLS-1$ + .orElse(new Failure("")); // @formatter:on if (status instanceof Success) { diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditCheckboxEventHandler.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditCheckboxEventHandler.java index d007307fe5..928666ac61 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditCheckboxEventHandler.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditCheckboxEventHandler.java @@ -85,7 +85,7 @@ public void handle(One payloadSink, Many changeDesc IStatus status = optionalCheckbox.map(Checkbox::getNewValueHandler) .map(handler -> handler.apply(input.getNewValue())) - .orElse(new Failure("")); //$NON-NLS-1$ + .orElse(new Failure("")); // @formatter:on if (status instanceof Success) { diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditMultiSelectEventHandler.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditMultiSelectEventHandler.java index f2c5e61aec..134d25891b 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditMultiSelectEventHandler.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditMultiSelectEventHandler.java @@ -86,7 +86,7 @@ public void handle(One payloadSink, Many changeDesc IStatus status = optionalMultiSelect.map(MultiSelect::getNewValuesHandler) .map(handler -> handler.apply(input.getNewValues())) - .orElse(new Failure("")); //$NON-NLS-1$ + .orElse(new Failure("")); // @formatter:on if (status instanceof Success) { diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditRadioEventHandler.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditRadioEventHandler.java index aaa0794661..5633bb9454 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditRadioEventHandler.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditRadioEventHandler.java @@ -85,7 +85,7 @@ public void handle(One payloadSink, Many changeDesc IStatus status = optionalRadio.map(Radio::getNewValueHandler) .map(handler -> handler.apply(input.getNewValue())) - .orElse(new Failure("")); //$NON-NLS-1$ + .orElse(new Failure("")); // @formatter:on if (status instanceof Success) { diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditRichTextEventHandler.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditRichTextEventHandler.java index 6921f05cf2..fee9a03a97 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditRichTextEventHandler.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditRichTextEventHandler.java @@ -89,7 +89,7 @@ public void handle(One payloadSink, Many changeDesc return handlerFunction; }) .map(handler -> handler.apply(input.getNewValue())) - .orElse(new Failure("")); //$NON-NLS-1$ + .orElse(new Failure("")); // @formatter:on if (status instanceof Success) { diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditSelectEventHandler.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditSelectEventHandler.java index 9264249d73..cabb092aba 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditSelectEventHandler.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditSelectEventHandler.java @@ -86,7 +86,7 @@ public void handle(One payloadSink, Many changeDesc IStatus status = optionalSelect.map(Select::getNewValueHandler) .map(handler -> handler.apply(input.getNewValue())) - .orElse(new Failure("")); //$NON-NLS-1$ + .orElse(new Failure("")); // @formatter:on if (status instanceof Success) { diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditTextfieldEventHandler.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditTextfieldEventHandler.java index 389f40c194..39c22406b4 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditTextfieldEventHandler.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditTextfieldEventHandler.java @@ -92,7 +92,7 @@ public void handle(One payloadSink, Many changeDesc return handlerFunction; }) .map(handler -> handler.apply(input.getNewValue())) - .orElse(new Failure("")); //$NON-NLS-1$ + .orElse(new Failure("")); // @formatter:on if (status instanceof Success) { diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/handlers/PushButtonEventHandler.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/handlers/PushButtonEventHandler.java index 12f89ae643..575019d40b 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/handlers/PushButtonEventHandler.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/handlers/PushButtonEventHandler.java @@ -92,7 +92,7 @@ public void handle(One payloadSink, Many changeDesc .map(ToolbarAction.class::cast) .map(ToolbarAction::getPushButtonHandler); } - IStatus status = handler.map(Supplier::get).orElse(new Failure("")); //$NON-NLS-1$ + IStatus status = handler.map(Supplier::get).orElse(new Failure("")); // @formatter:on if (status instanceof Success) { diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/messages/CollaborativeFormMessageService.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/messages/CollaborativeFormMessageService.java index f00084cff3..f512207909 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/messages/CollaborativeFormMessageService.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/messages/CollaborativeFormMessageService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -33,6 +33,6 @@ public CollaborativeFormMessageService(@Qualifier("collaborativeFormMessageSourc @Override public String invalidInput(String expectedInputTypeName, String receivedInputTypeName) { - return this.messageSourceAccessor.getMessage("INVALID_INPUT", new Object[] { expectedInputTypeName, receivedInputTypeName }); //$NON-NLS-1$ + return this.messageSourceAccessor.getMessage("INVALID_INPUT", new Object[] { expectedInputTypeName, receivedInputTypeName }); } } diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/messages/ICollaborativeFormMessageService.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/messages/ICollaborativeFormMessageService.java index 7353c7b465..6cde855e7a 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/messages/ICollaborativeFormMessageService.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/messages/ICollaborativeFormMessageService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -29,7 +29,7 @@ class NoOp implements ICollaborativeFormMessageService { @Override public String invalidInput(String expectedInputTypeName, String receivedInputTypeName) { - return ""; //$NON-NLS-1$ + return ""; } } diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/services/FormDeserializer.java b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/services/FormDeserializer.java index b56404c9c4..3c2b5201af 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/services/FormDeserializer.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/main/java/org/eclipse/sirius/components/collaborative/forms/services/FormDeserializer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -39,7 +39,7 @@ public class FormDeserializer implements IRepresentationDeserializer { @Override public boolean canHandle(ObjectNode root) { // @formatter:off - return Optional.ofNullable(root.get("kind")) //$NON-NLS-1$ + return Optional.ofNullable(root.get("kind")) .map(JsonNode::asText) .filter(Form.KIND::equals) .isPresent(); diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/FormDescriptionAggregatorTests.java b/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/FormDescriptionAggregatorTests.java index 851fb74627..e0275083ad 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/FormDescriptionAggregatorTests.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/FormDescriptionAggregatorTests.java @@ -33,7 +33,7 @@ */ public class FormDescriptionAggregatorTests { - private static final String LABEL = "Label"; //$NON-NLS-1$ + private static final String LABEL = "Label"; @Test public void testAggregatorWithMatchingPages() { @@ -86,7 +86,7 @@ private FormDescription createForm(Object object, int numberOfPages, int numberO // @formatter:off return FormDescription.newFormDescription(UUID.randomUUID().toString()) - .targetObjectIdProvider(targetObjectIdProvider -> "targetObjectId") //$NON-NLS-1$ + .targetObjectIdProvider(targetObjectIdProvider -> "targetObjectId") .canCreatePredicate(variableManager -> true) .groupDescriptions(groupDescriptions) .pageDescriptions(pageDescriptions) @@ -99,10 +99,10 @@ private FormDescription createForm(Object object, int numberOfPages, int numberO private PageDescription createPage(Object object, GroupDescription groupDescription, boolean canCreate) { // @formatter:off - return PageDescription.newPageDescription("test") //$NON-NLS-1$ - .idProvider(variableManager -> "id") //$NON-NLS-1$ + return PageDescription.newPageDescription("test") + .idProvider(variableManager -> "id") .canCreatePredicate(variableManager -> canCreate) - .labelProvider(variableManager -> "label") //$NON-NLS-1$ + .labelProvider(variableManager -> "label") .semanticElementsProvider(variableManager -> Collections.singletonList(object)) .groupDescriptions(Collections.singletonList(groupDescription)) .build(); @@ -111,8 +111,8 @@ private PageDescription createPage(Object object, GroupDescription groupDescript private GroupDescription createGroup() { // @formatter:off - return GroupDescription.newGroupDescription("Group") //$NON-NLS-1$ - .idProvider(variableManager -> "id") //$NON-NLS-1$ + return GroupDescription.newGroupDescription("Group") + .idProvider(variableManager -> "id") .controlDescriptions(Collections.emptyList()) .labelProvider(variableManager -> LABEL) .semanticElementsProvider(variableManager -> Collections.emptyList()) diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/FormEventProcessorTests.java b/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/FormEventProcessorTests.java index 6a9ff505dc..20ee2c0a01 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/FormEventProcessorTests.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/FormEventProcessorTests.java @@ -43,11 +43,11 @@ public class FormEventProcessorTests { private FormDescription getFormDescription() { // @formatter:off return FormDescription.newFormDescription(UUID.randomUUID().toString()) - .targetObjectIdProvider(targetObjectIdProvider -> "targetObjectId") //$NON-NLS-1$ + .targetObjectIdProvider(targetObjectIdProvider -> "targetObjectId") .canCreatePredicate(variableManager -> true) .idProvider(variableManager -> UUID.randomUUID().toString()) - .label("formLabel") //$NON-NLS-1$ - .labelProvider(variableManager -> "label") //$NON-NLS-1$ + .label("formLabel") + .labelProvider(variableManager -> "label") .groupDescriptions(List.of()) .pageDescriptions(List.of()) .build(); diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/architecture/ArchitectureConstants.java b/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/architecture/ArchitectureConstants.java index 3484b4c5dd..4bc62923a1 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/architecture/ArchitectureConstants.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/architecture/ArchitectureConstants.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -22,7 +22,7 @@ * @author sbegaudeau */ public final class ArchitectureConstants { - public static final String SIRIUS_COMPONENTS_COLLABORATIVE_FORMS_ROOT_PACKAGE = "org.eclipse.sirius.components.collaborative.forms.."; //$NON-NLS-1$ + public static final String SIRIUS_COMPONENTS_COLLABORATIVE_FORMS_ROOT_PACKAGE = "org.eclipse.sirius.components.collaborative.forms.."; // @formatter:off public static final JavaClasses CLASSES = new ClassFileImporter() diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/CompletionProposalEventHandlerTests.java b/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/CompletionProposalEventHandlerTests.java index 4e9586a62d..bb2321e523 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/CompletionProposalEventHandlerTests.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/CompletionProposalEventHandlerTests.java @@ -52,35 +52,35 @@ public class CompletionProposalEventHandlerTests { @Test public void testRequestCompletion() { - String id = "Textfield id"; //$NON-NLS-1$ + String id = "Textfield id"; Function newValueHandler = newValue -> { return new Success(); }; - List proposals = List.of(new CompletionProposal("Proposal", "textToInsert", 0)); //$NON-NLS-1$ //$NON-NLS-2$ + List proposals = List.of(new CompletionProposal("Proposal", "textToInsert", 0)); // @formatter:off Textfield textfield = Textfield.newTextfield(id) - .label("label") //$NON-NLS-1$ - .value("Previous value") //$NON-NLS-1$ + .label("label") + .value("Previous value") .newValueHandler(newValueHandler) .completionProposalsProvider(request -> proposals) .diagnostics(List.of()) .build(); - Group group = Group.newGroup("groupId") //$NON-NLS-1$ - .label("group label") //$NON-NLS-1$ + Group group = Group.newGroup("groupId") + .label("group label") .widgets(List.of(textfield)) .build(); - Page page = Page.newPage("pageId") //$NON-NLS-1$ - .label("page label") //$NON-NLS-1$ + Page page = Page.newPage("pageId") + .label("page label") .groups(List.of(group)) .build(); Form form = Form.newForm(FORM_ID) - .targetObjectId("targetObjectId") //$NON-NLS-1$ + .targetObjectId("targetObjectId") .descriptionId(UUID.randomUUID().toString()) - .label("form label") //$NON-NLS-1$ + .label("form label") .pages(List.of(page)) .build(); // @formatter:on @@ -93,7 +93,7 @@ public Optional findWidget(Form form, String widgetId) { }; CompletionProposalEventHandler handler = new CompletionProposalEventHandler(formQueryService, new ICollaborativeFormMessageService.NoOp(), new SimpleMeterRegistry()); - var input = new CompletionRequestInput(UUID.randomUUID(), UUID.randomUUID().toString(), FORM_ID, id, "text", 2); //$NON-NLS-1$ + var input = new CompletionRequestInput(UUID.randomUUID(), UUID.randomUUID().toString(), FORM_ID, id, "text", 2); assertThat(handler.canHandle(input)).isTrue(); diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/CreateFormEventHandlerTests.java b/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/CreateFormEventHandlerTests.java index be9035a627..2c73e41a3c 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/CreateFormEventHandlerTests.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/CreateFormEventHandlerTests.java @@ -48,14 +48,14 @@ public class CreateFormEventHandlerTests { @Test public void testFormCreation() { // @formatter:off - var formDescription = FormDescription.newFormDescription("representationDescriptionId") //$NON-NLS-1$ - .label("label") //$NON-NLS-1$ + var formDescription = FormDescription.newFormDescription("representationDescriptionId") + .label("label") .canCreatePredicate(variableManager -> true) .pageDescriptions(List.of()) .groupDescriptions(List.of()) - .idProvider(variableManager -> "id") //$NON-NLS-1$ - .labelProvider(variableManager -> "label") //$NON-NLS-1$ - .targetObjectIdProvider(variableManager -> "targetObjectId") //$NON-NLS-1$ + .idProvider(variableManager -> "id") + .labelProvider(variableManager -> "label") + .targetObjectIdProvider(variableManager -> "targetObjectId") .build(); // @formatter:on @@ -83,8 +83,8 @@ public Optional getObject(IEditingContext editingContext, String objectI var handler = new CreateFormEventHandler(representationDescriptionSearchService, representationPersistenceService, objectService, new ICollaborativeFormMessageService.NoOp(), new SimpleMeterRegistry()); - var input = new CreateRepresentationInput(UUID.randomUUID(), "editingContextId", "representationDescriptionId", "objectId", "representationName"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - IEditingContext editingContext = () -> "editingContextId"; //$NON-NLS-1$ + var input = new CreateRepresentationInput(UUID.randomUUID(), "editingContextId", "representationDescriptionId", "objectId", "representationName"); + IEditingContext editingContext = () -> "editingContextId"; assertThat(handler.canHandle(editingContext, input)).isTrue(); diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditCheckboxEventHandlerTests.java b/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditCheckboxEventHandlerTests.java index 217806ca02..c201c9675f 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditCheckboxEventHandlerTests.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditCheckboxEventHandlerTests.java @@ -52,7 +52,7 @@ public class EditCheckboxEventHandlerTests { @Test public void testCheckboxEdition() { - String id = "Checkbox id"; //$NON-NLS-1$ + String id = "Checkbox id"; var input = new EditCheckboxInput(UUID.randomUUID(), UUID.randomUUID().toString(), FORM_ID, id, true); @@ -64,25 +64,25 @@ public void testCheckboxEdition() { // @formatter:off Checkbox checkbox = Checkbox.newCheckbox(id) - .label("label") //$NON-NLS-1$ + .label("label") .newValueHandler(newValueHandler) .diagnostics(List.of()) .build(); - Group group = Group.newGroup("groupId") //$NON-NLS-1$ - .label("group label") //$NON-NLS-1$ + Group group = Group.newGroup("groupId") + .label("group label") .widgets(List.of(checkbox)) .build(); - Page page = Page.newPage("pageId") //$NON-NLS-1$ - .label("page label") //$NON-NLS-1$ + Page page = Page.newPage("pageId") + .label("page label") .groups(List.of(group)) .build(); Form form = Form.newForm(FORM_ID) - .targetObjectId("targetObjectId") //$NON-NLS-1$ + .targetObjectId("targetObjectId") .descriptionId(UUID.randomUUID().toString()) - .label("form label") //$NON-NLS-1$ + .label("form label") .pages(List.of(page)) .build(); // @formatter:on diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditMultiSelectEventHandlerTests.java b/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditMultiSelectEventHandlerTests.java index 47fdab6483..d6871a8944 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditMultiSelectEventHandlerTests.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditMultiSelectEventHandlerTests.java @@ -53,9 +53,9 @@ public class EditMultiSelectEventHandlerTests { @Test public void testMultiSelectEdition() { - String id = "MultiSelect id"; //$NON-NLS-1$ + String id = "MultiSelect id"; - var input = new EditMultiSelectInput(UUID.randomUUID(), UUID.randomUUID().toString(), FORM_ID, id, List.of("true", "false")); //$NON-NLS-1$ //$NON-NLS-2$ + var input = new EditMultiSelectInput(UUID.randomUUID(), UUID.randomUUID().toString(), FORM_ID, id, List.of("true", "false")); AtomicBoolean hasBeenExecuted = new AtomicBoolean(); Function, IStatus> newValuesHandler = newValues -> { @@ -64,34 +64,34 @@ public void testMultiSelectEdition() { }; // @formatter:off - SelectOption trueOption = SelectOption.newSelectOption("true") //$NON-NLS-1$ - .label("True") //$NON-NLS-1$ + SelectOption trueOption = SelectOption.newSelectOption("true") + .label("True") .build(); - SelectOption falseOption = SelectOption.newSelectOption("false") //$NON-NLS-1$ - .label("False") //$NON-NLS-1$ + SelectOption falseOption = SelectOption.newSelectOption("false") + .label("False") .build(); MultiSelect multiSelect = MultiSelect.newMultiSelect(id) - .label("label") //$NON-NLS-1$ + .label("label") .values(List.of()) .newValuesHandler(newValuesHandler) .options(List.of(trueOption, falseOption)) .diagnostics(List.of()) .build(); - Group group = Group.newGroup("groupId") //$NON-NLS-1$ - .label("group label") //$NON-NLS-1$ + Group group = Group.newGroup("groupId") + .label("group label") .widgets(List.of(multiSelect)) .build(); - Page page = Page.newPage("pageId") //$NON-NLS-1$ - .label("page label") //$NON-NLS-1$ + Page page = Page.newPage("pageId") + .label("page label") .groups(List.of(group)) .build(); Form form = Form.newForm(FORM_ID) - .targetObjectId("targetObjectId") //$NON-NLS-1$ + .targetObjectId("targetObjectId") .descriptionId(UUID.randomUUID().toString()) - .label("form label") //$NON-NLS-1$ + .label("form label") .pages(List.of(page)) .build(); // @formatter:on diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditRadioEventHandlerTests.java b/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditRadioEventHandlerTests.java index 303729af44..a528a5ee7d 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditRadioEventHandlerTests.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditRadioEventHandlerTests.java @@ -53,9 +53,9 @@ public class EditRadioEventHandlerTests { @Test public void testRadioEdition() { - String id = "Radio id"; //$NON-NLS-1$ + String id = "Radio id"; - var input = new EditRadioInput(UUID.randomUUID(), UUID.randomUUID().toString(), FORM_ID, id, "optionId"); //$NON-NLS-1$ + var input = new EditRadioInput(UUID.randomUUID(), UUID.randomUUID().toString(), FORM_ID, id, "optionId"); AtomicBoolean hasBeenExecuted = new AtomicBoolean(); Function newValueHandler = newValue -> { @@ -64,32 +64,32 @@ public void testRadioEdition() { }; // @formatter:off - RadioOption option = RadioOption.newRadioOption("optionId") //$NON-NLS-1$ - .label("Option label") //$NON-NLS-1$ + RadioOption option = RadioOption.newRadioOption("optionId") + .label("Option label") .selected(false) .build(); Radio radio = Radio.newRadio(id) - .label("label") //$NON-NLS-1$ + .label("label") .newValueHandler(newValueHandler) .options(List.of(option)) .diagnostics(List.of()) .build(); - Group group = Group.newGroup("groupId") //$NON-NLS-1$ - .label("group label") //$NON-NLS-1$ + Group group = Group.newGroup("groupId") + .label("group label") .widgets(List.of(radio)) .build(); - Page page = Page.newPage("pageId") //$NON-NLS-1$ - .label("page label") //$NON-NLS-1$ + Page page = Page.newPage("pageId") + .label("page label") .groups(List.of(group)) .build(); Form form = Form.newForm(FORM_ID) - .targetObjectId("targetObjectId") //$NON-NLS-1$ + .targetObjectId("targetObjectId") .descriptionId(UUID.randomUUID().toString()) - .label("form label") //$NON-NLS-1$ + .label("form label") .pages(List.of(page)) .build(); // @formatter:on diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditSelectEventHandlerTests.java b/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditSelectEventHandlerTests.java index 618b64158d..b27c7ed989 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditSelectEventHandlerTests.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditSelectEventHandlerTests.java @@ -53,9 +53,9 @@ public class EditSelectEventHandlerTests { @Test public void testSelectEdition() { - String id = "Select id"; //$NON-NLS-1$ + String id = "Select id"; - var input = new EditSelectInput(UUID.randomUUID(), UUID.randomUUID().toString(), FORM_ID, id, "false"); //$NON-NLS-1$ + var input = new EditSelectInput(UUID.randomUUID(), UUID.randomUUID().toString(), FORM_ID, id, "false"); AtomicBoolean hasBeenExecuted = new AtomicBoolean(); Function newValueHandler = newValue -> { @@ -64,34 +64,34 @@ public void testSelectEdition() { }; // @formatter:off - SelectOption trueOption = SelectOption.newSelectOption("true") //$NON-NLS-1$ - .label("True") //$NON-NLS-1$ + SelectOption trueOption = SelectOption.newSelectOption("true") + .label("True") .build(); - SelectOption falseOption = SelectOption.newSelectOption("false") //$NON-NLS-1$ - .label("False") //$NON-NLS-1$ + SelectOption falseOption = SelectOption.newSelectOption("false") + .label("False") .build(); Select select = Select.newSelect(id) - .label("label") //$NON-NLS-1$ - .value("true") //$NON-NLS-1$ + .label("label") + .value("true") .newValueHandler(newValueHandler) .options(List.of(trueOption, falseOption)) .diagnostics(List.of()) .build(); - Group group = Group.newGroup("groupId") //$NON-NLS-1$ - .label("group label") //$NON-NLS-1$ + Group group = Group.newGroup("groupId") + .label("group label") .widgets(List.of(select)) .build(); - Page page = Page.newPage("pageId") //$NON-NLS-1$ - .label("page label") //$NON-NLS-1$ + Page page = Page.newPage("pageId") + .label("page label") .groups(List.of(group)) .build(); Form form = Form.newForm(FORM_ID) - .targetObjectId("targetObjectId") //$NON-NLS-1$ + .targetObjectId("targetObjectId") .descriptionId(UUID.randomUUID().toString()) - .label("form label") //$NON-NLS-1$ + .label("form label") .pages(List.of(page)) .build(); // @formatter:on diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditTextfieldEventHandlerTests.java b/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditTextfieldEventHandlerTests.java index 71c5e2f117..918275dcb6 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditTextfieldEventHandlerTests.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/EditTextfieldEventHandlerTests.java @@ -52,9 +52,9 @@ public class EditTextfieldEventHandlerTests { @Test public void testTextfieldEdition() { - String id = "Textfield id"; //$NON-NLS-1$ + String id = "Textfield id"; - var input = new EditTextfieldInput(UUID.randomUUID(), UUID.randomUUID().toString(), FORM_ID, id, "New value"); //$NON-NLS-1$ + var input = new EditTextfieldInput(UUID.randomUUID(), UUID.randomUUID().toString(), FORM_ID, id, "New value"); AtomicBoolean hasBeenExecuted = new AtomicBoolean(); Function newValueHandler = newValue -> { @@ -64,26 +64,26 @@ public void testTextfieldEdition() { // @formatter:off Textfield textfield = Textfield.newTextfield(id) - .label("label") //$NON-NLS-1$ - .value("Previous value") //$NON-NLS-1$ + .label("label") + .value("Previous value") .newValueHandler(newValueHandler) .diagnostics(List.of()) .build(); - Group group = Group.newGroup("groupId") //$NON-NLS-1$ - .label("group label") //$NON-NLS-1$ + Group group = Group.newGroup("groupId") + .label("group label") .widgets(List.of(textfield)) .build(); - Page page = Page.newPage("pageId") //$NON-NLS-1$ - .label("page label") //$NON-NLS-1$ + Page page = Page.newPage("pageId") + .label("page label") .groups(List.of(group)) .build(); Form form = Form.newForm(FORM_ID) - .targetObjectId("targetObjectId") //$NON-NLS-1$ + .targetObjectId("targetObjectId") .descriptionId(UUID.randomUUID().toString()) - .label("form label") //$NON-NLS-1$ + .label("form label") .pages(List.of(page)) .build(); // @formatter:on diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/ListItemEventHandlersTests.java b/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/ListItemEventHandlersTests.java index a10714ce96..19ad353040 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/ListItemEventHandlersTests.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/ListItemEventHandlersTests.java @@ -59,10 +59,10 @@ public class ListItemEventHandlersTests { @Test public void testListItemDeletion() { - String listId = "List id"; //$NON-NLS-1$ - String listItemId = "element id to delete"; //$NON-NLS-1$ - String changeKind = "delete something"; //$NON-NLS-1$ - String changeDescriptionParameterKey = "change_description_parameter_key"; //$NON-NLS-1$ + String listId = "List id"; + String listItemId = "element id to delete"; + String changeKind = "delete something"; + String changeDescriptionParameterKey = "change_description_parameter_key"; Map parameters = new HashMap<>(); parameters.put(changeDescriptionParameterKey, listItemId); @@ -79,31 +79,31 @@ public void testListItemDeletion() { .deletable(true) .deleteHandler(deleteHandler) .clickHandler(clickEventKind -> new Success()) - .imageURL("") //$NON-NLS-1$ - .kind("Diagram") //$NON-NLS-1$ - .label("empty representation") //$NON-NLS-1$ + .imageURL("") + .kind("Diagram") + .label("empty representation") .build(); List list = List.newList(listId) .diagnostics(Collections.emptyList()) .items(Collections.singletonList(listItem)) - .label("") //$NON-NLS-1$ + .label("") .build(); - Group group = Group.newGroup("groupId") //$NON-NLS-1$ - .label("group label") //$NON-NLS-1$ + Group group = Group.newGroup("groupId") + .label("group label") .widgets(Collections.singletonList(list)) .build(); - Page page = Page.newPage("pageId") //$NON-NLS-1$ - .label("page label") //$NON-NLS-1$ + Page page = Page.newPage("pageId") + .label("page label") .groups(Collections.singletonList(group)) .build(); Form form = Form.newForm(FORM_ID.toString()) - .targetObjectId("targetObjectId") //$NON-NLS-1$ + .targetObjectId("targetObjectId") .descriptionId(UUID.randomUUID().toString()) - .label("form label") //$NON-NLS-1$ + .label("form label") .pages(Collections.singletonList(page)) .build(); // @formatter:on @@ -136,10 +136,10 @@ public Optional findWidget(Form form, String widgetId) { @Test public void testListItemSelection() { - String listId = "Listid"; //$NON-NLS-1$ - String listItemId = "ListItemId"; //$NON-NLS-1$ + String listId = "Listid"; + String listItemId = "ListItemId"; String changeKind = ChangeKind.SEMANTIC_CHANGE; - String changeDescriptionParameterKey = "change_description_parameter_key"; //$NON-NLS-1$ + String changeDescriptionParameterKey = "change_description_parameter_key"; Map parameters = new HashMap<>(); parameters.put(changeDescriptionParameterKey, listItemId); @@ -156,31 +156,31 @@ public void testListItemSelection() { .deletable(true) .deleteHandler(() -> new Success()) .clickHandler(selectHandler) - .imageURL("") //$NON-NLS-1$ - .kind("Diagram") //$NON-NLS-1$ - .label("empty representation") //$NON-NLS-1$ + .imageURL("") + .kind("Diagram") + .label("empty representation") .build(); List list = List.newList(listId) .diagnostics(Collections.emptyList()) .items(Collections.singletonList(listItem)) - .label("") //$NON-NLS-1$ + .label("") .build(); - Group group = Group.newGroup("groupId") //$NON-NLS-1$ - .label("group label") //$NON-NLS-1$ + Group group = Group.newGroup("groupId") + .label("group label") .widgets(Collections.singletonList(list)) .build(); - Page page = Page.newPage("pageId") //$NON-NLS-1$ - .label("page label") //$NON-NLS-1$ + Page page = Page.newPage("pageId") + .label("page label") .groups(Collections.singletonList(group)) .build(); Form form = Form.newForm(FORM_ID.toString()) - .targetObjectId("targetObjectId") //$NON-NLS-1$ + .targetObjectId("targetObjectId") .descriptionId(UUID.randomUUID().toString()) - .label("form label") //$NON-NLS-1$ + .label("form label") .pages(Collections.singletonList(page)) .build(); // @formatter:on diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/PushButtonEventHandlerTests.java b/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/PushButtonEventHandlerTests.java index 292ad7886e..30144477f7 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/PushButtonEventHandlerTests.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/PushButtonEventHandlerTests.java @@ -52,7 +52,7 @@ public class PushButtonEventHandlerTests { @Test public void testPushButton() { - String id = "Button id"; //$NON-NLS-1$ + String id = "Button id"; var input = new PushButtonInput(UUID.randomUUID(), UUID.randomUUID().toString(), FORM_ID, id); @@ -64,25 +64,25 @@ public void testPushButton() { // @formatter:off Button button = Button.newButton(id) - .label("label") //$NON-NLS-1$ + .label("label") .pushButtonHandler(pushButtonHandler) .diagnostics(List.of()) .build(); - Group group = Group.newGroup("groupId") //$NON-NLS-1$ - .label("group label") //$NON-NLS-1$ + Group group = Group.newGroup("groupId") + .label("group label") .widgets(List.of(button)) .build(); - Page page = Page.newPage("pageId") //$NON-NLS-1$ - .label("page label") //$NON-NLS-1$ + Page page = Page.newPage("pageId") + .label("page label") .groups(List.of(group)) .build(); Form form = Form.newForm(FORM_ID) - .targetObjectId("targetObjectId") //$NON-NLS-1$ + .targetObjectId("targetObjectId") .descriptionId(UUID.randomUUID().toString()) - .label("form label") //$NON-NLS-1$ + .label("form label") .pages(List.of(page)) .build(); // @formatter:on diff --git a/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/RenameFormEventHandlerTests.java b/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/RenameFormEventHandlerTests.java index 27d233e8ca..9b5cfa44cd 100644 --- a/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/RenameFormEventHandlerTests.java +++ b/packages/forms/backend/sirius-components-collaborative-forms/src/test/java/org/eclipse/sirius/components/collaborative/forms/handlers/RenameFormEventHandlerTests.java @@ -39,9 +39,9 @@ * @author arichard */ public class RenameFormEventHandlerTests { - private static final String OLD_LABEL = "oldLabel"; //$NON-NLS-1$ + private static final String OLD_LABEL = "oldLabel"; - private static final String NEW_LABEL = "newLabel"; //$NON-NLS-1$ + private static final String NEW_LABEL = "newLabel"; @Test public void testRenameRepresentation() { diff --git a/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/form/ButtonImageURLDataFetcher.java b/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/form/ButtonImageURLDataFetcher.java index 0e27ec1d62..403e105393 100644 --- a/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/form/ButtonImageURLDataFetcher.java +++ b/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/form/ButtonImageURLDataFetcher.java @@ -35,7 +35,7 @@ public String get(DataFetchingEnvironment environment) throws Exception { Button button = environment.getSource(); String buttonImageURL = button.getImageURL(); if (buttonImageURL != null && !buttonImageURL.isBlank()) { - if (buttonImageURL.startsWith("http://") || buttonImageURL.startsWith("https://")) { //$NON-NLS-1$ //$NON-NLS-2$ + if (buttonImageURL.startsWith("http://") || buttonImageURL.startsWith("https://")) { imageURL = buttonImageURL; } else { imageURL = URLConstants.IMAGE_BASE_PATH + buttonImageURL; diff --git a/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/form/FormDescriptionCompletionProposalsDataFetcher.java b/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/form/FormDescriptionCompletionProposalsDataFetcher.java index 248bb2f043..47a2d7a3b8 100644 --- a/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/form/FormDescriptionCompletionProposalsDataFetcher.java +++ b/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/form/FormDescriptionCompletionProposalsDataFetcher.java @@ -46,11 +46,11 @@ */ @QueryDataFetcher(type = "FormDescription", field = "completionProposals") public class FormDescriptionCompletionProposalsDataFetcher implements IDataFetcherWithFieldCoordinates>> { - private static final String WIDGET_ID_ARGUMENT = "widgetId"; //$NON-NLS-1$ + private static final String WIDGET_ID_ARGUMENT = "widgetId"; - private static final String CURRENT_TEXT_ARGUMENT = "currentText"; //$NON-NLS-1$ + private static final String CURRENT_TEXT_ARGUMENT = "currentText"; - private static final String CURSOR_POSITION_ARGUMENT = "cursorPosition"; //$NON-NLS-1$ + private static final String CURSOR_POSITION_ARGUMENT = "cursorPosition"; private final IEditingContextEventProcessorRegistry editingContextEventProcessorRegistry; @@ -64,7 +64,7 @@ public CompletableFuture> get(DataFetchingEnvironment e var editingContextId = Optional.ofNullable(localContext.get(LocalContextConstants.EDITING_CONTEXT_ID)).map(Object::toString); var representationId = Optional.ofNullable(localContext.get(LocalContextConstants.REPRESENTATION_ID)).map(Object::toString); var widgetId = Optional.ofNullable(environment.getArgument(WIDGET_ID_ARGUMENT)).map(Object::toString); - String currentText = Optional.ofNullable(environment.getArgument(CURRENT_TEXT_ARGUMENT)).map(Object::toString).orElse(""); //$NON-NLS-1$ + String currentText = Optional.ofNullable(environment.getArgument(CURRENT_TEXT_ARGUMENT)).map(Object::toString).orElse(""); int cursorPosition = Optional.ofNullable(environment.getArgument(CURSOR_POSITION_ARGUMENT)).filter(Integer.class::isInstance).map(Integer.class::cast).orElse(0); if (editingContextId.isPresent() && representationId.isPresent() && widgetId.isPresent()) { diff --git a/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/form/ImageURLDataFetcher.java b/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/form/ImageURLDataFetcher.java index 978c195c9d..ab35f2fcce 100644 --- a/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/form/ImageURLDataFetcher.java +++ b/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/form/ImageURLDataFetcher.java @@ -32,7 +32,7 @@ public class ImageURLDataFetcher implements IDataFetcherWithFieldCoordinates { - private static final String ICON_URL_FIELD = "iconURL"; //$NON-NLS-1$ + private static final String ICON_URL_FIELD = "iconURL"; @Override public List getFieldCoordinates() { // @formatter:off var widgetTypes = List.of( - "ChartWidget", //$NON-NLS-1$ - "Checkbox", //$NON-NLS-1$ - "FlexboxContainer", //$NON-NLS-1$ - "Link", //$NON-NLS-1$ - "List", //$NON-NLS-1$ - "MultiSelect", //$NON-NLS-1$ - "Radio", //$NON-NLS-1$ - "Select", //$NON-NLS-1$ - "Textarea", //$NON-NLS-1$ - "Textfield", //$NON-NLS-1$ - "TreeWidget" //$NON-NLS-1$ + "ChartWidget", + "Checkbox", + "FlexboxContainer", + "Link", + "List", + "MultiSelect", + "Radio", + "Select", + "Textarea", + "Textfield", + "TreeWidget" ); return widgetTypes.stream().map(widgetType -> FieldCoordinates.coordinates(widgetType, ICON_URL_FIELD)).collect(Collectors.toList()); // @formatter:on diff --git a/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/mutation/MutationClickListItemDataFetcher.java b/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/mutation/MutationClickListItemDataFetcher.java index 37b9434255..0f33fb3549 100644 --- a/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/mutation/MutationClickListItemDataFetcher.java +++ b/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/mutation/MutationClickListItemDataFetcher.java @@ -34,7 +34,7 @@ @MutationDataFetcher(type = "Mutation", field = "clickListItem") public class MutationClickListItemDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/mutation/MutationEditCheckboxDataFetcher.java b/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/mutation/MutationEditCheckboxDataFetcher.java index a4147b843a..69a6eb48cb 100644 --- a/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/mutation/MutationEditCheckboxDataFetcher.java +++ b/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/mutation/MutationEditCheckboxDataFetcher.java @@ -34,7 +34,7 @@ @MutationDataFetcher(type = "Mutation", field = "editCheckbox") public class MutationEditCheckboxDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/mutation/MutationEditMultiSelectDataFetcher.java b/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/mutation/MutationEditMultiSelectDataFetcher.java index d4172a93ea..cd8ee5f318 100644 --- a/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/mutation/MutationEditMultiSelectDataFetcher.java +++ b/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/mutation/MutationEditMultiSelectDataFetcher.java @@ -34,7 +34,7 @@ @MutationDataFetcher(type = "Mutation", field = "editMultiSelect") public class MutationEditMultiSelectDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/mutation/MutationEditRadioDataFetcher.java b/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/mutation/MutationEditRadioDataFetcher.java index f65a6daf73..39a6d01959 100644 --- a/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/mutation/MutationEditRadioDataFetcher.java +++ b/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/mutation/MutationEditRadioDataFetcher.java @@ -34,7 +34,7 @@ @MutationDataFetcher(type = "Mutation", field = "editRadio") public class MutationEditRadioDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/mutation/MutationEditRichTextDataFetcher.java b/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/mutation/MutationEditRichTextDataFetcher.java index a082ac1242..b920caac24 100644 --- a/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/mutation/MutationEditRichTextDataFetcher.java +++ b/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/mutation/MutationEditRichTextDataFetcher.java @@ -34,7 +34,7 @@ @MutationDataFetcher(type = "Mutation", field = "editRichText") public class MutationEditRichTextDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/mutation/MutationEditSelectDataFetcher.java b/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/mutation/MutationEditSelectDataFetcher.java index 7ecbac455e..d469a856d3 100644 --- a/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/mutation/MutationEditSelectDataFetcher.java +++ b/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/mutation/MutationEditSelectDataFetcher.java @@ -34,7 +34,7 @@ @MutationDataFetcher(type = "Mutation", field = "editSelect") public class MutationEditSelectDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/mutation/MutationEditTextfieldDataFetcher.java b/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/mutation/MutationEditTextfieldDataFetcher.java index 2af99fc913..5eab27e02f 100644 --- a/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/mutation/MutationEditTextfieldDataFetcher.java +++ b/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/mutation/MutationEditTextfieldDataFetcher.java @@ -34,7 +34,7 @@ @MutationDataFetcher(type = "Mutation", field = "editTextfield") public class MutationEditTextfieldDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/mutation/MutationPushButtonDataFetcher.java b/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/mutation/MutationPushButtonDataFetcher.java index 5a4fa65121..349f6c61e0 100644 --- a/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/mutation/MutationPushButtonDataFetcher.java +++ b/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/mutation/MutationPushButtonDataFetcher.java @@ -34,7 +34,7 @@ @MutationDataFetcher(type = "Mutation", field = "pushButton") public class MutationPushButtonDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/subscription/SubscriptionFormEventDataFetcher.java b/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/subscription/SubscriptionFormEventDataFetcher.java index 3c9bfcb4e4..0a439ac4c3 100644 --- a/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/subscription/SubscriptionFormEventDataFetcher.java +++ b/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/subscription/SubscriptionFormEventDataFetcher.java @@ -37,7 +37,7 @@ @SubscriptionDataFetcher(type = "Subscription", field = "formEvent") public class SubscriptionFormEventDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/subscription/SubscriptionPropertiesEventDataFetcher.java b/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/subscription/SubscriptionPropertiesEventDataFetcher.java index 675a3c07bf..075a698ca5 100644 --- a/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/subscription/SubscriptionPropertiesEventDataFetcher.java +++ b/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/subscription/SubscriptionPropertiesEventDataFetcher.java @@ -36,7 +36,7 @@ @SubscriptionDataFetcher(type = "Subscription", field = "propertiesEvent") public class SubscriptionPropertiesEventDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/subscription/SubscriptionRelatedElementsEventDataFetcher.java b/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/subscription/SubscriptionRelatedElementsEventDataFetcher.java index 9d60105ae9..45d9318859 100644 --- a/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/subscription/SubscriptionRelatedElementsEventDataFetcher.java +++ b/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/subscription/SubscriptionRelatedElementsEventDataFetcher.java @@ -36,7 +36,7 @@ @SubscriptionDataFetcher(type = "Subscription", field = "relatedElementsEvent") public class SubscriptionRelatedElementsEventDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/subscription/SubscriptionRepresentationsEventDataFetcher.java b/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/subscription/SubscriptionRepresentationsEventDataFetcher.java index 50d8c177e6..9648281a87 100644 --- a/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/subscription/SubscriptionRepresentationsEventDataFetcher.java +++ b/packages/forms/backend/sirius-components-forms-graphql/src/main/java/org/eclipse/sirius/components/forms/graphql/datafetchers/subscription/SubscriptionRepresentationsEventDataFetcher.java @@ -36,7 +36,7 @@ @SubscriptionDataFetcher(type = "Subscription", field = "representationsEvent") public class SubscriptionRepresentationsEventDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/forms/backend/sirius-components-forms-graphql/src/test/java/org/eclipse/sirius/components/forms/graphql/architecture/ArchitectureConstants.java b/packages/forms/backend/sirius-components-forms-graphql/src/test/java/org/eclipse/sirius/components/forms/graphql/architecture/ArchitectureConstants.java index c10e1d7135..fc32e201f3 100644 --- a/packages/forms/backend/sirius-components-forms-graphql/src/test/java/org/eclipse/sirius/components/forms/graphql/architecture/ArchitectureConstants.java +++ b/packages/forms/backend/sirius-components-forms-graphql/src/test/java/org/eclipse/sirius/components/forms/graphql/architecture/ArchitectureConstants.java @@ -22,7 +22,7 @@ * @author gcoutable */ public final class ArchitectureConstants { - public static final String SIRIUS_COMPONENTS_FORMS_GRAPHQL_ROOT_PACKAGE = "org.eclipse.sirius.components.forms.graphql.."; //$NON-NLS-1$ + public static final String SIRIUS_COMPONENTS_FORMS_GRAPHQL_ROOT_PACKAGE = "org.eclipse.sirius.components.forms.graphql.."; // @formatter:off public static final JavaClasses CLASSES = new ClassFileImporter() diff --git a/packages/forms/backend/sirius-components-forms-tests/src/main/java/org/eclipse/sirius/components/forms/tests/FormAssert.java b/packages/forms/backend/sirius-components-forms-tests/src/main/java/org/eclipse/sirius/components/forms/tests/FormAssert.java index 9fcdeb2260..08665a6876 100644 --- a/packages/forms/backend/sirius-components-forms-tests/src/main/java/org/eclipse/sirius/components/forms/tests/FormAssert.java +++ b/packages/forms/backend/sirius-components-forms-tests/src/main/java/org/eclipse/sirius/components/forms/tests/FormAssert.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -98,7 +98,7 @@ public void isValid() { private void visitPageId(List ids, Page page) { if (ids.contains(page.getId())) { - this.failWithMessage("The id of the page <%s> already exists in the form", page.getId()); //$NON-NLS-1$ + this.failWithMessage("The id of the page <%s> already exists in the form", page.getId()); } ids.add(page.getId()); @@ -107,7 +107,7 @@ private void visitPageId(List ids, Page page) { private void visitGroupId(List ids, Group group) { if (ids.contains(group.getId())) { - this.failWithMessage("The id of the group <%s> already exists in the form", group.getId()); //$NON-NLS-1$ + this.failWithMessage("The id of the group <%s> already exists in the form", group.getId()); } ids.add(group.getId()); @@ -117,7 +117,7 @@ private void visitGroupId(List ids, Group group) { private void visitWidgetId(List ids, AbstractWidget widget) { if (widget != null) { if (ids.contains(widget.getId())) { - this.failWithMessage("The id of the widget <%s> already exists in the form", widget.getId()); //$NON-NLS-1$ + this.failWithMessage("The id of the widget <%s> already exists in the form", widget.getId()); } ids.add(widget.getId()); } diff --git a/packages/forms/backend/sirius-components-forms-tests/src/main/java/org/eclipse/sirius/components/forms/tests/WidgetAssert.java b/packages/forms/backend/sirius-components-forms-tests/src/main/java/org/eclipse/sirius/components/forms/tests/WidgetAssert.java index 7602f4bf57..4b06c6d9e2 100644 --- a/packages/forms/backend/sirius-components-forms-tests/src/main/java/org/eclipse/sirius/components/forms/tests/WidgetAssert.java +++ b/packages/forms/backend/sirius-components-forms-tests/src/main/java/org/eclipse/sirius/components/forms/tests/WidgetAssert.java @@ -140,7 +140,7 @@ private void assertTree(TreeWidget actualTree, TreeWidget expectedTree, IdPolicy TreeNode expectedNode = expectedTree.getNodes().get(i); assertThat(actualNode.getLabel()).isEqualTo(expectedNode.getLabel()); - assertThat("/api/images" + actualNode.getImageURL()).isEqualTo(expectedNode.getImageURL()); //$NON-NLS-1$ + assertThat("/api/images" + actualNode.getImageURL()).isEqualTo(expectedNode.getImageURL()); assertThat(actualNode.getKind()).isEqualTo(expectedNode.getKind()); if (idPolicy == IdPolicy.WITH_ID) { assertThat(actualNode.getId()).isEqualTo(expectedNode.getId()); diff --git a/packages/forms/backend/sirius-components-forms-tests/src/main/java/org/eclipse/sirius/components/forms/tests/WidgetDeserializer.java b/packages/forms/backend/sirius-components-forms-tests/src/main/java/org/eclipse/sirius/components/forms/tests/WidgetDeserializer.java index bc1cc2292a..69048c0ff1 100644 --- a/packages/forms/backend/sirius-components-forms-tests/src/main/java/org/eclipse/sirius/components/forms/tests/WidgetDeserializer.java +++ b/packages/forms/backend/sirius-components-forms-tests/src/main/java/org/eclipse/sirius/components/forms/tests/WidgetDeserializer.java @@ -58,7 +58,7 @@ public AbstractWidget deserialize(JsonParser jsonParser, DeserializationContext ObjectMapper mapper = (ObjectMapper) objectCodec; ObjectNode root = mapper.readTree(jsonParser); - JsonNode typeName = root.get("__typename"); //$NON-NLS-1$ + JsonNode typeName = root.get("__typename"); if (Radio.class.getSimpleName().equals(typeName.asText())) { nodeStyle = mapper.readValue(root.toString(), Radio.class); } else if (Select.class.getSimpleName().equals(typeName.asText())) { diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Button.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Button.java index c749f8ec91..dad0e18ca6 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Button.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Button.java @@ -69,7 +69,7 @@ public static Builder newButton(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, buttonLabel: {3}, imageURL: {4}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, buttonLabel: {3}, imageURL: {4}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.getId(), this.label, this.buttonLabel, this.imageURL); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/ButtonStyle.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/ButtonStyle.java index 24ef6617d5..12c8bf538b 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/ButtonStyle.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/ButtonStyle.java @@ -47,7 +47,7 @@ public static Builder newButtonStyle() { @Override public String toString() { - String pattern = "{0} '{'backgroundColor: {1}, foregroundColor: {2}, fontSize: {3}, italic: {4}, bold: {5}, underline: {6}, strikeThrough: {7},'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'backgroundColor: {1}, foregroundColor: {2}, fontSize: {3}, italic: {4}, bold: {5}, underline: {6}, strikeThrough: {7},'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.backgroundColor, this.foregroundColor, this.fontSize, this.italic, this.bold, this.underline, this.strikeThrough); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/ChartWidget.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/ChartWidget.java index 928ccea681..25c378ebc2 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/ChartWidget.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/ChartWidget.java @@ -43,7 +43,7 @@ public static Builder newChartWidget(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.getId(), this.label); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Checkbox.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Checkbox.java index 3320e4a5ce..1123f53bb1 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Checkbox.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Checkbox.java @@ -56,7 +56,7 @@ public static Builder newCheckbox(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, value: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, value: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.getId(), this.label, this.value); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/CheckboxStyle.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/CheckboxStyle.java index 46c0593735..71fb4bd715 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/CheckboxStyle.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/CheckboxStyle.java @@ -41,7 +41,7 @@ public static Builder newCheckboxStyle() { @Override public String toString() { - String pattern = "{0} '{'color: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'color: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.color); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/CompletionProposal.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/CompletionProposal.java index 5e6850de8e..407b954621 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/CompletionProposal.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/CompletionProposal.java @@ -47,7 +47,7 @@ public int getCharsToReplace() { @Override public String toString() { - String pattern = "{0} '{'description: {1}, textToInsert: {2}, charsToReplace: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'description: {1}, textToInsert: {2}, charsToReplace: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.description, this.textToInsert, this.charsToReplace); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/CompletionRequest.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/CompletionRequest.java index d5b8a47e89..9873cb822d 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/CompletionRequest.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/CompletionRequest.java @@ -24,12 +24,12 @@ public final class CompletionRequest { /** * The name of the variable used to pass the current text value to the completion provider implementation. */ - public static final String CURRENT_TEXT = "currentText"; //$NON-NLS-1$ + public static final String CURRENT_TEXT = "currentText"; /** * The name of the variable used to pass the cursor position to the completion provider implementation. */ - public static final String CURSOR_POSITION = "cursorPosition"; //$NON-NLS-1$ + public static final String CURSOR_POSITION = "cursorPosition"; private final String currentText; @@ -50,7 +50,7 @@ public int getCursorPosition() { @Override public String toString() { - String pattern = "{0} '{'currentText: {1}, cursorPosition: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'currentText: {1}, cursorPosition: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.currentText, this.cursorPosition); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/FlexDirection.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/FlexDirection.java index 9a22eb6cf9..c1156f4b15 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/FlexDirection.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/FlexDirection.java @@ -20,7 +20,7 @@ * @author arichard */ public enum FlexDirection { - row("row"), rowReverse("row-reverse"), column("column"), columnReverse("column-reverse"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + row("row"), rowReverse("row-reverse"), column("column"), columnReverse("column-reverse"); private final String flexDirection; diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/FlexboxContainer.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/FlexboxContainer.java index 1dd1795b93..becc7f2439 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/FlexboxContainer.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/FlexboxContainer.java @@ -67,7 +67,7 @@ public static Builder newFlexboxContainer(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}', flexDirection: {3}', flexWrap: {4}', flexGrow: {5}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}', flexDirection: {3}', flexWrap: {4}', flexGrow: {5}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.getId(), this.label, this.flexDirection, this.flexWrap, this.flexGrow); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Form.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Form.java index 9d196dfc90..e879ca7368 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Form.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Form.java @@ -30,7 +30,7 @@ @Immutable public final class Form implements IRepresentation, ISemanticRepresentation { - public static final String KIND = IRepresentation.KIND_PREFIX + "?type=Form"; //$NON-NLS-1$ + public static final String KIND = IRepresentation.KIND_PREFIX + "?type=Form"; private String id; @@ -87,7 +87,7 @@ public static Builder newForm(Form form) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, targetObjectId: {3}, descriptionId: {4} pageCount: {5}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, targetObjectId: {3}, descriptionId: {4} pageCount: {5}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label, this.targetObjectId, this.descriptionId, this.pages.size()); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Group.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Group.java index 9b86540548..d7b921dc30 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Group.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Group.java @@ -65,7 +65,7 @@ public static Builder newGroup(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, displayMode: {3}, toolbarActionsCount: {4}, widgetCount: {5}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, displayMode: {3}, toolbarActionsCount: {4}, widgetCount: {5}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label, this.displayMode, this.toolbarActions.size(), this.widgets.size()); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Image.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Image.java index 739cf134e0..bb75f96064 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Image.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Image.java @@ -49,7 +49,7 @@ public static Builder newImage(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, url: {3}, maxWidth: {4}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, url: {3}, maxWidth: {4}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.getId(), this.label, this.url, this.maxWidth); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/LabelWidget.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/LabelWidget.java index 0bed10111f..21c20bf463 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/LabelWidget.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/LabelWidget.java @@ -55,7 +55,7 @@ public static Builder newLabelWidget(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, value: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, value: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.getId(), this.label, this.value); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/LabelWidgetStyle.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/LabelWidgetStyle.java index 253b780b1f..8f1923c078 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/LabelWidgetStyle.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/LabelWidgetStyle.java @@ -41,7 +41,7 @@ public static Builder newLabelWidgetStyle() { @Override public String toString() { - String pattern = "{0} '{'color: {1}, fontSize: {2}, italic: {3}, bold: {4}, underline: {5}, strikeThrough: {6},'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'color: {1}, fontSize: {2}, italic: {3}, bold: {4}, underline: {5}, strikeThrough: {6},'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.color, this.fontSize, this.italic, this.bold, this.underline, this.strikeThrough); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Link.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Link.java index 84afdecad8..951817d81d 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Link.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Link.java @@ -49,7 +49,7 @@ public static Builder newLink(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, url: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, url: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.getId(), this.label, this.url); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/LinkStyle.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/LinkStyle.java index 2f5c64454e..79234d0a45 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/LinkStyle.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/LinkStyle.java @@ -41,7 +41,7 @@ public static Builder newLinkStyle() { @Override public String toString() { - String pattern = "{0} '{'color: {1}, fontSize: {2}, italic: {3}, bold: {4}, underline: {5}, strikeThrough: {6},'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'color: {1}, fontSize: {2}, italic: {3}, bold: {4}, underline: {5}, strikeThrough: {6},'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.color, this.fontSize, this.italic, this.bold, this.underline, this.strikeThrough); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/List.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/List.java index c7508bb4e8..099caa49fe 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/List.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/List.java @@ -47,7 +47,7 @@ public static Builder newList(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, items: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, items: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.getId(), this.label, this.items); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/ListItem.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/ListItem.java index eb55fcf1f3..7ca95301d5 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/ListItem.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/ListItem.java @@ -79,7 +79,7 @@ public static Builder newListItem(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, kind: {3}, deletable: {4}, imageURL: {5}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, kind: {3}, deletable: {4}, imageURL: {5}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label, this.kind, this.deletable, this.imageURL); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/ListStyle.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/ListStyle.java index b8b357e14b..15d41d709e 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/ListStyle.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/ListStyle.java @@ -41,7 +41,7 @@ public static Builder newListStyle() { @Override public String toString() { - String pattern = "{0} '{'color: {1}, fontSize: {2}, italic: {3}, bold: {4}, underline: {5}, strikeThrough: {6},'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'color: {1}, fontSize: {2}, italic: {3}, bold: {4}, underline: {5}, strikeThrough: {6},'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.color, this.fontSize, this.italic, this.bold, this.underline, this.strikeThrough); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/MultiSelect.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/MultiSelect.java index bb79ef6ce1..0e98b13b84 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/MultiSelect.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/MultiSelect.java @@ -63,7 +63,7 @@ public static Builder newMultiSelect(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, values: {3}, options: {4}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, values: {3}, options: {4}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.getId(), this.label, this.values, this.options); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/MultiSelectStyle.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/MultiSelectStyle.java index dc64f73ace..e338a7ad88 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/MultiSelectStyle.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/MultiSelectStyle.java @@ -47,7 +47,7 @@ public static Builder newMultiSelectStyle() { @Override public String toString() { - String pattern = "{0} '{'backgroundColor: {1}, foregroundColor: {2}, fontSize: {3}, italic: {4}, bold: {5}, underline: {6}, strikeThrough: {7},'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'backgroundColor: {1}, foregroundColor: {2}, fontSize: {3}, italic: {4}, bold: {5}, underline: {6}, strikeThrough: {7},'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.backgroundColor, this.foregroundColor, this.fontSize, this.italic, this.bold, this.underline, this.strikeThrough); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Page.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Page.java index 601ea1eb00..b4e9a8c90d 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Page.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Page.java @@ -53,7 +53,7 @@ public static Builder newPage(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, groupCount: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, groupCount: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label, this.groups.size()); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Radio.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Radio.java index 55cb993251..e2e8a2827e 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Radio.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Radio.java @@ -56,7 +56,7 @@ public static Builder newRadio(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, options: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, options: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.getId(), this.label, this.options); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/RadioOption.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/RadioOption.java index 423156d31c..c246315be0 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/RadioOption.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/RadioOption.java @@ -52,7 +52,7 @@ public static Builder newRadioOption(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, selected: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, selected: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label, this.selected); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/RadioStyle.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/RadioStyle.java index 09592aaffa..0bec8f49c1 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/RadioStyle.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/RadioStyle.java @@ -41,7 +41,7 @@ public static Builder newRadioStyle() { @Override public String toString() { - String pattern = "{0} '{'backgroundColor: {1}, fontSize: {2}, italic: {3}, bold: {4}, underline: {5}, strikeThrough: {6},'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'backgroundColor: {1}, fontSize: {2}, italic: {3}, bold: {4}, underline: {5}, strikeThrough: {6},'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.color, this.fontSize, this.italic, this.bold, this.underline, this.strikeThrough); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/RichText.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/RichText.java index 82647c43a2..37e680281e 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/RichText.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/RichText.java @@ -50,7 +50,7 @@ public static Builder newRichText(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, value: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, value: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.getId(), this.label, this.value); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Select.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Select.java index c59afe406b..bd4745a601 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Select.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Select.java @@ -62,7 +62,7 @@ public static Builder newSelect(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, value: {3}, options: {4}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, value: {3}, options: {4}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.getId(), this.label, this.value, this.options); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/SelectOption.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/SelectOption.java index cf7e6b3c6a..2125549c4c 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/SelectOption.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/SelectOption.java @@ -46,7 +46,7 @@ public static Builder newSelectOption(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/SelectStyle.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/SelectStyle.java index 883ee96e20..7f48760884 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/SelectStyle.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/SelectStyle.java @@ -46,7 +46,7 @@ public static Builder newSelectStyle() { @Override public String toString() { - String pattern = "{0} '{'backgroundColor: {1}, foregroundColor: {2}, fontSize: {3}, italic: {4}, bold: {5}, underline: {6}, strikeThrough: {7},'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'backgroundColor: {1}, foregroundColor: {2}, fontSize: {3}, italic: {4}, bold: {5}, underline: {6}, strikeThrough: {7},'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.backgroundColor, this.foregroundColor, this.fontSize, this.italic, this.bold, this.underline, this.strikeThrough); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Textarea.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Textarea.java index 02e02f8142..0ff744eb92 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Textarea.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Textarea.java @@ -67,7 +67,7 @@ public static Builder newTextarea(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, value: {3}, supportsCompletion: {4}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, value: {3}, supportsCompletion: {4}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.getId(), this.label, this.value, this.completionProposalsProvider != null); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/TextareaStyle.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/TextareaStyle.java index 13a9b336da..375fce026f 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/TextareaStyle.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/TextareaStyle.java @@ -47,7 +47,7 @@ public static Builder newTextareaStyle() { @Override public String toString() { - String pattern = "{0} '{'backgroundColor: {1}, foregroundColor: {2}, fontSize: {3}, italic: {4}, bold: {5}, underline: {6}, strikeThrough: {7},'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'backgroundColor: {1}, foregroundColor: {2}, fontSize: {3}, italic: {4}, bold: {5}, underline: {6}, strikeThrough: {7},'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.backgroundColor, this.foregroundColor, this.fontSize, this.italic, this.bold, this.underline, this.strikeThrough); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Textfield.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Textfield.java index a549ed2a8d..0f3c7fab12 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Textfield.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/Textfield.java @@ -67,7 +67,7 @@ public static Builder newTextfield(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, value: {3}', supportsCompletion: {4}}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, value: {3}', supportsCompletion: {4}}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.getId(), this.label, this.value, this.completionProposalsProvider != null); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/TextfieldStyle.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/TextfieldStyle.java index b9896cd870..264fb4144b 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/TextfieldStyle.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/TextfieldStyle.java @@ -47,7 +47,7 @@ public static Builder newTextfieldStyle() { @Override public String toString() { - String pattern = "{0} '{'backgroundColor: {1}, foregroundColor: {2}, fontSize: {3}, italic: {4}, bold: {5}, underline: {6}, strikeThrough: {7},'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'backgroundColor: {1}, foregroundColor: {2}, fontSize: {3}, italic: {4}, bold: {5}, underline: {6}, strikeThrough: {7},'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.backgroundColor, this.foregroundColor, this.fontSize, this.italic, this.bold, this.underline, this.strikeThrough); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/ToolbarAction.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/ToolbarAction.java index 012efeab4c..7b300800b5 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/ToolbarAction.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/ToolbarAction.java @@ -69,7 +69,7 @@ public static Builder newToolbarAction(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, buttonLabel: {3}, imageURL: {4}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, buttonLabel: {3}, imageURL: {4}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.getId(), this.label, this.buttonLabel, this.imageURL); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/TreeNode.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/TreeNode.java index 9f5e4240d4..42bda66d49 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/TreeNode.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/TreeNode.java @@ -70,7 +70,7 @@ public static Builder newTreeNode(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, kind: {3}, selectable: {4}, imageURL: {5}, parentId: {6}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, kind: {3}, selectable: {4}, imageURL: {5}, parentId: {6}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label, this.kind, this.selectable, this.imageURL, this.parentId); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/TreeWidget.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/TreeWidget.java index be872bc911..39d2c24e7e 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/TreeWidget.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/TreeWidget.java @@ -55,7 +55,7 @@ public static Builder newTreeWidget(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, nodeCount: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, nodeCount: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.getId(), this.label, this.nodes.size()); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/components/GroupComponent.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/components/GroupComponent.java index c4ce9ecdf1..b7a52d626b 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/components/GroupComponent.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/components/GroupComponent.java @@ -40,7 +40,7 @@ public class GroupComponent implements IComponent { * The variable name used to store a {@link WidgetIdCounter} in the {@link VariableManager} of the * {@link GroupComponent}. */ - public static final String WIDGET_ID_PROVIDER_COUNTER = "widgetIdProviderCounter"; //$NON-NLS-1$ + public static final String WIDGET_ID_PROVIDER_COUNTER = "widgetIdProviderCounter"; private GroupComponentProps props; diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/components/ListComponent.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/components/ListComponent.java index c6b9956bb9..a86529a4b1 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/components/ListComponent.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/components/ListComponent.java @@ -37,9 +37,9 @@ */ public class ListComponent implements IComponent { - public static final String CANDIDATE_VARIABLE = "candidate"; //$NON-NLS-1$ + public static final String CANDIDATE_VARIABLE = "candidate"; - public static final String CLICK_EVENT_KIND_VARIABLE = "onClickEventKind"; //$NON-NLS-1$ + public static final String CLICK_EVENT_KIND_VARIABLE = "onClickEventKind"; private ListComponentProps props; diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/components/MultiSelectComponent.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/components/MultiSelectComponent.java index df0df58005..547e9859a0 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/components/MultiSelectComponent.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/components/MultiSelectComponent.java @@ -36,7 +36,7 @@ */ public class MultiSelectComponent implements IComponent { - public static final String CANDIDATE_VARIABLE = "candidate"; //$NON-NLS-1$ + public static final String CANDIDATE_VARIABLE = "candidate"; private MultiSelectComponentProps props; diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/components/RadioComponent.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/components/RadioComponent.java index e895f46e27..6086f583fa 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/components/RadioComponent.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/components/RadioComponent.java @@ -36,7 +36,7 @@ */ public class RadioComponent implements IComponent { - public static final String CANDIDATE_VARIABLE = "candidate"; //$NON-NLS-1$ + public static final String CANDIDATE_VARIABLE = "candidate"; private RadioComponentProps props; diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/components/SelectComponent.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/components/SelectComponent.java index a80da4398b..f5edd32fdb 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/components/SelectComponent.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/components/SelectComponent.java @@ -35,7 +35,7 @@ */ public class SelectComponent implements IComponent { - public static final String CANDIDATE_VARIABLE = "candidate"; //$NON-NLS-1$ + public static final String CANDIDATE_VARIABLE = "candidate"; private SelectComponentProps props; diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/components/TreeComponent.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/components/TreeComponent.java index f06af5c9d1..2b9d9acc97 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/components/TreeComponent.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/components/TreeComponent.java @@ -32,11 +32,11 @@ */ public class TreeComponent implements IComponent { - public static final String ROOT_VARIABLE = "root"; //$NON-NLS-1$ + public static final String ROOT_VARIABLE = "root"; - public static final String ANCESTORS_VARIABLE = "ancestors"; //$NON-NLS-1$ + public static final String ANCESTORS_VARIABLE = "ancestors"; - public static final String NODES_VARIABLE = "nodes"; //$NON-NLS-1$ + public static final String NODES_VARIABLE = "nodes"; private final TreeComponentProps props; diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/components/WidgetComponent.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/components/WidgetComponent.java index 62b6050189..2d426d52a1 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/components/WidgetComponent.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/components/WidgetComponent.java @@ -104,7 +104,7 @@ public Element render() { RichTextComponentProps richTextComponentProps = new RichTextComponentProps(variableManager, (RichTextDescription) widgetDescription); element = new Element(RichTextComponent.class, richTextComponentProps); } else { - String pattern = "Unsupported widget description: {}"; //$NON-NLS-1$ + String pattern = "Unsupported widget description: {}"; this.logger.warn(pattern, widgetDescription.getClass().getSimpleName()); } return element; diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/ButtonDescription.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/ButtonDescription.java index 7f2622dba5..bcbf531e62 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/ButtonDescription.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/ButtonDescription.java @@ -81,7 +81,7 @@ public static Builder newButtonDescription(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.getId()); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/ChartWidgetDescription.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/ChartWidgetDescription.java index 765b3bf87c..15bf9171d3 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/ChartWidgetDescription.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/ChartWidgetDescription.java @@ -62,7 +62,7 @@ public static Builder newChartWidgetDescription(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.getId()); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/CheckboxDescription.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/CheckboxDescription.java index c3c2e4c220..aa9b448d23 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/CheckboxDescription.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/CheckboxDescription.java @@ -77,7 +77,7 @@ public static Builder newCheckboxDescription(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.getId()); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/FlexboxContainerDescription.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/FlexboxContainerDescription.java index af0207e1e5..8d9edddf6f 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/FlexboxContainerDescription.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/FlexboxContainerDescription.java @@ -62,7 +62,7 @@ public static Builder newFlexboxContainerDescription(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.getId()); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/ForDescription.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/ForDescription.java index da88e91c4c..ca02344c5e 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/ForDescription.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/ForDescription.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -56,7 +56,7 @@ public static Builder newForDescription(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, iterator: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, iterator: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.getId(), this.iterator); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/FormDescription.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/FormDescription.java index d2b1b8dfff..ee0e484aa9 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/FormDescription.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/FormDescription.java @@ -93,7 +93,7 @@ public static Builder newFormDescription(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/GroupDescription.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/GroupDescription.java index ccf9b71627..68249e5dc5 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/GroupDescription.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/GroupDescription.java @@ -80,7 +80,7 @@ public static Builder newGroupDescription(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/IfDescription.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/IfDescription.java index ce430a5be1..b1700f8f94 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/IfDescription.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/IfDescription.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -54,7 +54,7 @@ public static Builder newIfDescription(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/ImageDescription.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/ImageDescription.java index b25e441459..c47aaa6155 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/ImageDescription.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/ImageDescription.java @@ -67,7 +67,7 @@ public static Builder newImageDescription(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.getId()); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/LabelDescription.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/LabelDescription.java index 2999c4e855..78698ccac0 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/LabelDescription.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/LabelDescription.java @@ -63,7 +63,7 @@ public static Builder newLabelDescription(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.getId()); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/LinkDescription.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/LinkDescription.java index 730c9fe36d..642b51bbd3 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/LinkDescription.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/LinkDescription.java @@ -69,7 +69,7 @@ public static Builder newLinkDescription(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.getId()); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/ListDescription.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/ListDescription.java index a3c1eb626a..df87c6a67d 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/ListDescription.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/ListDescription.java @@ -112,7 +112,7 @@ public static Builder newListDescription(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.getId()); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/MultiSelectDescription.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/MultiSelectDescription.java index d7aaf78f8b..9f46bf1093 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/MultiSelectDescription.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/MultiSelectDescription.java @@ -96,7 +96,7 @@ public static Builder newMultiSelectDescription(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.getId()); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/PageDescription.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/PageDescription.java index bab064e8ef..6614b8d148 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/PageDescription.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/PageDescription.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -74,7 +74,7 @@ public static Builder newPageDescription(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/RadioDescription.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/RadioDescription.java index 755b46332c..db38ff7f85 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/RadioDescription.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/RadioDescription.java @@ -95,7 +95,7 @@ public static Builder newRadioDescription(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.getId()); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/RichTextDescription.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/RichTextDescription.java index 012aba8ddd..bdd3d4f8aa 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/RichTextDescription.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/RichTextDescription.java @@ -69,7 +69,7 @@ public static Builder newRichTextDescription(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.getId()); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/SelectDescription.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/SelectDescription.java index d71bc6a578..c327c9dd9c 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/SelectDescription.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/SelectDescription.java @@ -95,7 +95,7 @@ public static Builder newSelectDescription(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.getId()); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/TextareaDescription.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/TextareaDescription.java index 702cc8d6b5..a46b69ea44 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/TextareaDescription.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/TextareaDescription.java @@ -83,7 +83,7 @@ public static Builder newTextareaDescription(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.getId()); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/TextfieldDescription.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/TextfieldDescription.java index eda6f6bbe9..90c564c286 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/TextfieldDescription.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/TextfieldDescription.java @@ -83,7 +83,7 @@ public static Builder newTextfieldDescription(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.getId()); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/TreeDescription.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/TreeDescription.java index 0aaecf6d3e..992d45c7f7 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/TreeDescription.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/description/TreeDescription.java @@ -98,7 +98,7 @@ public static Builder newTreeDescription(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.getId()); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/ButtonElementProps.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/ButtonElementProps.java index 827b4d5a95..0e61b3078d 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/ButtonElementProps.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/ButtonElementProps.java @@ -30,7 +30,7 @@ */ @Immutable public final class ButtonElementProps implements IProps { - public static final String TYPE = "Button"; //$NON-NLS-1$ + public static final String TYPE = "Button"; private String id; @@ -91,7 +91,7 @@ public static Builder newButtonElementProps(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, buttonLabel: {3}, imageURL: {4},'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, buttonLabel: {3}, imageURL: {4},'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label, this.buttonLabel, this.imageURL); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/ChartWidgetElementProps.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/ChartWidgetElementProps.java index 9aed60c111..2322290489 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/ChartWidgetElementProps.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/ChartWidgetElementProps.java @@ -27,7 +27,7 @@ */ @Immutable public final class ChartWidgetElementProps implements IProps { - public static final String TYPE = "ChartWidget"; //$NON-NLS-1$ + public static final String TYPE = "ChartWidget"; private String id; @@ -64,7 +64,7 @@ public static Builder newChartWidgetElementProps(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/CheckboxElementProps.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/CheckboxElementProps.java index 2b7c125aac..40d89967e3 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/CheckboxElementProps.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/CheckboxElementProps.java @@ -30,7 +30,7 @@ */ @Immutable public final class CheckboxElementProps implements IProps { - public static final String TYPE = "Checkbox"; //$NON-NLS-1$ + public static final String TYPE = "Checkbox"; private String id; @@ -85,7 +85,7 @@ public static Builder newCheckboxElementProps(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, value: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, value: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label, this.value); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/FlexboxContainerElementProps.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/FlexboxContainerElementProps.java index 6e02e42979..df0cc2a043 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/FlexboxContainerElementProps.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/FlexboxContainerElementProps.java @@ -28,7 +28,7 @@ */ @Immutable public final class FlexboxContainerElementProps implements IProps { - public static final String TYPE = "FlexboxContainer"; //$NON-NLS-1$ + public static final String TYPE = "FlexboxContainer"; private String id; @@ -65,7 +65,7 @@ public static Builder newFlexboxContainerElementProps(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, flexDirection: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, flexDirection: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label, this.flexDirection); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/FormElementProps.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/FormElementProps.java index b3df9aa4e4..680ce80f68 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/FormElementProps.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/FormElementProps.java @@ -27,7 +27,7 @@ */ @Immutable public final class FormElementProps implements IProps { - public static final String TYPE = "Form"; //$NON-NLS-1$ + public static final String TYPE = "Form"; private String id; @@ -70,7 +70,7 @@ public static Builder newFormElementProps(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/GroupElementProps.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/GroupElementProps.java index 0624a64b60..e4f7b4b09d 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/GroupElementProps.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/GroupElementProps.java @@ -28,7 +28,7 @@ */ @Immutable public final class GroupElementProps implements IProps { - public static final String TYPE = "Group"; //$NON-NLS-1$ + public static final String TYPE = "Group"; private String id; @@ -65,7 +65,7 @@ public static Builder newGroupElementProps(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/ImageElementProps.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/ImageElementProps.java index 4567e8fcfb..b8e723452c 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/ImageElementProps.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/ImageElementProps.java @@ -27,7 +27,7 @@ */ @Immutable public final class ImageElementProps implements IProps { - public static final String TYPE = "Image"; //$NON-NLS-1$ + public static final String TYPE = "Image"; private String id; @@ -76,7 +76,7 @@ public static Builder newImageElementProps(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, url: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, url: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label, this.url); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/LabelWidgetElementProps.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/LabelWidgetElementProps.java index 0468f766fc..e91885e3bd 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/LabelWidgetElementProps.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/LabelWidgetElementProps.java @@ -28,7 +28,7 @@ */ @Immutable public final class LabelWidgetElementProps implements IProps { - public static final String TYPE = "LabelWidget"; //$NON-NLS-1$ + public static final String TYPE = "LabelWidget"; private String id; @@ -71,7 +71,7 @@ public static Builder newLabelWidgetElementProps(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, value: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, value: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label, this.value); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/LinkElementProps.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/LinkElementProps.java index 8eab3563df..72254fe9f9 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/LinkElementProps.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/LinkElementProps.java @@ -28,7 +28,7 @@ */ @Immutable public final class LinkElementProps implements IProps { - public static final String TYPE = "Link"; //$NON-NLS-1$ + public static final String TYPE = "Link"; private String id; @@ -77,7 +77,7 @@ public static Builder newLinkElementProps(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, url: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, url: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label, this.url); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/ListElementProps.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/ListElementProps.java index a4d50f5fca..c3480c9edd 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/ListElementProps.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/ListElementProps.java @@ -29,7 +29,7 @@ */ @Immutable public final class ListElementProps implements IProps { - public static final String TYPE = "List"; //$NON-NLS-1$ + public static final String TYPE = "List"; private String id; @@ -78,7 +78,7 @@ public static Builder newListElementProps(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, items: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, items: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label, this.items); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/MultiSelectElementProps.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/MultiSelectElementProps.java index e27be423ce..0c3245cbd0 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/MultiSelectElementProps.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/MultiSelectElementProps.java @@ -32,7 +32,7 @@ */ @Immutable public final class MultiSelectElementProps implements IProps { - public static final String TYPE = "MultiSelect"; //$NON-NLS-1$ + public static final String TYPE = "MultiSelect"; private String id; @@ -93,7 +93,7 @@ public static Builder newMultiSelectElementProps(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, value: {3}, options:{4}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, value: {3}, options:{4}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label, this.values, this.options); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/PageElementProps.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/PageElementProps.java index cdcc862e33..221d55897e 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/PageElementProps.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/PageElementProps.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -27,7 +27,7 @@ */ @Immutable public final class PageElementProps implements IProps { - public static final String TYPE = "Page"; //$NON-NLS-1$ + public static final String TYPE = "Page"; private String id; @@ -58,7 +58,7 @@ public static Builder newPageElementProps(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/RadioElementProps.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/RadioElementProps.java index 2fa0a57a93..c8f3ed1d07 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/RadioElementProps.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/RadioElementProps.java @@ -31,7 +31,7 @@ */ @Immutable public final class RadioElementProps implements IProps { - public static final String TYPE = "Radio"; //$NON-NLS-1$ + public static final String TYPE = "Radio"; private String id; @@ -86,7 +86,7 @@ public static Builder newRadioElementProps(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, options: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, options: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label, this.options); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/RichTextElementProps.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/RichTextElementProps.java index 802280307c..1cb982375e 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/RichTextElementProps.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/RichTextElementProps.java @@ -29,7 +29,7 @@ */ @Immutable public final class RichTextElementProps implements IProps { - public static final String TYPE = "RichText"; //$NON-NLS-1$ + public static final String TYPE = "RichText"; private String id; @@ -78,7 +78,7 @@ public static Builder newRichTextElementProps(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, value: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, value: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label, this.value); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/SelectElementProps.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/SelectElementProps.java index f9854ab1ef..7a35491bf9 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/SelectElementProps.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/SelectElementProps.java @@ -31,7 +31,7 @@ */ @Immutable public final class SelectElementProps implements IProps { - public static final String TYPE = "Select"; //$NON-NLS-1$ + public static final String TYPE = "Select"; private String id; @@ -92,7 +92,7 @@ public static Builder newSelectElementProps(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, value: {3}, options:{4}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, value: {3}, options:{4}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label, this.value, this.options); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/TextareaElementProps.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/TextareaElementProps.java index 43b5d20fed..4fff4ba78e 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/TextareaElementProps.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/TextareaElementProps.java @@ -32,7 +32,7 @@ */ @Immutable public final class TextareaElementProps implements IProps { - public static final String TYPE = "Textarea"; //$NON-NLS-1$ + public static final String TYPE = "Textarea"; private String id; @@ -93,7 +93,7 @@ public static Builder newTextareaElementProps(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, value: {3}, supportsCompletion: {4}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, value: {3}, supportsCompletion: {4}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label, this.value, this.completionProposalsProvider != null); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/TextfieldElementProps.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/TextfieldElementProps.java index 116b2072e3..193f1d0bb8 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/TextfieldElementProps.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/TextfieldElementProps.java @@ -32,7 +32,7 @@ */ @Immutable public final class TextfieldElementProps implements IProps { - public static final String TYPE = "Textfield"; //$NON-NLS-1$ + public static final String TYPE = "Textfield"; private String id; @@ -93,7 +93,7 @@ public static Builder newTextfieldElementProps(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, value: {3}, supportsCompletion: {4}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, value: {3}, supportsCompletion: {4}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label, this.value, this.completionProposalsProvider != null); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/ToolbarActionElementProps.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/ToolbarActionElementProps.java index 4de1fa201c..50cc4cff6f 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/ToolbarActionElementProps.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/ToolbarActionElementProps.java @@ -30,7 +30,7 @@ */ @Immutable public final class ToolbarActionElementProps implements IProps { - public static final String TYPE = "ToolbarAction"; //$NON-NLS-1$ + public static final String TYPE = "ToolbarAction"; private String id; @@ -91,7 +91,7 @@ public static Builder newToolbarActionElementProps(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, toolbarActionLabel: {3}, imageURL: {4},'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, toolbarActionLabel: {3}, imageURL: {4},'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label, this.toolbarActionLabel, this.imageURL); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/TreeElementProps.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/TreeElementProps.java index 95b72898e2..c72be1eec7 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/TreeElementProps.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/elements/TreeElementProps.java @@ -28,7 +28,7 @@ */ @Immutable public final class TreeElementProps implements IProps { - public static final String TYPE = "Tree"; //$NON-NLS-1$ + public static final String TYPE = "Tree"; private String id; @@ -77,7 +77,7 @@ public static Builder newTreeElementProps(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, nodes: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, nodes: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label, this.nodes); } diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/renderer/FormElementFactory.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/renderer/FormElementFactory.java index d0ec4da996..b375f63df7 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/renderer/FormElementFactory.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/renderer/FormElementFactory.java @@ -514,7 +514,7 @@ private FlexboxContainer instantiateFlexboxContainer(FlexboxContainerElementProp return FlexboxContainer.newFlexboxContainer(props.getId()) .label(props.getLabel()) .flexDirection(props.getFlexDirection().toString()) - .flexWrap("wrap") //$NON-NLS-1$ + .flexWrap("wrap") .flexGrow(1) .children(widgets) .diagnostics(diagnostics) diff --git a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/validation/DiagnosticElementProps.java b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/validation/DiagnosticElementProps.java index 061bb07c63..2114e59ec6 100644 --- a/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/validation/DiagnosticElementProps.java +++ b/packages/forms/backend/sirius-components-forms/src/main/java/org/eclipse/sirius/components/forms/validation/DiagnosticElementProps.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -26,7 +26,7 @@ */ @Immutable public final class DiagnosticElementProps implements IProps { - public static final String TYPE = "Diagnostic"; //$NON-NLS-1$ + public static final String TYPE = "Diagnostic"; private UUID id; @@ -56,7 +56,7 @@ public static Builder newDiagnosticElementProps(UUID id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, kind: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, kind: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.kind); } diff --git a/packages/forms/backend/sirius-components-forms/src/test/java/org/eclipse/sirius/components/forms/architecture/ArchitectureConstants.java b/packages/forms/backend/sirius-components-forms/src/test/java/org/eclipse/sirius/components/forms/architecture/ArchitectureConstants.java index fed4c9d14e..2167b9ac48 100644 --- a/packages/forms/backend/sirius-components-forms/src/test/java/org/eclipse/sirius/components/forms/architecture/ArchitectureConstants.java +++ b/packages/forms/backend/sirius-components-forms/src/test/java/org/eclipse/sirius/components/forms/architecture/ArchitectureConstants.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -22,7 +22,7 @@ * @author sbegaudeau */ public final class ArchitectureConstants { - public static final String SIRIUS_COMPONENTS_FORMS_ROOT_PACKAGE = "org.eclipse.sirius.components.forms.."; //$NON-NLS-1$ + public static final String SIRIUS_COMPONENTS_FORMS_ROOT_PACKAGE = "org.eclipse.sirius.components.forms.."; // @formatter:off public static final JavaClasses CLASSES = new ClassFileImporter() diff --git a/packages/forms/backend/sirius-components-forms/src/test/java/org/eclipse/sirius/components/forms/render/RenderTextfieldTest.java b/packages/forms/backend/sirius-components-forms/src/test/java/org/eclipse/sirius/components/forms/render/RenderTextfieldTest.java index d3a19c4647..1b9758079e 100644 --- a/packages/forms/backend/sirius-components-forms/src/test/java/org/eclipse/sirius/components/forms/render/RenderTextfieldTest.java +++ b/packages/forms/backend/sirius-components-forms/src/test/java/org/eclipse/sirius/components/forms/render/RenderTextfieldTest.java @@ -51,8 +51,8 @@ public class RenderTextfieldTest { public void setup() { // @formatter:off this.style = TextfieldStyle.newTextfieldStyle() - .foregroundColor("black") //$NON-NLS-1$ - .backgroundColor("white") //$NON-NLS-1$ + .foregroundColor("black") + .backgroundColor("white") .fontSize(12) .italic(false) .bold(false) @@ -66,12 +66,12 @@ public void setup() { @Test public void testRenderTextfieldWithoutProposalProvider() { // @formatter:off - TextfieldDescription textDescription = TextfieldDescription.newTextfieldDescription("textfieldDescriptionId") //$NON-NLS-1$ - .idProvider(this.constantProvider("testfieldId")) //$NON-NLS-1$ - .labelProvider(this.constantProvider("label")) //$NON-NLS-1$ - .valueProvider(this.constantProvider("value")) //$NON-NLS-1$ - .newValueHandler((v, s) -> new Success()).diagnosticsProvider(variableManager -> List.of()).kindProvider(diagnostic -> "") //$NON-NLS-1$ - .messageProvider(diagnostic -> "") //$NON-NLS-1$ + TextfieldDescription textDescription = TextfieldDescription.newTextfieldDescription("textfieldDescriptionId") + .idProvider(this.constantProvider("testfieldId")) + .labelProvider(this.constantProvider("label")) + .valueProvider(this.constantProvider("value")) + .newValueHandler((v, s) -> new Success()).diagnosticsProvider(variableManager -> List.of()).kindProvider(diagnostic -> "") + .messageProvider(diagnostic -> "") .styleProvider(this.constantProvider(this.style)).build(); // @formatter:on @@ -91,16 +91,16 @@ public void testRenderTextfieldWithoutProposalProvider() { @Test public void testRenderTextfieldWithProposalProvider() { - List proposals = List.of(new CompletionProposal("Proposal", "textToInsert", 0)); //$NON-NLS-1$ //$NON-NLS-2$ + List proposals = List.of(new CompletionProposal("Proposal", "textToInsert", 0)); // @formatter:off - TextfieldDescription textDescription = TextfieldDescription.newTextfieldDescription("textfieldDescriptionId") //$NON-NLS-1$ - .idProvider(this.constantProvider("testfieldId")) //$NON-NLS-1$ - .labelProvider(this.constantProvider("label")) //$NON-NLS-1$ - .valueProvider(this.constantProvider("value")) //$NON-NLS-1$ + TextfieldDescription textDescription = TextfieldDescription.newTextfieldDescription("textfieldDescriptionId") + .idProvider(this.constantProvider("testfieldId")) + .labelProvider(this.constantProvider("label")) + .valueProvider(this.constantProvider("value")) .completionProposalsProvider(this.constantProvider(proposals)) - .newValueHandler((v, s) -> new Success()).diagnosticsProvider(variableManager -> List.of()).kindProvider(diagnostic -> "") //$NON-NLS-1$ - .messageProvider(diagnostic -> "") //$NON-NLS-1$ + .newValueHandler((v, s) -> new Success()).diagnosticsProvider(variableManager -> List.of()).kindProvider(diagnostic -> "") + .messageProvider(diagnostic -> "") .styleProvider(this.constantProvider(this.style)).build(); // @formatter:on @@ -115,7 +115,7 @@ public void testRenderTextfieldWithProposalProvider() { Textfield renderedTextField = (Textfield) form.getPages().get(0).getGroups().get(0).getWidgets().get(0); assertThat(renderedTextField.getCompletionProposalsProvider()).isNotNull(); assertThat(renderedTextField.isSupportsCompletion()).isTrue(); - assertThat(renderedTextField.getCompletionProposalsProvider().apply(new CompletionRequest("", 0))).isEqualTo(proposals); //$NON-NLS-1$ + assertThat(renderedTextField.getCompletionProposalsProvider().apply(new CompletionRequest("", 0))).isEqualTo(proposals); } private Form renderForm(FormDescription formDescription) { @@ -128,29 +128,29 @@ private Form renderForm(FormDescription formDescription) { private FormDescription createSingleWidgetForm(TextfieldDescription textDescription) { // @formatter:off - GroupDescription groupDescription = GroupDescription.newGroupDescription("groupDescriptionId") //$NON-NLS-1$ - .idProvider(this.constantProvider("groupId")) //$NON-NLS-1$ - .labelProvider(this.constantProvider("groupLabel")) //$NON-NLS-1$ + GroupDescription groupDescription = GroupDescription.newGroupDescription("groupDescriptionId") + .idProvider(this.constantProvider("groupId")) + .labelProvider(this.constantProvider("groupLabel")) .displayModeProvider(this.constantProvider(GroupDisplayMode.LIST)) .toolbarActionDescriptions(List.of()) .controlDescriptions(List.of(textDescription)) .semanticElementsProvider(this.constantProvider(List.of(this.self))) .build(); - PageDescription pageDescription = PageDescription.newPageDescription("pageDescriptionId") //$NON-NLS-1$ - .idProvider(this.constantProvider("pageId")) //$NON-NLS-1$ - .labelProvider(this.constantProvider("pageLabel")) //$NON-NLS-1$ + PageDescription pageDescription = PageDescription.newPageDescription("pageDescriptionId") + .idProvider(this.constantProvider("pageId")) + .labelProvider(this.constantProvider("pageLabel")) .canCreatePredicate(variableManager -> true) .groupDescriptions(List.of(groupDescription)) .semanticElementsProvider(this.constantProvider(List.of(this.self))) .build(); - FormDescription formDescription = FormDescription.newFormDescription("formDescriptionId") //$NON-NLS-1$ - .label("formDescriptionLabel") //$NON-NLS-1$ - .idProvider(this.constantProvider("formId")) //$NON-NLS-1$ - .labelProvider(this.constantProvider("formLabel")) //$NON-NLS-1$ + FormDescription formDescription = FormDescription.newFormDescription("formDescriptionId") + .label("formDescriptionLabel") + .idProvider(this.constantProvider("formId")) + .labelProvider(this.constantProvider("formLabel")) .canCreatePredicate(variableManager -> true) .groupDescriptions(List.of(groupDescription)) .pageDescriptions(List.of(pageDescription)) - .targetObjectIdProvider(this.constantProvider("selfId")) //$NON-NLS-1$ + .targetObjectIdProvider(this.constantProvider("selfId")) .build(); return formDescription; // @formatter:on diff --git a/packages/selection/backend/sirius-components-collaborative-selection/src/main/java/org/eclipse/sirius/components/collaborative/selection/SelectionEventProcessor.java b/packages/selection/backend/sirius-components-collaborative-selection/src/main/java/org/eclipse/sirius/components/collaborative/selection/SelectionEventProcessor.java index 4ca5e2876e..fd1ed9e853 100644 --- a/packages/selection/backend/sirius-components-collaborative-selection/src/main/java/org/eclipse/sirius/components/collaborative/selection/SelectionEventProcessor.java +++ b/packages/selection/backend/sirius-components-collaborative-selection/src/main/java/org/eclipse/sirius/components/collaborative/selection/SelectionEventProcessor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -70,7 +70,7 @@ public class SelectionEventProcessor implements ISelectionEventProcessor { public SelectionEventProcessor(IEditingContext editingContext, SelectionDescription selectionDescription, String id, Object object, ISubscriptionManager subscriptionManager, IRepresentationRefreshPolicyRegistry representationRefreshPolicyRegistry) { - this.logger.trace("Creating the selection event processor {}", id); //$NON-NLS-1$ + this.logger.trace("Creating the selection event processor {}", id); this.selectionDescription = Objects.requireNonNull(selectionDescription); this.editingContext = Objects.requireNonNull(editingContext); @@ -108,7 +108,7 @@ public void refresh(ChangeDescription changeDescription) { if (this.sink.currentSubscriberCount() > 0) { EmitResult emitResult = this.sink.tryEmitNext(new SelectionRefreshedEventPayload(changeDescription.getInput().getId(), selection)); if (emitResult.isFailure()) { - String pattern = "An error has occurred while emitting a SelectionRefreshedEventPayload: {}"; //$NON-NLS-1$ + String pattern = "An error has occurred while emitting a SelectionRefreshedEventPayload: {}"; this.logger.warn(pattern, emitResult); } } @@ -135,7 +135,7 @@ private Selection refreshSelection() { Selection selection = new SelectionRenderer(variableManager, this.selectionDescription).render(); - this.logger.trace("Selection refreshed: {}", selection.getId()); //$NON-NLS-1$ + this.logger.trace("Selection refreshed: {}", selection.getId()); return selection; } @@ -155,13 +155,13 @@ public Flux getOutputEvents(IInput input) { @Override public void dispose() { - this.logger.trace("Disposing the selection event processor {}", this.id); //$NON-NLS-1$ + this.logger.trace("Disposing the selection event processor {}", this.id); this.subscriptionManager.dispose(); EmitResult emitResult = this.sink.tryEmitComplete(); if (emitResult.isFailure()) { - String pattern = "An error has occurred while marking the publisher as complete: {}"; //$NON-NLS-1$ + String pattern = "An error has occurred while marking the publisher as complete: {}"; this.logger.warn(pattern, emitResult); } } diff --git a/packages/selection/backend/sirius-components-collaborative-selection/src/main/java/org/eclipse/sirius/components/collaborative/selection/dto/SelectionEventInput.java b/packages/selection/backend/sirius-components-collaborative-selection/src/main/java/org/eclipse/sirius/components/collaborative/selection/dto/SelectionEventInput.java index 86279b5d1b..6cac10f94e 100644 --- a/packages/selection/backend/sirius-components-collaborative-selection/src/main/java/org/eclipse/sirius/components/collaborative/selection/dto/SelectionEventInput.java +++ b/packages/selection/backend/sirius-components-collaborative-selection/src/main/java/org/eclipse/sirius/components/collaborative/selection/dto/SelectionEventInput.java @@ -63,7 +63,7 @@ public String getTargetObjectId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, selectionId: {3}, targetObjectId: {4}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, selectionId: {3}, targetObjectId: {4}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.selectionId, this.targetObjectId); } diff --git a/packages/selection/backend/sirius-components-collaborative-selection/src/main/java/org/eclipse/sirius/components/collaborative/selection/dto/SelectionRefreshedEventPayload.java b/packages/selection/backend/sirius-components-collaborative-selection/src/main/java/org/eclipse/sirius/components/collaborative/selection/dto/SelectionRefreshedEventPayload.java index e5cf787a18..062c4343aa 100644 --- a/packages/selection/backend/sirius-components-collaborative-selection/src/main/java/org/eclipse/sirius/components/collaborative/selection/dto/SelectionRefreshedEventPayload.java +++ b/packages/selection/backend/sirius-components-collaborative-selection/src/main/java/org/eclipse/sirius/components/collaborative/selection/dto/SelectionRefreshedEventPayload.java @@ -45,7 +45,7 @@ public Selection getSelection() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, selection: '{'id: {2}, label: {3}'}''}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, selection: '{'id: {2}, label: {3}'}''}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.selection.getId(), this.selection.getLabel()); } } diff --git a/packages/selection/backend/sirius-components-collaborative-selection/src/test/java/org/eclipse/sirius/components/collaborative/selection/architecture/ArchitectureConstants.java b/packages/selection/backend/sirius-components-collaborative-selection/src/test/java/org/eclipse/sirius/components/collaborative/selection/architecture/ArchitectureConstants.java index b1ed4bcc02..b44c2e6c5c 100644 --- a/packages/selection/backend/sirius-components-collaborative-selection/src/test/java/org/eclipse/sirius/components/collaborative/selection/architecture/ArchitectureConstants.java +++ b/packages/selection/backend/sirius-components-collaborative-selection/src/test/java/org/eclipse/sirius/components/collaborative/selection/architecture/ArchitectureConstants.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -22,7 +22,7 @@ * @author arichard */ public final class ArchitectureConstants { - public static final String SIRIUS_COMPONENTS_COLLABORATIVE_SELECTION_ROOT_PACKAGE = "org.eclipse.sirius.components.collaborative.selection.."; //$NON-NLS-1$ + public static final String SIRIUS_COMPONENTS_COLLABORATIVE_SELECTION_ROOT_PACKAGE = "org.eclipse.sirius.components.collaborative.selection.."; // @formatter:off public static final JavaClasses CLASSES = new ClassFileImporter() diff --git a/packages/selection/backend/sirius-components-selection-graphql/src/main/java/org/eclipse/sirius/components/selection/graphql/datafetchers/subscription/SubscriptionSelectionEventDataFetcher.java b/packages/selection/backend/sirius-components-selection-graphql/src/main/java/org/eclipse/sirius/components/selection/graphql/datafetchers/subscription/SubscriptionSelectionEventDataFetcher.java index af38d0bf57..d9092385e3 100644 --- a/packages/selection/backend/sirius-components-selection-graphql/src/main/java/org/eclipse/sirius/components/selection/graphql/datafetchers/subscription/SubscriptionSelectionEventDataFetcher.java +++ b/packages/selection/backend/sirius-components-selection-graphql/src/main/java/org/eclipse/sirius/components/selection/graphql/datafetchers/subscription/SubscriptionSelectionEventDataFetcher.java @@ -37,7 +37,7 @@ @SubscriptionDataFetcher(type = "Subscription", field = "selectionEvent") public class SubscriptionSelectionEventDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/selection/backend/sirius-components-selection-graphql/src/test/java/org/eclipse/sirius/components/selection/graphql/architecture/ArchitectureConstants.java b/packages/selection/backend/sirius-components-selection-graphql/src/test/java/org/eclipse/sirius/components/selection/graphql/architecture/ArchitectureConstants.java index 63f397d4a3..6b4fd3d7bb 100644 --- a/packages/selection/backend/sirius-components-selection-graphql/src/test/java/org/eclipse/sirius/components/selection/graphql/architecture/ArchitectureConstants.java +++ b/packages/selection/backend/sirius-components-selection-graphql/src/test/java/org/eclipse/sirius/components/selection/graphql/architecture/ArchitectureConstants.java @@ -22,7 +22,7 @@ * @author gcoutable */ public final class ArchitectureConstants { - public static final String SIRIUS_COMPONENTS_SELECTION_GRAPHQL_ROOT_PACKAGE = "org.eclipse.sirius.components.selection.graphql.."; //$NON-NLS-1$ + public static final String SIRIUS_COMPONENTS_SELECTION_GRAPHQL_ROOT_PACKAGE = "org.eclipse.sirius.components.selection.graphql.."; // @formatter:off public static final JavaClasses CLASSES = new ClassFileImporter() diff --git a/packages/selection/backend/sirius-components-selection/src/main/java/org/eclipse/sirius/components/selection/Selection.java b/packages/selection/backend/sirius-components-selection/src/main/java/org/eclipse/sirius/components/selection/Selection.java index 9fa99b1e2e..af7fc5f7fe 100644 --- a/packages/selection/backend/sirius-components-selection/src/main/java/org/eclipse/sirius/components/selection/Selection.java +++ b/packages/selection/backend/sirius-components-selection/src/main/java/org/eclipse/sirius/components/selection/Selection.java @@ -28,7 +28,7 @@ @Immutable public final class Selection implements IRepresentation, ISemanticRepresentation { - public static final String KIND = IRepresentation.KIND_PREFIX + "?type=Selection"; //$NON-NLS-1$ + public static final String KIND = IRepresentation.KIND_PREFIX + "?type=Selection"; private String id; @@ -87,7 +87,7 @@ public static Builder newSelection(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, descriptionId: {2}, targetObjectId: {3}, label: {4}, message: {5}, objectsCount: {6}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, descriptionId: {2}, targetObjectId: {3}, label: {4}, message: {5}, objectsCount: {6}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.descriptionId, this.targetObjectId, this.label, this.message, this.objects.size()); } diff --git a/packages/selection/backend/sirius-components-selection/src/main/java/org/eclipse/sirius/components/selection/SelectionObject.java b/packages/selection/backend/sirius-components-selection/src/main/java/org/eclipse/sirius/components/selection/SelectionObject.java index d13d64a98b..0ead5f26c8 100644 --- a/packages/selection/backend/sirius-components-selection/src/main/java/org/eclipse/sirius/components/selection/SelectionObject.java +++ b/packages/selection/backend/sirius-components-selection/src/main/java/org/eclipse/sirius/components/selection/SelectionObject.java @@ -55,7 +55,7 @@ public static Builder newSelectionObject(UUID id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, imageURL: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, imageURL: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label, this.iconURL); } diff --git a/packages/selection/backend/sirius-components-selection/src/main/java/org/eclipse/sirius/components/selection/description/SelectionDescription.java b/packages/selection/backend/sirius-components-selection/src/main/java/org/eclipse/sirius/components/selection/description/SelectionDescription.java index 24a1c86f3e..8f065b1133 100644 --- a/packages/selection/backend/sirius-components-selection/src/main/java/org/eclipse/sirius/components/selection/description/SelectionDescription.java +++ b/packages/selection/backend/sirius-components-selection/src/main/java/org/eclipse/sirius/components/selection/description/SelectionDescription.java @@ -103,7 +103,7 @@ public static Builder newSelectionDescription(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label); } diff --git a/packages/selection/backend/sirius-components-selection/src/test/java/org/eclipse/sirius/components/selection/architecture/ArchitectureConstants.java b/packages/selection/backend/sirius-components-selection/src/test/java/org/eclipse/sirius/components/selection/architecture/ArchitectureConstants.java index 37a3f85074..7d8eeb7842 100644 --- a/packages/selection/backend/sirius-components-selection/src/test/java/org/eclipse/sirius/components/selection/architecture/ArchitectureConstants.java +++ b/packages/selection/backend/sirius-components-selection/src/test/java/org/eclipse/sirius/components/selection/architecture/ArchitectureConstants.java @@ -22,7 +22,7 @@ * @author arichard */ public final class ArchitectureConstants { - public static final String SIRIUS_COMPONENTS_SELECTION_ROOT_PACKAGE = "org.eclipse.sirius.components.selection.."; //$NON-NLS-1$ + public static final String SIRIUS_COMPONENTS_SELECTION_ROOT_PACKAGE = "org.eclipse.sirius.components.selection.."; // @formatter:off public static final JavaClasses CLASSES = new ClassFileImporter() diff --git a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/DiagramTypesProvider.java b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/DiagramTypesProvider.java index 2984954810..498a898b1c 100644 --- a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/DiagramTypesProvider.java +++ b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/DiagramTypesProvider.java @@ -19,18 +19,18 @@ */ public class DiagramTypesProvider { - public static final String DIAGRAM_TYPE = "Diagram"; //$NON-NLS-1$ + public static final String DIAGRAM_TYPE = "Diagram"; - public static final String SINGLE_CLICK_ON_TWO_DIAGRAM_ELEMENTS_TOOL_TYPE = "SingleClickOnTwoDiagramElementsTool"; //$NON-NLS-1$ + public static final String SINGLE_CLICK_ON_TWO_DIAGRAM_ELEMENTS_TOOL_TYPE = "SingleClickOnTwoDiagramElementsTool"; - public static final String SINGLE_CLICK_ON_DIAGRAM_ELEMENT_TOOL_TYPE = "SingleClickOnDiagramElementTool"; //$NON-NLS-1$ + public static final String SINGLE_CLICK_ON_DIAGRAM_ELEMENT_TOOL_TYPE = "SingleClickOnDiagramElementTool"; - public static final String DELETE_TOOL_TYPE = "DeleteTool"; //$NON-NLS-1$ + public static final String DELETE_TOOL_TYPE = "DeleteTool"; - public static final String TOOL_SECTION_TYPE = "ToolSection"; //$NON-NLS-1$ + public static final String TOOL_SECTION_TYPE = "ToolSection"; - public static final String TOOL_SECTIONS_FIELD = "toolSections"; //$NON-NLS-1$ + public static final String TOOL_SECTIONS_FIELD = "toolSections"; - public static final String AUTO_LAYOUT_FIELD = "autoLayout"; //$NON-NLS-1$ + public static final String AUTO_LAYOUT_FIELD = "autoLayout"; } diff --git a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/DocumentTypesProvider.java b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/DocumentTypesProvider.java index a0ab500a5d..4fca8c5e49 100644 --- a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/DocumentTypesProvider.java +++ b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/DocumentTypesProvider.java @@ -29,8 +29,8 @@ * @author sbegaudeau */ public class DocumentTypesProvider { - public static final String TYPE = "Document"; //$NON-NLS-1$ + public static final String TYPE = "Document"; - public static final String NAME_FIELD = "name"; //$NON-NLS-1$ + public static final String NAME_FIELD = "name"; } diff --git a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/EditingContextTypeProvider.java b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/EditingContextTypeProvider.java index 511949cd36..b09436abe9 100644 --- a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/EditingContextTypeProvider.java +++ b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/EditingContextTypeProvider.java @@ -19,40 +19,40 @@ */ public class EditingContextTypeProvider { - public static final String TYPE = "EditingContext"; //$NON-NLS-1$ + public static final String TYPE = "EditingContext"; - public static final String STEREOTYPE_DESCRIPTIONS_FIELD = "stereotypeDescriptions"; //$NON-NLS-1$ + public static final String STEREOTYPE_DESCRIPTIONS_FIELD = "stereotypeDescriptions"; - public static final String CHILD_CREATION_DESCRIPTIONS_FIELD = "childCreationDescriptions"; //$NON-NLS-1$ + public static final String CHILD_CREATION_DESCRIPTIONS_FIELD = "childCreationDescriptions"; - public static final String KIND_ARGUMENT = "kind"; //$NON-NLS-1$ + public static final String KIND_ARGUMENT = "kind"; - public static final String ROOT_OBJECT_CREATION_DESCRIPTIONS_FIELD = "rootObjectCreationDescriptions"; //$NON-NLS-1$ + public static final String ROOT_OBJECT_CREATION_DESCRIPTIONS_FIELD = "rootObjectCreationDescriptions"; - public static final String DOMAIN_ID_ARGUMENT = "domainId"; //$NON-NLS-1$ + public static final String DOMAIN_ID_ARGUMENT = "domainId"; - public static final String SUGGESTED_ARGUMENT = "suggested"; //$NON-NLS-1$ + public static final String SUGGESTED_ARGUMENT = "suggested"; - public static final String DOMAINS_FIELD = "domains"; //$NON-NLS-1$ + public static final String DOMAINS_FIELD = "domains"; - public static final String REPRESENTATION_DESCRIPTIONS_FIELD = "representationDescriptions"; //$NON-NLS-1$ + public static final String REPRESENTATION_DESCRIPTIONS_FIELD = "representationDescriptions"; - public static final String EDITING_CONTEXT_REPRESENTATION_DESCRIPTIONS_CONNECTION = "EditingContextRepresentationDescriptionConnection"; //$NON-NLS-1$ + public static final String EDITING_CONTEXT_REPRESENTATION_DESCRIPTIONS_CONNECTION = "EditingContextRepresentationDescriptionConnection"; - public static final String EDITING_CONTEXT_REPRESENTATION_DESCRIPTIONS_EDGE = "EditingContextRepresentationDescriptionEdge"; //$NON-NLS-1$ + public static final String EDITING_CONTEXT_REPRESENTATION_DESCRIPTIONS_EDGE = "EditingContextRepresentationDescriptionEdge"; - public static final String EDITING_CONTEXT_STEREOTYPE_DESCRIPTIONS_CONNECTION = "EditingContextStereotypeDescriptionConnection"; //$NON-NLS-1$ + public static final String EDITING_CONTEXT_STEREOTYPE_DESCRIPTIONS_CONNECTION = "EditingContextStereotypeDescriptionConnection"; - public static final String EDITING_CONTEXT_STEREOTYPE_DESCRIPTIONS_EDGE = "EditingContextStereotypeDescriptionEdge"; //$NON-NLS-1$ + public static final String EDITING_CONTEXT_STEREOTYPE_DESCRIPTIONS_EDGE = "EditingContextStereotypeDescriptionEdge"; - public static final String EDITING_CONTEXT_REPRESENTATION_CONNECTION = "EditingContextRepresentationConnection"; //$NON-NLS-1$ + public static final String EDITING_CONTEXT_REPRESENTATION_CONNECTION = "EditingContextRepresentationConnection"; - public static final String EDITING_CONTEXT_REPRESENTATION_EDGE = "EditingContextRepresentationEdge"; //$NON-NLS-1$ + public static final String EDITING_CONTEXT_REPRESENTATION_EDGE = "EditingContextRepresentationEdge"; - public static final String REPRESENTATIONS_FIELD = "representations"; //$NON-NLS-1$ + public static final String REPRESENTATIONS_FIELD = "representations"; - public static final String REPRESENTATION_FIELD = "representation"; //$NON-NLS-1$ + public static final String REPRESENTATION_FIELD = "representation"; - public static final String REPRESENTATION_ID_ARGUMENT = "representationId"; //$NON-NLS-1$ + public static final String REPRESENTATION_ID_ARGUMENT = "representationId"; } diff --git a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/FormTypesProvider.java b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/FormTypesProvider.java index 236abacc18..8f2e830d6d 100644 --- a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/FormTypesProvider.java +++ b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/FormTypesProvider.java @@ -18,20 +18,20 @@ * @author sbegaudeau */ public class FormTypesProvider { - public static final String FORM_TYPE = "Form"; //$NON-NLS-1$ + public static final String FORM_TYPE = "Form"; - public static final String WIDGET_TYPE = "Widget"; //$NON-NLS-1$ + public static final String WIDGET_TYPE = "Widget"; - public static final String TEXTFIELD_TYPE = "Textfield"; //$NON-NLS-1$ + public static final String TEXTFIELD_TYPE = "Textfield"; - public static final String CHECKBOX_TYPE = "Checkbox"; //$NON-NLS-1$ + public static final String CHECKBOX_TYPE = "Checkbox"; - public static final String TEXTAREA_TYPE = "Textarea"; //$NON-NLS-1$ + public static final String TEXTAREA_TYPE = "Textarea"; - public static final String SELECT_TYPE = "Select"; //$NON-NLS-1$ + public static final String SELECT_TYPE = "Select"; - public static final String MULTI_SELECT_TYPE = "MultiSelect"; //$NON-NLS-1$ + public static final String MULTI_SELECT_TYPE = "MultiSelect"; - public static final String RADIO_TYPE = "Radio"; //$NON-NLS-1$ + public static final String RADIO_TYPE = "Radio"; } diff --git a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/GraphQLConstants.java b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/GraphQLConstants.java index 97ef3153a1..2626c83d4c 100644 --- a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/GraphQLConstants.java +++ b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/GraphQLConstants.java @@ -21,12 +21,12 @@ public final class GraphQLConstants { /** * The suffix used for GraphQL types used as connection for multi-valued references with pagination support. */ - public static final String CONNECTION = "Connection"; //$NON-NLS-1$ + public static final String CONNECTION = "Connection"; /** * The suffix used for GraphQL types used as an edge for multi-valued references with pagination support. */ - public static final String EDGE = "Edge"; //$NON-NLS-1$ + public static final String EDGE = "Edge"; /** * This class will only be used to store some constants, as such we are hiding its constructor. diff --git a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/IdFieldProvider.java b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/IdFieldProvider.java index 8b054ffb6a..aa27f9c1a0 100644 --- a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/IdFieldProvider.java +++ b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/IdFieldProvider.java @@ -30,7 +30,7 @@ */ public class IdFieldProvider { - public static final String ID_FIELD = "id"; //$NON-NLS-1$ + public static final String ID_FIELD = "id"; public GraphQLFieldDefinition getField() { // @formatter:off diff --git a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/ImageURLFieldProvider.java b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/ImageURLFieldProvider.java index 42d441349e..518eb89446 100644 --- a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/ImageURLFieldProvider.java +++ b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/ImageURLFieldProvider.java @@ -30,7 +30,7 @@ */ public class ImageURLFieldProvider { - public static final String IMAGE_URL_FIELD = "imageURL"; //$NON-NLS-1$ + public static final String IMAGE_URL_FIELD = "imageURL"; public GraphQLFieldDefinition getField() { // @formatter:off diff --git a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/KindFieldProvider.java b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/KindFieldProvider.java index d395f22038..3aa0154bd7 100644 --- a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/KindFieldProvider.java +++ b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/KindFieldProvider.java @@ -30,7 +30,7 @@ */ public class KindFieldProvider { - public static final String KIND_FIELD = "kind"; //$NON-NLS-1$ + public static final String KIND_FIELD = "kind"; public GraphQLFieldDefinition getField() { // @formatter:off diff --git a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/LabelFieldProvider.java b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/LabelFieldProvider.java index 81151b51f6..5873b28bcf 100644 --- a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/LabelFieldProvider.java +++ b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/LabelFieldProvider.java @@ -30,7 +30,7 @@ */ public class LabelFieldProvider { - public static final String LABEL_FIELD = "label"; //$NON-NLS-1$ + public static final String LABEL_FIELD = "label"; public GraphQLFieldDefinition getField() { // @formatter:off diff --git a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/MutationTypeProvider.java b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/MutationTypeProvider.java index 22e4f5312c..14f4cebc08 100644 --- a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/MutationTypeProvider.java +++ b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/MutationTypeProvider.java @@ -18,8 +18,8 @@ * @author sbegaudeau */ public class MutationTypeProvider { - public static final String TYPE = "Mutation"; //$NON-NLS-1$ + public static final String TYPE = "Mutation"; - public static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + public static final String INPUT_ARGUMENT = "input"; } diff --git a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/ObjectTypeProvider.java b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/ObjectTypeProvider.java index e5b619f778..325914da5c 100644 --- a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/ObjectTypeProvider.java +++ b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/ObjectTypeProvider.java @@ -34,17 +34,17 @@ * @author sbegaudeau */ public class ObjectTypeProvider { - public static final String TYPE = "Object"; //$NON-NLS-1$ + public static final String TYPE = "Object"; - public static final String EXPRESSION_BASED_OBJECTS_FIELD = "expressionBasedObjects"; //$NON-NLS-1$ + public static final String EXPRESSION_BASED_OBJECTS_FIELD = "expressionBasedObjects"; - public static final String EXPRESSION_BASED_OBJECT_FIELD = "expressionBasedObject"; //$NON-NLS-1$ + public static final String EXPRESSION_BASED_OBJECT_FIELD = "expressionBasedObject"; - public static final String EXPRESSION_BASED_STRING_FIELD = "expressionBasedString"; //$NON-NLS-1$ + public static final String EXPRESSION_BASED_STRING_FIELD = "expressionBasedString"; - public static final String EXPRESSION_BASED_INT_FIELD = "expressionBasedInt"; //$NON-NLS-1$ + public static final String EXPRESSION_BASED_INT_FIELD = "expressionBasedInt"; - public static final String EXPRESSION_BASED_BOOLEAN_FIELD = "expressionBasedBoolean"; //$NON-NLS-1$ + public static final String EXPRESSION_BASED_BOOLEAN_FIELD = "expressionBasedBoolean"; - public static final String EXPRESSION_ARGUMENT = "expression"; //$NON-NLS-1$ + public static final String EXPRESSION_ARGUMENT = "expression"; } diff --git a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/PageInfoTypeProvider.java b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/PageInfoTypeProvider.java index 4c357ff3c9..67eb11adf3 100644 --- a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/PageInfoTypeProvider.java +++ b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/PageInfoTypeProvider.java @@ -28,14 +28,14 @@ * @author sbegaudeau */ public class PageInfoTypeProvider { - public static final String TYPE = "PageInfo"; //$NON-NLS-1$ + public static final String TYPE = "PageInfo"; - public static final String HAS_PREVIOUS_PAGE_FIELD = "hasPreviousPage"; //$NON-NLS-1$ + public static final String HAS_PREVIOUS_PAGE_FIELD = "hasPreviousPage"; - public static final String HAS_NEXT_PAGE_FIELD = "hasNextPage"; //$NON-NLS-1$ + public static final String HAS_NEXT_PAGE_FIELD = "hasNextPage"; - public static final String START_CURSOR_FIELD = "startCursor"; //$NON-NLS-1$ + public static final String START_CURSOR_FIELD = "startCursor"; - public static final String END_CURSOR_FIELD = "endCursor"; //$NON-NLS-1$ + public static final String END_CURSOR_FIELD = "endCursor"; } diff --git a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/PaginationArgumentsProvider.java b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/PaginationArgumentsProvider.java index 656c5090d8..7ef546f0a6 100644 --- a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/PaginationArgumentsProvider.java +++ b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/PaginationArgumentsProvider.java @@ -37,25 +37,25 @@ public class PaginationArgumentsProvider { * The name of the parameter used to indicate the number of elements to retrieve using a forward pagination * strategy. */ - public static final String FIRST = "first"; //$NON-NLS-1$ + public static final String FIRST = "first"; /** * The name of the parameter used to indicate the number of elements to retrieve using a backward pagination * strategy. */ - public static final String LAST = "last"; //$NON-NLS-1$ + public static final String LAST = "last"; /** * The name of the parameter used to indicate after which element should the elements be retrieved using a forward * pagination strategy. */ - public static final String AFTER = "after"; //$NON-NLS-1$ + public static final String AFTER = "after"; /** * The name of the parameter used to indicate before which element should the elements be retrieved using a forward * pagination strategy. */ - public static final String BEFORE = "before"; //$NON-NLS-1$ + public static final String BEFORE = "before"; public List getArguments() { // @formatter:off diff --git a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/PaginationConnectionTypeProvider.java b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/PaginationConnectionTypeProvider.java index e3e1a85102..f79d26e504 100644 --- a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/PaginationConnectionTypeProvider.java +++ b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/PaginationConnectionTypeProvider.java @@ -34,9 +34,9 @@ * @author sbegaudeau */ public class PaginationConnectionTypeProvider { - public static final String EDGES_FIELD = "edges"; //$NON-NLS-1$ + public static final String EDGES_FIELD = "edges"; - public static final String PAGE_INFO_FIELD = "pageInfo"; //$NON-NLS-1$ + public static final String PAGE_INFO_FIELD = "pageInfo"; private String name; diff --git a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/PaginationEdgeTypeProvider.java b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/PaginationEdgeTypeProvider.java index 74ee456296..ea8d9b24cb 100644 --- a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/PaginationEdgeTypeProvider.java +++ b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/PaginationEdgeTypeProvider.java @@ -36,7 +36,7 @@ * @author sbegaudeau */ public class PaginationEdgeTypeProvider { - public static final String NODE_FIELD = "node"; //$NON-NLS-1$ + public static final String NODE_FIELD = "node"; private String name; diff --git a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/ProfileTypeProvider.java b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/ProfileTypeProvider.java index 6fbb80468e..107d44901d 100644 --- a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/ProfileTypeProvider.java +++ b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/ProfileTypeProvider.java @@ -28,6 +28,6 @@ * @author sbegaudeau */ public class ProfileTypeProvider { - public static final String TYPE = "Profile"; //$NON-NLS-1$ + public static final String TYPE = "Profile"; } diff --git a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/ProjectTypeProvider.java b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/ProjectTypeProvider.java index d56d917714..6313eadef3 100644 --- a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/ProjectTypeProvider.java +++ b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/ProjectTypeProvider.java @@ -31,13 +31,13 @@ * @author sbegaudeau */ public class ProjectTypeProvider { - public static final String TYPE = "Project"; //$NON-NLS-1$ + public static final String TYPE = "Project"; - public static final String NAME_FIELD = "name"; //$NON-NLS-1$ + public static final String NAME_FIELD = "name"; - public static final String OWNER_FIELD = "owner"; //$NON-NLS-1$ + public static final String OWNER_FIELD = "owner"; - public static final String VISIBILITY_FIELD = "visibility"; //$NON-NLS-1$ + public static final String VISIBILITY_FIELD = "visibility"; - public static final String CURRENT_EDITING_CONTEXT_FIELD = "currentEditingContext"; //$NON-NLS-1$ + public static final String CURRENT_EDITING_CONTEXT_FIELD = "currentEditingContext"; } diff --git a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/QueryTypeProvider.java b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/QueryTypeProvider.java index e473aab284..efebffce75 100644 --- a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/QueryTypeProvider.java +++ b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/QueryTypeProvider.java @@ -27,7 +27,7 @@ * @author sbegaudeau */ public class QueryTypeProvider { - public static final String TYPE = "Query"; //$NON-NLS-1$ + public static final String TYPE = "Query"; - public static final String VIEWER_FIELD = "viewer"; //$NON-NLS-1$ + public static final String VIEWER_FIELD = "viewer"; } diff --git a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/RepresentationDescriptionTypeProvider.java b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/RepresentationDescriptionTypeProvider.java index 5f9a04e330..86bed7dede 100644 --- a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/RepresentationDescriptionTypeProvider.java +++ b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/RepresentationDescriptionTypeProvider.java @@ -21,6 +21,6 @@ */ public class RepresentationDescriptionTypeProvider { - public static final String TYPE = "RepresentationDescription"; //$NON-NLS-1$ + public static final String TYPE = "RepresentationDescription"; } diff --git a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/RepresentationTypeProvider.java b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/RepresentationTypeProvider.java index 4de54b8f8a..f02320d421 100644 --- a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/RepresentationTypeProvider.java +++ b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/RepresentationTypeProvider.java @@ -29,5 +29,5 @@ * @author sbegaudeau */ public class RepresentationTypeProvider { - public static final String TYPE = "Representation"; //$NON-NLS-1$ + public static final String TYPE = "Representation"; } diff --git a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/SelectionTypesProvider.java b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/SelectionTypesProvider.java index 1d4c6db115..862ba261cd 100644 --- a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/SelectionTypesProvider.java +++ b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/SelectionTypesProvider.java @@ -19,8 +19,8 @@ */ public class SelectionTypesProvider { - public static final String SELECTION_TYPE = "Selection"; //$NON-NLS-1$ + public static final String SELECTION_TYPE = "Selection"; - public static final String SELECTION_OBJECT_TYPE = "SelectionObject"; //$NON-NLS-1$ + public static final String SELECTION_OBJECT_TYPE = "SelectionObject"; } diff --git a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/StereotypeDescriptionTypeProvider.java b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/StereotypeDescriptionTypeProvider.java index b720b0fec0..6617d7d580 100644 --- a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/StereotypeDescriptionTypeProvider.java +++ b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/StereotypeDescriptionTypeProvider.java @@ -28,8 +28,8 @@ * @author hmarchadour */ public class StereotypeDescriptionTypeProvider { - public static final String TYPE = "StereotypeDescription"; //$NON-NLS-1$ + public static final String TYPE = "StereotypeDescription"; - public static final String LABEL_FIELD = "label"; //$NON-NLS-1$ + public static final String LABEL_FIELD = "label"; } diff --git a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/SubscriptionTypeProvider.java b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/SubscriptionTypeProvider.java index 9a0a537e36..e2d3fe6286 100644 --- a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/SubscriptionTypeProvider.java +++ b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/SubscriptionTypeProvider.java @@ -20,8 +20,8 @@ */ public class SubscriptionTypeProvider { - public static final String TYPE = "Subscription"; //$NON-NLS-1$ + public static final String TYPE = "Subscription"; - public static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + public static final String INPUT_ARGUMENT = "input"; } diff --git a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/ToolTypeProvider.java b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/ToolTypeProvider.java index 7b68077a38..b486343a51 100644 --- a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/ToolTypeProvider.java +++ b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/ToolTypeProvider.java @@ -29,6 +29,6 @@ * @author hmarchadour */ public class ToolTypeProvider { - public static final String TYPE = "Tool"; //$NON-NLS-1$ + public static final String TYPE = "Tool"; } diff --git a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/TreeTypeProvider.java b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/TreeTypeProvider.java index 4330b847a0..99f8079e59 100644 --- a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/TreeTypeProvider.java +++ b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/TreeTypeProvider.java @@ -18,9 +18,9 @@ * @author sbegaudeau */ public class TreeTypeProvider { - public static final String TREE_TYPE = "Tree"; //$NON-NLS-1$ + public static final String TREE_TYPE = "Tree"; - public static final String TREE_ITEM_TYPE = "TreeItem"; //$NON-NLS-1$ + public static final String TREE_ITEM_TYPE = "TreeItem"; - public static final String TARGET_FIELD = "target"; //$NON-NLS-1$ + public static final String TARGET_FIELD = "target"; } diff --git a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/ValidationTypesProvider.java b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/ValidationTypesProvider.java index 5cba3ac829..4ea1f28f94 100644 --- a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/ValidationTypesProvider.java +++ b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/ValidationTypesProvider.java @@ -18,8 +18,8 @@ * @author gcoutable */ public class ValidationTypesProvider { - public static final String VALIDATION_TYPE = "Validation"; //$NON-NLS-1$ + public static final String VALIDATION_TYPE = "Validation"; - public static final String DIAGNOSTIC_TYPE = "Diagnostic"; //$NON-NLS-1$ + public static final String DIAGNOSTIC_TYPE = "Diagnostic"; } diff --git a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/ViewerTypeProvider.java b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/ViewerTypeProvider.java index bf9e834a3c..6d783bd9e4 100644 --- a/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/ViewerTypeProvider.java +++ b/packages/sirius-web/backend/sirius-web-graphql-schema/src/main/java/org/eclipse/sirius/web/graphql/schema/ViewerTypeProvider.java @@ -49,21 +49,21 @@ * @author sbegaudeau */ public class ViewerTypeProvider { - public static final String TYPE = "Viewer"; //$NON-NLS-1$ + public static final String TYPE = "Viewer"; - public static final String USER_TYPE = "User"; //$NON-NLS-1$ + public static final String USER_TYPE = "User"; - public static final String USERNAME_FIELD = "username"; //$NON-NLS-1$ + public static final String USERNAME_FIELD = "username"; - public static final String PROJECTS_FIELD = "projects"; //$NON-NLS-1$ + public static final String PROJECTS_FIELD = "projects"; - public static final String PROJECT_FIELD = "project"; //$NON-NLS-1$ + public static final String PROJECT_FIELD = "project"; - public static final String SCHEMA_ID_ARGUMENT = "schemaId"; //$NON-NLS-1$ + public static final String SCHEMA_ID_ARGUMENT = "schemaId"; - public static final String PROJECT_ID_ARGUMENT = "projectId"; //$NON-NLS-1$ + public static final String PROJECT_ID_ARGUMENT = "projectId"; - public static final String EDITING_CONTEXT_FIELD = "editingContext"; //$NON-NLS-1$ + public static final String EDITING_CONTEXT_FIELD = "editingContext"; - public static final String EDITING_CONTEXT_ID_ARGUMENT = "editingContextId"; //$NON-NLS-1$ + public static final String EDITING_CONTEXT_ID_ARGUMENT = "editingContextId"; } diff --git a/packages/sirius-web/backend/sirius-web-graphql-schema/src/test/java/org/eclipse/sirius/web/graphql/schema/architecture/ArchitectureConstants.java b/packages/sirius-web/backend/sirius-web-graphql-schema/src/test/java/org/eclipse/sirius/web/graphql/schema/architecture/ArchitectureConstants.java index cf3c541b6f..221d25f078 100644 --- a/packages/sirius-web/backend/sirius-web-graphql-schema/src/test/java/org/eclipse/sirius/web/graphql/schema/architecture/ArchitectureConstants.java +++ b/packages/sirius-web/backend/sirius-web-graphql-schema/src/test/java/org/eclipse/sirius/web/graphql/schema/architecture/ArchitectureConstants.java @@ -22,7 +22,7 @@ * @author sbegaudeau */ public final class ArchitectureConstants { - public static final String SIRIUS_WEB_GRAPHQL_SCHEMA_ROOT_PACKAGE = "org.eclipse.sirius.web.graphql.schema.."; //$NON-NLS-1$ + public static final String SIRIUS_WEB_GRAPHQL_SCHEMA_ROOT_PACKAGE = "org.eclipse.sirius.web.graphql.schema.."; // @formatter:off public static final JavaClasses CLASSES = new ClassFileImporter() diff --git a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/configuration/GraphQLConfiguration.java b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/configuration/GraphQLConfiguration.java index e4e46b6611..82d00be5d6 100644 --- a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/configuration/GraphQLConfiguration.java +++ b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/configuration/GraphQLConfiguration.java @@ -97,11 +97,11 @@ public GraphQLSchema graphQLSchema(ResourcePatternResolver resourcePatternResolv SchemaParser schemaParser = new SchemaParser(); SchemaGenerator schemaGenerator = new SchemaGenerator(); - Resource[] resources = resourcePatternResolver.getResources("classpath*:/schema/**/*.graphqls"); //$NON-NLS-1$ - this.logger.info("{} GraphQL schemas found", resources.length); //$NON-NLS-1$ + Resource[] resources = resourcePatternResolver.getResources("classpath*:/schema/**/*.graphqls"); + this.logger.info("{} GraphQL schemas found", resources.length); for (Resource resource : resources) { if (this.logger.isInfoEnabled()) { - this.logger.info("Processing the GraphQL schema: {}", resource.getURL()); //$NON-NLS-1$ + this.logger.info("Processing the GraphQL schema: {}", resource.getURL()); } TypeDefinitionRegistry childTypeDefinitionRegistry = schemaParser.parse(resource.getInputStream()); typeRegistry.merge(childTypeDefinitionRegistry); diff --git a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/configuration/GraphQLMessageServiceConfiguration.java b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/configuration/GraphQLMessageServiceConfiguration.java index 0c89b714d2..82e9062ddc 100644 --- a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/configuration/GraphQLMessageServiceConfiguration.java +++ b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/configuration/GraphQLMessageServiceConfiguration.java @@ -24,7 +24,7 @@ */ @Configuration public class GraphQLMessageServiceConfiguration { - private static final String PATH = "messages/sirius-web-graphql"; //$NON-NLS-1$ + private static final String PATH = "messages/sirius-web-graphql"; @Bean public MessageSourceAccessor graphQLMessageSourceAccessor() { diff --git a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/editingcontext/EditingContextCompletionProposalsDataFetcher.java b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/editingcontext/EditingContextCompletionProposalsDataFetcher.java index d50bb5be77..8d4cfee489 100644 --- a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/editingcontext/EditingContextCompletionProposalsDataFetcher.java +++ b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/editingcontext/EditingContextCompletionProposalsDataFetcher.java @@ -44,7 +44,7 @@ */ @QueryDataFetcher(type = EditingContextTypeProvider.TYPE, field = "completionProposals") public class EditingContextCompletionProposalsDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/editingcontext/EditingContextRepresentationDescriptionsDataFetcher.java b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/editingcontext/EditingContextRepresentationDescriptionsDataFetcher.java index bb16089603..51bf41fdc9 100644 --- a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/editingcontext/EditingContextRepresentationDescriptionsDataFetcher.java +++ b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/editingcontext/EditingContextRepresentationDescriptionsDataFetcher.java @@ -48,7 +48,7 @@ @QueryDataFetcher(type = EditingContextTypeProvider.TYPE, field = EditingContextTypeProvider.REPRESENTATION_DESCRIPTIONS_FIELD) public class EditingContextRepresentationDescriptionsDataFetcher implements IDataFetcherWithFieldCoordinates>> { - private static final String OBJECT_ID_ARGUMENT = "objectId"; //$NON-NLS-1$ + private static final String OBJECT_ID_ARGUMENT = "objectId"; private final IEditingContextEventProcessorRegistry editingContextEventProcessorRegistry; diff --git a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationCreateChildDataFetcher.java b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationCreateChildDataFetcher.java index c7ea7f1254..8a7e3bdfb3 100644 --- a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationCreateChildDataFetcher.java +++ b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationCreateChildDataFetcher.java @@ -46,7 +46,7 @@ @MutationDataFetcher(type = MutationTypeProvider.TYPE, field = MutationCreateChildDataFetcher.CREATE_CHILD_FIELD) public class MutationCreateChildDataFetcher implements IDataFetcherWithFieldCoordinates> { - public static final String CREATE_CHILD_FIELD = "createChild"; //$NON-NLS-1$ + public static final String CREATE_CHILD_FIELD = "createChild"; private final ObjectMapper objectMapper; diff --git a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationCreateDocumentDataFetcher.java b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationCreateDocumentDataFetcher.java index fff89ae70f..079cc4b187 100644 --- a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationCreateDocumentDataFetcher.java +++ b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationCreateDocumentDataFetcher.java @@ -45,7 +45,7 @@ @MutationDataFetcher(type = MutationTypeProvider.TYPE, field = MutationCreateDocumentDataFetcher.CREATE_DOCUMENT_FIELD) public class MutationCreateDocumentDataFetcher implements IDataFetcherWithFieldCoordinates> { - public static final String CREATE_DOCUMENT_FIELD = "createDocument"; //$NON-NLS-1$ + public static final String CREATE_DOCUMENT_FIELD = "createDocument"; private final ObjectMapper objectMapper; diff --git a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationCreateProjectDataFetcher.java b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationCreateProjectDataFetcher.java index b16615b811..fe91704eba 100644 --- a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationCreateProjectDataFetcher.java +++ b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationCreateProjectDataFetcher.java @@ -42,7 +42,7 @@ @MutationDataFetcher(type = MutationTypeProvider.TYPE, field = MutationCreateProjectDataFetcher.CREATE_PROJECT_FIELD) public class MutationCreateProjectDataFetcher implements IDataFetcherWithFieldCoordinates { - public static final String CREATE_PROJECT_FIELD = "createProject"; //$NON-NLS-1$ + public static final String CREATE_PROJECT_FIELD = "createProject"; private final ObjectMapper objectMapper; diff --git a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationCreateRepresentationDataFetcher.java b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationCreateRepresentationDataFetcher.java index 3811f13857..ce1842ca78 100644 --- a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationCreateRepresentationDataFetcher.java +++ b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationCreateRepresentationDataFetcher.java @@ -45,7 +45,7 @@ @MutationDataFetcher(type = MutationTypeProvider.TYPE, field = MutationCreateRepresentationDataFetcher.CREATE_REPRESENTATION_FIELD) public class MutationCreateRepresentationDataFetcher implements IDataFetcherWithFieldCoordinates> { - public static final String CREATE_REPRESENTATION_FIELD = "createRepresentation"; //$NON-NLS-1$ + public static final String CREATE_REPRESENTATION_FIELD = "createRepresentation"; private final ObjectMapper objectMapper; diff --git a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationCreateRootObjectDataFetcher.java b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationCreateRootObjectDataFetcher.java index cd02e8c4d8..e0ee93d49a 100644 --- a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationCreateRootObjectDataFetcher.java +++ b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationCreateRootObjectDataFetcher.java @@ -45,7 +45,7 @@ @MutationDataFetcher(type = MutationTypeProvider.TYPE, field = MutationCreateRootObjectDataFetcher.CREATE_ROOT_OBJECT_FIELD) public class MutationCreateRootObjectDataFetcher implements IDataFetcherWithFieldCoordinates> { - public static final String CREATE_ROOT_OBJECT_FIELD = "createRootObject"; //$NON-NLS-1$ + public static final String CREATE_ROOT_OBJECT_FIELD = "createRootObject"; private final ObjectMapper objectMapper; diff --git a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationDeleteDocumentDataFetcher.java b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationDeleteDocumentDataFetcher.java index f30c9dccf9..d652bc2cb9 100644 --- a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationDeleteDocumentDataFetcher.java +++ b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationDeleteDocumentDataFetcher.java @@ -50,7 +50,7 @@ @MutationDataFetcher(type = MutationTypeProvider.TYPE, field = MutationDeleteDocumentDataFetcher.DELETE_DOCUMENT_FIELD) public class MutationDeleteDocumentDataFetcher implements IDataFetcherWithFieldCoordinates> { - public static final String DELETE_DOCUMENT_FIELD = "deleteDocument"; //$NON-NLS-1$ + public static final String DELETE_DOCUMENT_FIELD = "deleteDocument"; private final ObjectMapper objectMapper; diff --git a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationDeleteImageDataFetcher.java b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationDeleteImageDataFetcher.java index 578f81a288..fd369a7114 100644 --- a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationDeleteImageDataFetcher.java +++ b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationDeleteImageDataFetcher.java @@ -44,7 +44,7 @@ @MutationDataFetcher(type = MutationTypeProvider.TYPE, field = MutationDeleteImageDataFetcher.DELETE_IMAGE_FIELD) public class MutationDeleteImageDataFetcher implements IDataFetcherWithFieldCoordinates> { - public static final String DELETE_IMAGE_FIELD = "deleteImage"; //$NON-NLS-1$ + public static final String DELETE_IMAGE_FIELD = "deleteImage"; private final ObjectMapper objectMapper; diff --git a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationDeleteListItemDataFetcher.java b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationDeleteListItemDataFetcher.java index fca04998ab..15977dc230 100644 --- a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationDeleteListItemDataFetcher.java +++ b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationDeleteListItemDataFetcher.java @@ -45,7 +45,7 @@ @MutationDataFetcher(type = MutationTypeProvider.TYPE, field = MutationDeleteListItemDataFetcher.DELETE_LIST_ITEM) public class MutationDeleteListItemDataFetcher implements IDataFetcherWithFieldCoordinates> { - public static final String DELETE_LIST_ITEM = "deleteListItem"; //$NON-NLS-1$ + public static final String DELETE_LIST_ITEM = "deleteListItem"; private final ObjectMapper objectMapper; diff --git a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationDeleteObjectDataFetcher.java b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationDeleteObjectDataFetcher.java index 3473027ba9..f9c75654b9 100644 --- a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationDeleteObjectDataFetcher.java +++ b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationDeleteObjectDataFetcher.java @@ -45,7 +45,7 @@ @MutationDataFetcher(type = MutationTypeProvider.TYPE, field = MutationDeleteObjectDataFetcher.DELETE_OBJECT_FIELD) public class MutationDeleteObjectDataFetcher implements IDataFetcherWithFieldCoordinates> { - public static final String DELETE_OBJECT_FIELD = "deleteObject"; //$NON-NLS-1$ + public static final String DELETE_OBJECT_FIELD = "deleteObject"; private final ObjectMapper objectMapper; diff --git a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationDeleteProjectDataFetcher.java b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationDeleteProjectDataFetcher.java index 0dc3ca2842..5c86619cec 100644 --- a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationDeleteProjectDataFetcher.java +++ b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationDeleteProjectDataFetcher.java @@ -48,7 +48,7 @@ @MutationDataFetcher(type = MutationTypeProvider.TYPE, field = MutationDeleteProjectDataFetcher.DELETE_PROJECT_FIELD) public class MutationDeleteProjectDataFetcher implements IDataFetcherWithFieldCoordinates { - public static final String DELETE_PROJECT_FIELD = "deleteProject"; //$NON-NLS-1$ + public static final String DELETE_PROJECT_FIELD = "deleteProject"; private final ObjectMapper objectMapper; diff --git a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationDeleteRepresentationDataFetcher.java b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationDeleteRepresentationDataFetcher.java index 8303dc0cd1..5d5c1c84fa 100644 --- a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationDeleteRepresentationDataFetcher.java +++ b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationDeleteRepresentationDataFetcher.java @@ -51,7 +51,7 @@ @MutationDataFetcher(type = MutationTypeProvider.TYPE, field = MutationDeleteRepresentationDataFetcher.DELETE_REPRESENTATION_FIELD) public class MutationDeleteRepresentationDataFetcher implements IDataFetcherWithFieldCoordinates> { - public static final String DELETE_REPRESENTATION_FIELD = "deleteRepresentation"; //$NON-NLS-1$ + public static final String DELETE_REPRESENTATION_FIELD = "deleteRepresentation"; private final ObjectMapper objectMapper; diff --git a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationInvokeDeleteToolOnDiagramDataFetcher.java b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationInvokeDeleteToolOnDiagramDataFetcher.java index 0554e92fb5..57b382f42e 100644 --- a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationInvokeDeleteToolOnDiagramDataFetcher.java +++ b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationInvokeDeleteToolOnDiagramDataFetcher.java @@ -35,7 +35,7 @@ @MutationDataFetcher(type = "Mutation", field = "invokeDeleteToolOnDiagram") public class MutationInvokeDeleteToolOnDiagramDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationInvokeEditingContextActionDataFetcher.java b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationInvokeEditingContextActionDataFetcher.java index 688810b478..e0419107dd 100644 --- a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationInvokeEditingContextActionDataFetcher.java +++ b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationInvokeEditingContextActionDataFetcher.java @@ -35,7 +35,7 @@ */ @MutationDataFetcher(type = "Mutation", field = "invokeEditingContextAction") public class MutationInvokeEditingContextActionDataFetcher implements IDataFetcherWithFieldCoordinates> { - public static final String ARRANGE_ALL_FIELD = "arrangeAll"; //$NON-NLS-1$ + public static final String ARRANGE_ALL_FIELD = "arrangeAll"; private final ObjectMapper objectMapper; diff --git a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationRenameDocumentDataFetcher.java b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationRenameDocumentDataFetcher.java index 57d0828050..4d05898916 100644 --- a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationRenameDocumentDataFetcher.java +++ b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationRenameDocumentDataFetcher.java @@ -50,7 +50,7 @@ @MutationDataFetcher(type = MutationTypeProvider.TYPE, field = MutationRenameDocumentDataFetcher.RENAME_DOCUMENT_FIELD) public class MutationRenameDocumentDataFetcher implements IDataFetcherWithFieldCoordinates> { - public static final String RENAME_DOCUMENT_FIELD = "renameDocument"; //$NON-NLS-1$ + public static final String RENAME_DOCUMENT_FIELD = "renameDocument"; private final ObjectMapper objectMapper; diff --git a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationRenameImageDataFetcher.java b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationRenameImageDataFetcher.java index 5d9773e226..7eb3709b15 100644 --- a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationRenameImageDataFetcher.java +++ b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationRenameImageDataFetcher.java @@ -43,7 +43,7 @@ @MutationDataFetcher(type = MutationTypeProvider.TYPE, field = MutationRenameImageDataFetcher.RENAME_IMAGE_FIELD) public class MutationRenameImageDataFetcher implements IDataFetcherWithFieldCoordinates> { - public static final String RENAME_IMAGE_FIELD = "renameImage"; //$NON-NLS-1$ + public static final String RENAME_IMAGE_FIELD = "renameImage"; private final ObjectMapper objectMapper; diff --git a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationRenameObjectDataFetcher.java b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationRenameObjectDataFetcher.java index 9607629174..5da9ad8eda 100644 --- a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationRenameObjectDataFetcher.java +++ b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationRenameObjectDataFetcher.java @@ -45,7 +45,7 @@ @MutationDataFetcher(type = MutationTypeProvider.TYPE, field = MutationRenameObjectDataFetcher.RENAME_OBJECT_FIELD) public class MutationRenameObjectDataFetcher implements IDataFetcherWithFieldCoordinates> { - public static final String RENAME_OBJECT_FIELD = "renameObject"; //$NON-NLS-1$ + public static final String RENAME_OBJECT_FIELD = "renameObject"; private final ObjectMapper objectMapper; diff --git a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationRenameProjectDataFetcher.java b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationRenameProjectDataFetcher.java index a016537148..c9dc750841 100644 --- a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationRenameProjectDataFetcher.java +++ b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationRenameProjectDataFetcher.java @@ -45,7 +45,7 @@ @MutationDataFetcher(type = MutationTypeProvider.TYPE, field = MutationRenameProjectDataFetcher.RENAME_PROJECT_FIELD) public class MutationRenameProjectDataFetcher implements IDataFetcherWithFieldCoordinates> { - public static final String RENAME_PROJECT_FIELD = "renameProject"; //$NON-NLS-1$ + public static final String RENAME_PROJECT_FIELD = "renameProject"; private final ObjectMapper objectMapper; diff --git a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationRenameRepresentationDataFetcher.java b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationRenameRepresentationDataFetcher.java index c43760d6f9..c8b9a570c1 100644 --- a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationRenameRepresentationDataFetcher.java +++ b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationRenameRepresentationDataFetcher.java @@ -45,7 +45,7 @@ @MutationDataFetcher(type = MutationTypeProvider.TYPE, field = MutationRenameRepresentationDataFetcher.RENAME_REPRESENTATION_FIELD) public class MutationRenameRepresentationDataFetcher implements IDataFetcherWithFieldCoordinates> { - public static final String RENAME_REPRESENTATION_FIELD = "renameRepresentation"; //$NON-NLS-1$ + public static final String RENAME_REPRESENTATION_FIELD = "renameRepresentation"; private final ObjectMapper objectMapper; diff --git a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationUpdateWidgetFocusDataFetcher.java b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationUpdateWidgetFocusDataFetcher.java index c426bd919e..67786a5e40 100644 --- a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationUpdateWidgetFocusDataFetcher.java +++ b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationUpdateWidgetFocusDataFetcher.java @@ -45,7 +45,7 @@ @MutationDataFetcher(type = MutationTypeProvider.TYPE, field = MutationUpdateWidgetFocusDataFetcher.UPDATE_WIDGET_FOCUS_FIELD) public class MutationUpdateWidgetFocusDataFetcher implements IDataFetcherWithFieldCoordinates> { - public static final String UPDATE_WIDGET_FOCUS_FIELD = "updateWidgetFocus"; //$NON-NLS-1$ + public static final String UPDATE_WIDGET_FOCUS_FIELD = "updateWidgetFocus"; private final ObjectMapper objectMapper; diff --git a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationUploadDocumentDataFetcher.java b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationUploadDocumentDataFetcher.java index 54bb0d5e40..11da698091 100644 --- a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationUploadDocumentDataFetcher.java +++ b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationUploadDocumentDataFetcher.java @@ -48,13 +48,13 @@ @MutationDataFetcher(type = MutationTypeProvider.TYPE, field = MutationUploadDocumentDataFetcher.UPLOAD_DOCUMENT_FIELD) public class MutationUploadDocumentDataFetcher implements IDataFetcherWithFieldCoordinates> { - public static final String UPLOAD_DOCUMENT_FIELD = "uploadDocument"; //$NON-NLS-1$ + public static final String UPLOAD_DOCUMENT_FIELD = "uploadDocument"; - private static final String EDITING_CONTEXT_ID = "editingContextId"; //$NON-NLS-1$ + private static final String EDITING_CONTEXT_ID = "editingContextId"; - private static final String FILE = "file"; //$NON-NLS-1$ + private static final String FILE = "file"; - private static final String ID = "id"; //$NON-NLS-1$ + private static final String ID = "id"; private final IEditingContextEventProcessorRegistry editingContextEventProcessorRegistry; diff --git a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationUploadImageDataFetcher.java b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationUploadImageDataFetcher.java index e33cef0235..f81b09911c 100644 --- a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationUploadImageDataFetcher.java +++ b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationUploadImageDataFetcher.java @@ -45,13 +45,13 @@ @MutationDataFetcher(type = MutationTypeProvider.TYPE, field = "uploadImage") public class MutationUploadImageDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String FILE = "file"; //$NON-NLS-1$ + private static final String FILE = "file"; - private static final String ID = "id"; //$NON-NLS-1$ + private static final String ID = "id"; - private static final String LABEL = "label"; //$NON-NLS-1$ + private static final String LABEL = "label"; - private static final String EDITING_CONTEXT_ID = "editingContextId"; //$NON-NLS-1$ + private static final String EDITING_CONTEXT_ID = "editingContextId"; private final ICustomImageImportService customImageImportService; diff --git a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationUploadProjectDataFetcher.java b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationUploadProjectDataFetcher.java index 241c5ab01d..64a9fadb24 100644 --- a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationUploadProjectDataFetcher.java +++ b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/mutation/MutationUploadProjectDataFetcher.java @@ -48,11 +48,11 @@ @MutationDataFetcher(type = MutationTypeProvider.TYPE, field = MutationUploadProjectDataFetcher.UPLOAD_PROJECT_FIELD) public class MutationUploadProjectDataFetcher implements IDataFetcherWithFieldCoordinates { - public static final String UPLOAD_PROJECT_FIELD = "uploadProject"; //$NON-NLS-1$ + public static final String UPLOAD_PROJECT_FIELD = "uploadProject"; - private static final String ID = "id"; //$NON-NLS-1$ + private static final String ID = "id"; - private static final String FILE = "file"; //$NON-NLS-1$ + private static final String FILE = "file"; private final IGraphQLMessageService messageService; diff --git a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/representation/RepresentationMetadataDataFetcher.java b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/representation/RepresentationMetadataDataFetcher.java index 1cfb573958..e64e6fc7cd 100644 --- a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/representation/RepresentationMetadataDataFetcher.java +++ b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/representation/RepresentationMetadataDataFetcher.java @@ -32,7 +32,7 @@ @QueryDataFetcher(type = "Representation", field = "metadata") public class RepresentationMetadataDataFetcher implements IDataFetcherWithFieldCoordinates { - private static final String METADATA_FIELD = "metadata"; //$NON-NLS-1$ + private static final String METADATA_FIELD = "metadata"; private final IRepresentationMetadataSearchService representationMetadataSearchService; @@ -44,14 +44,14 @@ public RepresentationMetadataDataFetcher(IRepresentationMetadataSearchService re public List getFieldCoordinates() { // @formatter:off return List.of( - FieldCoordinates.coordinates("Diagram", METADATA_FIELD), //$NON-NLS-1$ - FieldCoordinates.coordinates("Form", METADATA_FIELD), //$NON-NLS-1$ - FieldCoordinates.coordinates("FormDescriptionEditor", METADATA_FIELD), //$NON-NLS-1$ - FieldCoordinates.coordinates("BarChart", METADATA_FIELD), //$NON-NLS-1$ - FieldCoordinates.coordinates("PieChart", METADATA_FIELD), //$NON-NLS-1$ - FieldCoordinates.coordinates("Tree", METADATA_FIELD), //$NON-NLS-1$ - FieldCoordinates.coordinates("Selection", METADATA_FIELD), //$NON-NLS-1$ - FieldCoordinates.coordinates("Validation", METADATA_FIELD) //$NON-NLS-1$ + FieldCoordinates.coordinates("Diagram", METADATA_FIELD), + FieldCoordinates.coordinates("Form", METADATA_FIELD), + FieldCoordinates.coordinates("FormDescriptionEditor", METADATA_FIELD), + FieldCoordinates.coordinates("BarChart", METADATA_FIELD), + FieldCoordinates.coordinates("PieChart", METADATA_FIELD), + FieldCoordinates.coordinates("Tree", METADATA_FIELD), + FieldCoordinates.coordinates("Selection", METADATA_FIELD), + FieldCoordinates.coordinates("Validation", METADATA_FIELD) ); // @formatter:on } diff --git a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/subscriptions/SubscriptionEditingContextEventDataFetcher.java b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/subscriptions/SubscriptionEditingContextEventDataFetcher.java index 792ee806b5..a75ced2cef 100644 --- a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/subscriptions/SubscriptionEditingContextEventDataFetcher.java +++ b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/subscriptions/SubscriptionEditingContextEventDataFetcher.java @@ -45,7 +45,7 @@ @SubscriptionDataFetcher(type = SubscriptionTypeProvider.TYPE, field = SubscriptionEditingContextEventDataFetcher.EDITING_CONTEXT_EVENT_FIELD) public class SubscriptionEditingContextEventDataFetcher implements IDataFetcherWithFieldCoordinates> { - public static final String EDITING_CONTEXT_EVENT_FIELD = "editingContextEvent"; //$NON-NLS-1$ + public static final String EDITING_CONTEXT_EVENT_FIELD = "editingContextEvent"; private final ObjectMapper objectMapper; diff --git a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/user/UserEditingContextDataFetcher.java b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/user/UserEditingContextDataFetcher.java index ef5b9c8965..bc3d634981 100644 --- a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/user/UserEditingContextDataFetcher.java +++ b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/datafetchers/user/UserEditingContextDataFetcher.java @@ -39,7 +39,7 @@ */ @QueryDataFetcher(type = ViewerTypeProvider.USER_TYPE, field = ViewerTypeProvider.EDITING_CONTEXT_FIELD) public class UserEditingContextDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String EDITING_CONTEXT_ID_ARGUMENT = "editingContextId"; //$NON-NLS-1$ + private static final String EDITING_CONTEXT_ID_ARGUMENT = "editingContextId"; @Override public DataFetcherResult get(DataFetchingEnvironment environment) throws Exception { diff --git a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/messages/GraphQLMessageService.java b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/messages/GraphQLMessageService.java index 0cb6858b28..141c56a40f 100644 --- a/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/messages/GraphQLMessageService.java +++ b/packages/sirius-web/backend/sirius-web-graphql/src/main/java/org/eclipse/sirius/web/graphql/messages/GraphQLMessageService.java @@ -34,7 +34,7 @@ public GraphQLMessageService(@Qualifier("graphQLMessageSourceAccessor") MessageS @Override public String unexpectedError() { - return this.messageSourceAccessor.getMessage("UNEXPECTED_ERROR"); //$NON-NLS-1$ + return this.messageSourceAccessor.getMessage("UNEXPECTED_ERROR"); } } diff --git a/packages/sirius-web/backend/sirius-web-graphql/src/test/java/org/eclipse/sirius/web/graphql/architecture/ArchitectureConstants.java b/packages/sirius-web/backend/sirius-web-graphql/src/test/java/org/eclipse/sirius/web/graphql/architecture/ArchitectureConstants.java index 7c57210580..5f8ce92031 100644 --- a/packages/sirius-web/backend/sirius-web-graphql/src/test/java/org/eclipse/sirius/web/graphql/architecture/ArchitectureConstants.java +++ b/packages/sirius-web/backend/sirius-web-graphql/src/test/java/org/eclipse/sirius/web/graphql/architecture/ArchitectureConstants.java @@ -22,7 +22,7 @@ * @author sbegaudeau */ public final class ArchitectureConstants { - public static final String SIRIUS_WEB_GRAPHQL_ROOT_PACKAGE = "org.eclipse.sirius.web.graphql.."; //$NON-NLS-1$ + public static final String SIRIUS_WEB_GRAPHQL_ROOT_PACKAGE = "org.eclipse.sirius.web.graphql.."; // @formatter:off public static final JavaClasses CLASSES = new ClassFileImporter() diff --git a/packages/sirius-web/backend/sirius-web-persistence/src/main/java/org/eclipse/sirius/web/persistence/entities/AccountEntity.java b/packages/sirius-web/backend/sirius-web-persistence/src/main/java/org/eclipse/sirius/web/persistence/entities/AccountEntity.java index 8dc1ad01b6..e549b5083c 100644 --- a/packages/sirius-web/backend/sirius-web-persistence/src/main/java/org/eclipse/sirius/web/persistence/entities/AccountEntity.java +++ b/packages/sirius-web/backend/sirius-web-persistence/src/main/java/org/eclipse/sirius/web/persistence/entities/AccountEntity.java @@ -74,7 +74,7 @@ public void setRole(String role) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, username: {2}, role: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, username: {2}, role: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.username, this.role); } } diff --git a/packages/sirius-web/backend/sirius-web-persistence/src/main/java/org/eclipse/sirius/web/persistence/entities/CustomImageEntity.java b/packages/sirius-web/backend/sirius-web-persistence/src/main/java/org/eclipse/sirius/web/persistence/entities/CustomImageEntity.java index f2c656af82..322a31332b 100644 --- a/packages/sirius-web/backend/sirius-web-persistence/src/main/java/org/eclipse/sirius/web/persistence/entities/CustomImageEntity.java +++ b/packages/sirius-web/backend/sirius-web-persistence/src/main/java/org/eclipse/sirius/web/persistence/entities/CustomImageEntity.java @@ -89,8 +89,8 @@ public void setContent(byte[] content) { @Override public String toString() { - String projectId = Optional.ofNullable(this.project).map(ProjectEntity::getId).map(UUID::toString).orElse("null"); //$NON-NLS-1$ - String pattern = "{0} '{' id: {1}, projectId: {2}, label: {3}, contentType: {4} '}'"; //$NON-NLS-1$ + String projectId = Optional.ofNullable(this.project).map(ProjectEntity::getId).map(UUID::toString).orElse("null"); + String pattern = "{0} '{' id: {1}, projectId: {2}, label: {3}, contentType: {4} '}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, projectId, this.label, this.contentType); } } diff --git a/packages/sirius-web/backend/sirius-web-persistence/src/main/java/org/eclipse/sirius/web/persistence/entities/CustomImageMetadataEntity.java b/packages/sirius-web/backend/sirius-web-persistence/src/main/java/org/eclipse/sirius/web/persistence/entities/CustomImageMetadataEntity.java index 9fedbc19ff..b8536f8895 100644 --- a/packages/sirius-web/backend/sirius-web-persistence/src/main/java/org/eclipse/sirius/web/persistence/entities/CustomImageMetadataEntity.java +++ b/packages/sirius-web/backend/sirius-web-persistence/src/main/java/org/eclipse/sirius/web/persistence/entities/CustomImageMetadataEntity.java @@ -77,8 +77,8 @@ public void setContentType(String contentType) { @Override public String toString() { - String projectId = Optional.ofNullable(this.project).map(ProjectEntity::getId).map(UUID::toString).orElse("null"); //$NON-NLS-1$ - String pattern = "{0} '{' id: {1}, projectId: {2}, label: {3}, contentType: {4} '}'"; //$NON-NLS-1$ + String projectId = Optional.ofNullable(this.project).map(ProjectEntity::getId).map(UUID::toString).orElse("null"); + String pattern = "{0} '{' id: {1}, projectId: {2}, label: {3}, contentType: {4} '}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, projectId, this.label, this.contentType); } } diff --git a/packages/sirius-web/backend/sirius-web-persistence/src/main/java/org/eclipse/sirius/web/persistence/entities/DocumentEntity.java b/packages/sirius-web/backend/sirius-web-persistence/src/main/java/org/eclipse/sirius/web/persistence/entities/DocumentEntity.java index 06a76aaea7..c74e7e9ded 100644 --- a/packages/sirius-web/backend/sirius-web-persistence/src/main/java/org/eclipse/sirius/web/persistence/entities/DocumentEntity.java +++ b/packages/sirius-web/backend/sirius-web-persistence/src/main/java/org/eclipse/sirius/web/persistence/entities/DocumentEntity.java @@ -78,7 +78,7 @@ public void setContent(String content) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, name: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, name: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.name); } } diff --git a/packages/sirius-web/backend/sirius-web-persistence/src/main/java/org/eclipse/sirius/web/persistence/entities/IdMappingEntity.java b/packages/sirius-web/backend/sirius-web-persistence/src/main/java/org/eclipse/sirius/web/persistence/entities/IdMappingEntity.java index 7c7b77267c..c9d26fc37a 100644 --- a/packages/sirius-web/backend/sirius-web-persistence/src/main/java/org/eclipse/sirius/web/persistence/entities/IdMappingEntity.java +++ b/packages/sirius-web/backend/sirius-web-persistence/src/main/java/org/eclipse/sirius/web/persistence/entities/IdMappingEntity.java @@ -50,7 +50,7 @@ public void setExternalId(String externalId) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, externalId: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, externalId: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.externalId); } diff --git a/packages/sirius-web/backend/sirius-web-persistence/src/main/java/org/eclipse/sirius/web/persistence/entities/ProjectEntity.java b/packages/sirius-web/backend/sirius-web-persistence/src/main/java/org/eclipse/sirius/web/persistence/entities/ProjectEntity.java index 6a9a12f4d3..14152fddd5 100644 --- a/packages/sirius-web/backend/sirius-web-persistence/src/main/java/org/eclipse/sirius/web/persistence/entities/ProjectEntity.java +++ b/packages/sirius-web/backend/sirius-web-persistence/src/main/java/org/eclipse/sirius/web/persistence/entities/ProjectEntity.java @@ -84,7 +84,7 @@ public void setVisibility(VisibilityEntity visibility) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, name: {2}, owner: {3}, visibility: {4}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, name: {2}, owner: {3}, visibility: {4}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.name, this.owner, this.visibility); } } diff --git a/packages/sirius-web/backend/sirius-web-persistence/src/main/java/org/eclipse/sirius/web/persistence/entities/RepresentationEntity.java b/packages/sirius-web/backend/sirius-web-persistence/src/main/java/org/eclipse/sirius/web/persistence/entities/RepresentationEntity.java index 57b4f180fd..b8eec1642e 100644 --- a/packages/sirius-web/backend/sirius-web-persistence/src/main/java/org/eclipse/sirius/web/persistence/entities/RepresentationEntity.java +++ b/packages/sirius-web/backend/sirius-web-persistence/src/main/java/org/eclipse/sirius/web/persistence/entities/RepresentationEntity.java @@ -104,7 +104,7 @@ public void setContent(String content) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, targetObjectId: {2}, label: {3}, kind: {4}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, targetObjectId: {2}, label: {3}, kind: {4}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.targetObjectId, this.label, this.kind); } } diff --git a/packages/sirius-web/backend/sirius-web-persistence/src/test/java/org/eclipse/sirius/web/persistence/architecture/ArchitectureConstants.java b/packages/sirius-web/backend/sirius-web-persistence/src/test/java/org/eclipse/sirius/web/persistence/architecture/ArchitectureConstants.java index 383428bc21..83506c60b7 100644 --- a/packages/sirius-web/backend/sirius-web-persistence/src/test/java/org/eclipse/sirius/web/persistence/architecture/ArchitectureConstants.java +++ b/packages/sirius-web/backend/sirius-web-persistence/src/test/java/org/eclipse/sirius/web/persistence/architecture/ArchitectureConstants.java @@ -22,7 +22,7 @@ * @author sbegaudeau */ public final class ArchitectureConstants { - public static final String SIRIUS_WEB_PERSISTENCE_ROOT_PACKAGE = "org.eclipse.sirius.web.persistence.."; //$NON-NLS-1$ + public static final String SIRIUS_WEB_PERSISTENCE_ROOT_PACKAGE = "org.eclipse.sirius.web.persistence.."; // @formatter:off public static final JavaClasses CLASSES = new ClassFileImporter() diff --git a/packages/sirius-web/backend/sirius-web-persistence/src/test/java/org/eclipse/sirius/web/persistence/architecture/RepositoryTests.java b/packages/sirius-web/backend/sirius-web-persistence/src/test/java/org/eclipse/sirius/web/persistence/architecture/RepositoryTests.java index 896805be92..e5b4d90f19 100644 --- a/packages/sirius-web/backend/sirius-web-persistence/src/test/java/org/eclipse/sirius/web/persistence/architecture/RepositoryTests.java +++ b/packages/sirius-web/backend/sirius-web-persistence/src/test/java/org/eclipse/sirius/web/persistence/architecture/RepositoryTests.java @@ -24,11 +24,11 @@ * @author sbegaudeau */ public class RepositoryTests { - private static final String REPOSITORY_SUFFIX = "Repository"; //$NON-NLS-1$ + private static final String REPOSITORY_SUFFIX = "Repository"; - private static final String REPOSITORIES_PACKAGE = "..repositories.."; //$NON-NLS-1$ + private static final String REPOSITORIES_PACKAGE = "..repositories.."; - private static final String TEST = "Test"; //$NON-NLS-1$ + private static final String TEST = "Test"; @Test public void onlyRepositoriesShouldBeInARepositoryPackage() { diff --git a/packages/sirius-web/backend/sirius-web-persistence/src/test/java/org/eclipse/sirius/web/persistence/repositories/AccountRepositoryIntegrationTests.java b/packages/sirius-web/backend/sirius-web-persistence/src/test/java/org/eclipse/sirius/web/persistence/repositories/AccountRepositoryIntegrationTests.java index 7643e6c17c..1d700310de 100644 --- a/packages/sirius-web/backend/sirius-web-persistence/src/test/java/org/eclipse/sirius/web/persistence/repositories/AccountRepositoryIntegrationTests.java +++ b/packages/sirius-web/backend/sirius-web-persistence/src/test/java/org/eclipse/sirius/web/persistence/repositories/AccountRepositoryIntegrationTests.java @@ -34,24 +34,24 @@ @ContextConfiguration(classes = PersistenceTestConfiguration.class) public class AccountRepositoryIntegrationTests extends AbstractIntegrationTests { - private static final String FIRST_USERNAME = "AzureDiamond"; //$NON-NLS-1$ + private static final String FIRST_USERNAME = "AzureDiamond"; - private static final String FIRST_PASSWORD = "hunter2"; //$NON-NLS-1$ + private static final String FIRST_PASSWORD = "hunter2"; - private static final String SECOND_USERNAME = "Cthon98"; //$NON-NLS-1$ + private static final String SECOND_USERNAME = "Cthon98"; - private static final String SECOND_PASSWORD = "*********"; //$NON-NLS-1$ + private static final String SECOND_PASSWORD = "*********"; - private static final String USER = "user"; //$NON-NLS-1$ + private static final String USER = "user"; @Autowired private IAccountRepository accountRepository; @DynamicPropertySource public static void postgresqlProperties(DynamicPropertyRegistry registry) { - registry.add("spring.datasource.url", POSTGRESQL_CONTAINER::getJdbcUrl); //$NON-NLS-1$ - registry.add("spring.datasource.password", POSTGRESQL_CONTAINER::getPassword); //$NON-NLS-1$ - registry.add("spring.datasource.username", POSTGRESQL_CONTAINER::getUsername); //$NON-NLS-1$ + registry.add("spring.datasource.url", POSTGRESQL_CONTAINER::getJdbcUrl); + registry.add("spring.datasource.password", POSTGRESQL_CONTAINER::getPassword); + registry.add("spring.datasource.username", POSTGRESQL_CONTAINER::getUsername); } @Test diff --git a/packages/sirius-web/backend/sirius-web-persistence/src/test/java/org/eclipse/sirius/web/persistence/repositories/DocumentRepositoryIntegrationTests.java b/packages/sirius-web/backend/sirius-web-persistence/src/test/java/org/eclipse/sirius/web/persistence/repositories/DocumentRepositoryIntegrationTests.java index fd28e428f6..729ca4cafd 100644 --- a/packages/sirius-web/backend/sirius-web-persistence/src/test/java/org/eclipse/sirius/web/persistence/repositories/DocumentRepositoryIntegrationTests.java +++ b/packages/sirius-web/backend/sirius-web-persistence/src/test/java/org/eclipse/sirius/web/persistence/repositories/DocumentRepositoryIntegrationTests.java @@ -38,26 +38,26 @@ @ContextConfiguration(classes = PersistenceTestConfiguration.class) public class DocumentRepositoryIntegrationTests extends AbstractIntegrationTests { - private static final String OWNER_NAME = "Jyn Erso"; //$NON-NLS-1$ + private static final String OWNER_NAME = "Jyn Erso"; - private static final String ROLE_USER = "user"; //$NON-NLS-1$ + private static final String ROLE_USER = "user"; - private static final String PROJECT_NAME = "Cluster Prism"; //$NON-NLS-1$ + private static final String PROJECT_NAME = "Cluster Prism"; - private static final String FIRST_DOCUMENT_NAME = "Concordia"; //$NON-NLS-1$ + private static final String FIRST_DOCUMENT_NAME = "Concordia"; - private static final String SECOND_DOCUMENT_NAME = "Mandalore"; //$NON-NLS-1$ + private static final String SECOND_DOCUMENT_NAME = "Mandalore"; - private static final String THIRD_DOCUMENT_NAME = "Kalevala"; //$NON-NLS-1$ + private static final String THIRD_DOCUMENT_NAME = "Kalevala"; // @formatter:off - private static final String DOCUMENT_CONTENT = "{" + System.lineSeparator() //$NON-NLS-1$ - + " \"json\": {" + System.lineSeparator() //$NON-NLS-1$ - + " \"version\": \"1.0\"," + System.lineSeparator() //$NON-NLS-1$ - + " \"encoding\": \"utf-8\"" + System.lineSeparator() //$NON-NLS-1$ - + " }," + System.lineSeparator() //$NON-NLS-1$ - + " \"content\": []" + System.lineSeparator() //$NON-NLS-1$ - + "}" + System.lineSeparator(); //$NON-NLS-1$ + private static final String DOCUMENT_CONTENT = "{" + System.lineSeparator() + + " \"json\": {" + System.lineSeparator() + + " \"version\": \"1.0\"," + System.lineSeparator() + + " \"encoding\": \"utf-8\"" + System.lineSeparator() + + " }," + System.lineSeparator() + + " \"content\": []" + System.lineSeparator() + + "}" + System.lineSeparator(); // @formatter:on @Autowired @@ -71,9 +71,9 @@ public class DocumentRepositoryIntegrationTests extends AbstractIntegrationTests @DynamicPropertySource public static void postgresqlProperties(DynamicPropertyRegistry registry) { - registry.add("spring.datasource.url", POSTGRESQL_CONTAINER::getJdbcUrl); //$NON-NLS-1$ - registry.add("spring.datasource.password", POSTGRESQL_CONTAINER::getPassword); //$NON-NLS-1$ - registry.add("spring.datasource.username", POSTGRESQL_CONTAINER::getUsername); //$NON-NLS-1$ + registry.add("spring.datasource.url", POSTGRESQL_CONTAINER::getJdbcUrl); + registry.add("spring.datasource.password", POSTGRESQL_CONTAINER::getPassword); + registry.add("spring.datasource.username", POSTGRESQL_CONTAINER::getUsername); } @Test diff --git a/packages/sirius-web/backend/sirius-web-persistence/src/test/java/org/eclipse/sirius/web/persistence/repositories/ProjectRepositoryIntegrationTests.java b/packages/sirius-web/backend/sirius-web-persistence/src/test/java/org/eclipse/sirius/web/persistence/repositories/ProjectRepositoryIntegrationTests.java index 2295818180..b37b236f0f 100644 --- a/packages/sirius-web/backend/sirius-web-persistence/src/test/java/org/eclipse/sirius/web/persistence/repositories/ProjectRepositoryIntegrationTests.java +++ b/packages/sirius-web/backend/sirius-web-persistence/src/test/java/org/eclipse/sirius/web/persistence/repositories/ProjectRepositoryIntegrationTests.java @@ -36,15 +36,15 @@ @ContextConfiguration(classes = PersistenceTestConfiguration.class) public class ProjectRepositoryIntegrationTests extends AbstractIntegrationTests { - private static final String FIRST_OWNER_NAME = "Jyn Erso"; //$NON-NLS-1$ + private static final String FIRST_OWNER_NAME = "Jyn Erso"; - private static final String SECOND_OWNER_NAME = "Orson Krennic"; //$NON-NLS-1$ + private static final String SECOND_OWNER_NAME = "Orson Krennic"; - private static final String PASSWORD = "password"; //$NON-NLS-1$ + private static final String PASSWORD = "password"; - private static final String ROLE_USER = "user"; //$NON-NLS-1$ + private static final String ROLE_USER = "user"; - private static final String FIRST_PROJECT_NAME = "Star Durst"; //$NON-NLS-1$ + private static final String FIRST_PROJECT_NAME = "Star Durst"; @Autowired private IAccountRepository accountRepository; @@ -54,9 +54,9 @@ public class ProjectRepositoryIntegrationTests extends AbstractIntegrationTests @DynamicPropertySource public static void postgresqlProperties(DynamicPropertyRegistry registry) { - registry.add("spring.datasource.url", POSTGRESQL_CONTAINER::getJdbcUrl); //$NON-NLS-1$ - registry.add("spring.datasource.password", POSTGRESQL_CONTAINER::getPassword); //$NON-NLS-1$ - registry.add("spring.datasource.username", POSTGRESQL_CONTAINER::getUsername); //$NON-NLS-1$ + registry.add("spring.datasource.url", POSTGRESQL_CONTAINER::getJdbcUrl); + registry.add("spring.datasource.password", POSTGRESQL_CONTAINER::getPassword); + registry.add("spring.datasource.username", POSTGRESQL_CONTAINER::getUsername); } @Test diff --git a/packages/sirius-web/backend/sirius-web-persistence/src/test/java/org/eclipse/sirius/web/persistence/repositories/RepresentationRepositoryIntegrationTests.java b/packages/sirius-web/backend/sirius-web-persistence/src/test/java/org/eclipse/sirius/web/persistence/repositories/RepresentationRepositoryIntegrationTests.java index eb21abbe0d..a954c8e0d6 100644 --- a/packages/sirius-web/backend/sirius-web-persistence/src/test/java/org/eclipse/sirius/web/persistence/repositories/RepresentationRepositoryIntegrationTests.java +++ b/packages/sirius-web/backend/sirius-web-persistence/src/test/java/org/eclipse/sirius/web/persistence/repositories/RepresentationRepositoryIntegrationTests.java @@ -44,38 +44,38 @@ @ContextConfiguration(classes = PersistenceTestConfiguration.class) public class RepresentationRepositoryIntegrationTests extends AbstractIntegrationTests { - private static final String DOCUMENT_NAME = "Obsydians"; //$NON-NLS-1$ + private static final String DOCUMENT_NAME = "Obsydians"; - private static final String OWNER_NAME = "Jyn Erso"; //$NON-NLS-1$ + private static final String OWNER_NAME = "Jyn Erso"; - private static final String ROLE_USER = "user"; //$NON-NLS-1$ + private static final String ROLE_USER = "user"; - private static final String FIRST_PROJECT_NAME = "Cluster Prism"; //$NON-NLS-1$ + private static final String FIRST_PROJECT_NAME = "Cluster Prism"; - private static final String SECOND_PROJECT_NAME = "War Mantle"; //$NON-NLS-1$ + private static final String SECOND_PROJECT_NAME = "War Mantle"; - private static final String FIRST_DIAGRAM_LABEL = "First Diagram"; //$NON-NLS-1$ + private static final String FIRST_DIAGRAM_LABEL = "First Diagram"; - private static final String SECOND_DIAGRAM_LABEL = "Second Diagram"; //$NON-NLS-1$ + private static final String SECOND_DIAGRAM_LABEL = "Second Diagram"; - private static final String THIRD_DIAGRAM_LABEL = "Third Diagram"; //$NON-NLS-1$ + private static final String THIRD_DIAGRAM_LABEL = "Third Diagram"; - private static final String FOURTH_DIAGRAM_LABEL = "Fourth Diagram"; //$NON-NLS-1$ + private static final String FOURTH_DIAGRAM_LABEL = "Fourth Diagram"; - private static final String FIRST_TARGET_OBJECT_ID = "firstTargetObjectId"; //$NON-NLS-1$ + private static final String FIRST_TARGET_OBJECT_ID = "firstTargetObjectId"; - private static final String SECOND_TARGET_OBJECT_ID = "secondTargetObjectId"; //$NON-NLS-1$ + private static final String SECOND_TARGET_OBJECT_ID = "secondTargetObjectId"; - private static final String DOCUMENT_CONTENT_PATTERN = "{ \"id\": \"%1$s\" }"; //$NON-NLS-1$ + private static final String DOCUMENT_CONTENT_PATTERN = "{ \"id\": \"%1$s\" }"; // @formatter:off - private static final String DOCUMENT_CONTENT = "{" + System.lineSeparator() //$NON-NLS-1$ - + " \"json\": {" + System.lineSeparator() //$NON-NLS-1$ - + " \"version\": \"1.0\"," + System.lineSeparator() //$NON-NLS-1$ - + " \"encoding\": \"utf-8\"" + System.lineSeparator() //$NON-NLS-1$ - + " }," + System.lineSeparator() //$NON-NLS-1$ - + " \"content\": [%1$s]" + System.lineSeparator() //$NON-NLS-1$ - + "}" + System.lineSeparator(); //$NON-NLS-1$ + private static final String DOCUMENT_CONTENT = "{" + System.lineSeparator() + + " \"json\": {" + System.lineSeparator() + + " \"version\": \"1.0\"," + System.lineSeparator() + + " \"encoding\": \"utf-8\"" + System.lineSeparator() + + " }," + System.lineSeparator() + + " \"content\": [%1$s]" + System.lineSeparator() + + "}" + System.lineSeparator(); // @formatter:on @Autowired @@ -95,9 +95,9 @@ public class RepresentationRepositoryIntegrationTests extends AbstractIntegratio @DynamicPropertySource public static void postgresqlProperties(DynamicPropertyRegistry registry) { - registry.add("spring.datasource.url", POSTGRESQL_CONTAINER::getJdbcUrl); //$NON-NLS-1$ - registry.add("spring.datasource.password", POSTGRESQL_CONTAINER::getPassword); //$NON-NLS-1$ - registry.add("spring.datasource.username", POSTGRESQL_CONTAINER::getUsername); //$NON-NLS-1$ + registry.add("spring.datasource.url", POSTGRESQL_CONTAINER::getJdbcUrl); + registry.add("spring.datasource.password", POSTGRESQL_CONTAINER::getPassword); + registry.add("spring.datasource.username", POSTGRESQL_CONTAINER::getUsername); } @Test @@ -261,7 +261,7 @@ private String createDocumentContent(String... targetObjectIds) { //@formatter:off String documentContentContent = List.of(targetObjectIds).stream() .map(targetObjectId -> String.format(DOCUMENT_CONTENT_PATTERN, targetObjectId)) - .collect(Collectors.joining(",")); //$NON-NLS-1$ + .collect(Collectors.joining(",")); //@formatter:on return String.format(DOCUMENT_CONTENT, documentContentContent); @@ -273,9 +273,9 @@ private RepresentationEntity createRepresentationEntity(ProjectEntity projectEnt representationEntity.setLabel(label); representationEntity.setProject(projectEntity); representationEntity.setTargetObjectId(targetObjectId); - representationEntity.setKind("siriusComponents://representation?type=Diagram"); //$NON-NLS-1$ + representationEntity.setKind("siriusComponents://representation?type=Diagram"); representationEntity.setDescriptionId(UUID.randomUUID().toString()); - representationEntity.setContent("{ \"nodes\": [], \"edges\": []}"); //$NON-NLS-1$ + representationEntity.setContent("{ \"nodes\": [], \"edges\": []}"); return representationEntity; } diff --git a/packages/sirius-web/backend/sirius-web-persistence/src/test/java/org/eclipse/sirius/web/persistence/repositories/TestPostgreSQLContainer.java b/packages/sirius-web/backend/sirius-web-persistence/src/test/java/org/eclipse/sirius/web/persistence/repositories/TestPostgreSQLContainer.java index 3466250305..b6976b275d 100644 --- a/packages/sirius-web/backend/sirius-web-persistence/src/test/java/org/eclipse/sirius/web/persistence/repositories/TestPostgreSQLContainer.java +++ b/packages/sirius-web/backend/sirius-web-persistence/src/test/java/org/eclipse/sirius/web/persistence/repositories/TestPostgreSQLContainer.java @@ -24,14 +24,14 @@ * @author sbegaudeau */ public final class TestPostgreSQLContainer extends PostgreSQLContainer { - private static final String VERSION = "postgres:latest"; //$NON-NLS-1$ + private static final String VERSION = "postgres:latest"; public TestPostgreSQLContainer() { super(VERSION); // @formatter:off this.waitStrategy = new LogMessageWaitStrategy() - .withRegEx(".*database system is ready to accept connections.*\\s") //$NON-NLS-1$ + .withRegEx(".*database system is ready to accept connections.*\\s") .withTimes(1) .withStartupTimeout(Duration.of(240, ChronoUnit.SECONDS)); // @formatter:on diff --git a/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/configuration/CustomImagesLoader.java b/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/configuration/CustomImagesLoader.java index 80235006d8..29066d25c3 100644 --- a/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/configuration/CustomImagesLoader.java +++ b/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/configuration/CustomImagesLoader.java @@ -57,7 +57,7 @@ public void run(String... args) throws Exception { Resource[] resources = this.patternResolver.getResources(this.imagesPathPattern); for (Resource resource : resources) { Optional contentType = this.getContentType(resource); - if (contentType.isPresent() && contentType.get().startsWith("image/")) { //$NON-NLS-1$ + if (contentType.isPresent() && contentType.get().startsWith("image/")) { this.importImageFromResource(resource, contentType.get()); } } @@ -68,7 +68,7 @@ private void importImageFromResource(Resource resource, String contentType) { try { CustomImageEntity customImageEntity = new CustomImageEntity(); // No project set: these are global images - customImageEntity.setLabel(Optional.ofNullable(resource.getFilename()).map(this::trimFileExtension).orElse("")); //$NON-NLS-1$ + customImageEntity.setLabel(Optional.ofNullable(resource.getFilename()).map(this::trimFileExtension).orElse("")); customImageEntity.setContentType(contentType); try (BufferedInputStream stream = new BufferedInputStream(resource.getInputStream())) { customImageEntity.setContent(stream.readAllBytes()); @@ -76,7 +76,7 @@ private void importImageFromResource(Resource resource, String contentType) { customImageEntity.setId(UUID.nameUUIDFromBytes(customImageEntity.getContent())); this.customImageRepository.save(customImageEntity); } catch (IOException e) { - this.logger.warn("Error loading resource {}: {}", resource, e.getMessage()); //$NON-NLS-1$ + this.logger.warn("Error loading resource {}: {}", resource, e.getMessage()); } } diff --git a/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/configuration/SampleSiriusConfiguration.java b/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/configuration/SampleSiriusConfiguration.java index bdcf872650..2b9d640e86 100644 --- a/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/configuration/SampleSiriusConfiguration.java +++ b/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/configuration/SampleSiriusConfiguration.java @@ -29,12 +29,12 @@ public class SampleSiriusConfiguration implements ISiriusConfiguration { @Override public List getODesignPaths() { - return List.of("description/flow.odesign"); //$NON-NLS-1$ + return List.of("description/flow.odesign"); } @Bean @ConditionalOnProperty(prefix = "org.eclipse.sirius.web.features", name = "studioDefinition") public ISiriusConfiguration domainModelerDefinition() { - return () -> List.of("description/domain.odesign"); //$NON-NLS-1$ + return () -> List.of("description/domain.odesign"); } } diff --git a/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/configuration/SpringWebMvcConfigurer.java b/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/configuration/SpringWebMvcConfigurer.java index fe632a1bdf..b69b475e2a 100644 --- a/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/configuration/SpringWebMvcConfigurer.java +++ b/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/configuration/SpringWebMvcConfigurer.java @@ -31,7 +31,7 @@ */ @Configuration public class SpringWebMvcConfigurer implements WebMvcConfigurer { - private static final String[] ALLOWED_ORIGIN_PATTERNS = { "http://localhost:[*]" }; //$NON-NLS-1$ + private static final String[] ALLOWED_ORIGIN_PATTERNS = { "http://localhost:[*]" }; /** * The Spring environment. @@ -73,13 +73,13 @@ public void addResourceHandlers(ResourceHandlerRegistry registry) { @Override public void addViewControllers(ViewControllerRegistry registry) { - registry.addRedirectViewController("/graphiql", "/graphiql/index.html"); //$NON-NLS-1$ //$NON-NLS-2$ - registry.addRedirectViewController("/voyager", "/voyager/index.html"); //$NON-NLS-1$ //$NON-NLS-2$ + registry.addRedirectViewController("/graphiql", "/graphiql/index.html"); + registry.addRedirectViewController("/voyager", "/voyager/index.html"); } @Override public void addCorsMappings(CorsRegistry registry) { - boolean inDevMode = Arrays.asList(this.environment.getActiveProfiles()).contains("dev"); //$NON-NLS-1$ + boolean inDevMode = Arrays.asList(this.environment.getActiveProfiles()).contains("dev"); if (inDevMode) { registry.addMapping(URLConstants.API_BASE_PATH + SpringWebMvcConfigurerConstants.ANY_PATTERN).allowedOriginPatterns(ALLOWED_ORIGIN_PATTERNS).allowCredentials(true); } diff --git a/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/configuration/SpringWebSecurityConfiguration.java b/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/configuration/SpringWebSecurityConfiguration.java index 327dfec389..5af43e704a 100644 --- a/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/configuration/SpringWebSecurityConfiguration.java +++ b/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/configuration/SpringWebSecurityConfiguration.java @@ -46,8 +46,8 @@ public SpringWebSecurityConfiguration(IAccountRepository accountRepository) { protected void configure(HttpSecurity http) throws Exception { http.cors().disable(); http.csrf().disable(); - http.authorizeRequests().antMatchers("/api/graphql").authenticated(); //$NON-NLS-1$ - http.authorizeRequests().antMatchers("/**").permitAll(); //$NON-NLS-1$ + http.authorizeRequests().antMatchers("/api/graphql").authenticated(); + http.authorizeRequests().antMatchers("/**").permitAll(); http.httpBasic(); } @@ -58,7 +58,7 @@ protected void configure(AuthenticationManagerBuilder auth) throws Exception { // @formatter:off return this.accountRepository.findByUsername(username) .map(account -> new User(account.getUsername(), account.getPassword(), List.of())) - .orElseThrow(() -> new UsernameNotFoundException(MessageFormat.format("User ''{0}'' not found", username))); //$NON-NLS-1$ + .orElseThrow(() -> new UsernameNotFoundException(MessageFormat.format("User ''{0}'' not found", username))); // @formatter:on }; auth.userDetailsService(accountBasedUserDetailsService).passwordEncoder(new BCryptPasswordEncoder()); diff --git a/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/configuration/StereotypeBuilder.java b/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/configuration/StereotypeBuilder.java index 083742ead4..a4a1535e34 100644 --- a/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/configuration/StereotypeBuilder.java +++ b/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/configuration/StereotypeBuilder.java @@ -53,12 +53,12 @@ public StereotypeBuilder(String timerName, MeterRegistry meterRegistry) { } public String getStereotypeBody(EObject rootEObject) { - JsonResource resource = new JSONResourceFactory().createResourceFromPath("inmemory"); //$NON-NLS-1$ + JsonResource resource = new JSONResourceFactory().createResourceFromPath("inmemory"); if (rootEObject != null) { resource.getContents().add(rootEObject); } - String content = ""; //$NON-NLS-1$ + String content = ""; try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) { Map options = new HashMap<>(); options.put(JsonResource.OPTION_ENCODING, JsonResource.ENCODING_UTF_8); @@ -76,7 +76,7 @@ public String getStereotypeBody(EObject rootEObject) { public String getStereotypeBody(ClassPathResource classPathResource) { long start = System.currentTimeMillis(); - String content = ""; //$NON-NLS-1$ + String content = ""; try (var inputStream = classPathResource.getInputStream()) { URI uri = new JSONResourceFactory().createResourceURI(classPathResource.getFilename()); Resource inputResource = this.loadFromXMI(uri, inputStream); diff --git a/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/configuration/StereotypeDescriptionRegistryConfigurer.java b/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/configuration/StereotypeDescriptionRegistryConfigurer.java index 79cc131020..305f13ae11 100644 --- a/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/configuration/StereotypeDescriptionRegistryConfigurer.java +++ b/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/configuration/StereotypeDescriptionRegistryConfigurer.java @@ -41,273 +41,273 @@ @Configuration public class StereotypeDescriptionRegistryConfigurer implements IStereotypeDescriptionRegistryConfigurer { - public static final UUID EMPTY_ID = UUID.nameUUIDFromBytes("empty".getBytes()); //$NON-NLS-1$ + public static final UUID EMPTY_ID = UUID.nameUUIDFromBytes("empty".getBytes()); - public static final String EMPTY_LABEL = "Others..."; //$NON-NLS-1$ + public static final String EMPTY_LABEL = "Others..."; - public static final UUID EMPTY_FLOW_ID = UUID.nameUUIDFromBytes("empty_flow".getBytes()); //$NON-NLS-1$ + public static final UUID EMPTY_FLOW_ID = UUID.nameUUIDFromBytes("empty_flow".getBytes()); - public static final String EMPTY_FLOW_LABEL = "Flow"; //$NON-NLS-1$ + public static final String EMPTY_FLOW_LABEL = "Flow"; - public static final UUID ROBOT_FLOW_ID = UUID.nameUUIDFromBytes("robot_flow".getBytes()); //$NON-NLS-1$ + public static final UUID ROBOT_FLOW_ID = UUID.nameUUIDFromBytes("robot_flow".getBytes()); - public static final String ROBOT_FLOW_LABEL = "Robot Flow"; //$NON-NLS-1$ + public static final String ROBOT_FLOW_LABEL = "Robot Flow"; - public static final UUID BIG_GUY_FLOW_ID = UUID.nameUUIDFromBytes("big_guy_flow".getBytes()); //$NON-NLS-1$ + public static final UUID BIG_GUY_FLOW_ID = UUID.nameUUIDFromBytes("big_guy_flow".getBytes()); - public static final String BIG_GUY_FLOW_LABEL = "Big Guy Flow (17k elements)"; //$NON-NLS-1$ + public static final String BIG_GUY_FLOW_LABEL = "Big Guy Flow (17k elements)"; - private static final UUID EMPTY_DOMAIN_ID = UUID.nameUUIDFromBytes("empty_domain".getBytes()); //$NON-NLS-1$ + private static final UUID EMPTY_DOMAIN_ID = UUID.nameUUIDFromBytes("empty_domain".getBytes()); - private static final String EMPTY_DOMAIN_LABEL = "Domain"; //$NON-NLS-1$ + private static final String EMPTY_DOMAIN_LABEL = "Domain"; - private static final UUID EMPTY_VIEW_ID = UUID.nameUUIDFromBytes("empty_view".getBytes()); //$NON-NLS-1$ + private static final UUID EMPTY_VIEW_ID = UUID.nameUUIDFromBytes("empty_view".getBytes()); - private static final String EMPTY_VIEW_LABEL = "View"; //$NON-NLS-1$ + private static final String EMPTY_VIEW_LABEL = "View"; - private static final String TIMER_NAME = "siriusweb_stereotype_load"; //$NON-NLS-1$ + private static final String TIMER_NAME = "siriusweb_stereotype_load"; private final StereotypeBuilder stereotypeBuilder; // @formatter:off private final List sampleDomainNames = List.of( - "agnesi", //$NON-NLS-1$ - "albattani", //$NON-NLS-1$ - "allen", //$NON-NLS-1$ - "almeida", //$NON-NLS-1$ - "antonelli", //$NON-NLS-1$ - "archimedes", //$NON-NLS-1$ - "ardinghelli", //$NON-NLS-1$ - "aryabhata", //$NON-NLS-1$ - "austin", //$NON-NLS-1$ - "babbage", //$NON-NLS-1$ - "banach", //$NON-NLS-1$ - "banzai", //$NON-NLS-1$ - "bardeen", //$NON-NLS-1$ - "bartik", //$NON-NLS-1$ - "bassi", //$NON-NLS-1$ - "beaver", //$NON-NLS-1$ - "bell", //$NON-NLS-1$ - "benz", //$NON-NLS-1$ - "bhabha", //$NON-NLS-1$ - "bhaskara", //$NON-NLS-1$ - "black", //$NON-NLS-1$ - "blackburn", //$NON-NLS-1$ - "blackwell", //$NON-NLS-1$ - "bohr", //$NON-NLS-1$ - "booth", //$NON-NLS-1$ - "borg", //$NON-NLS-1$ - "bose", //$NON-NLS-1$ - "bouman", //$NON-NLS-1$ - "boyd", //$NON-NLS-1$ - "brahmagupta", //$NON-NLS-1$ - "brattain", //$NON-NLS-1$ - "brown", //$NON-NLS-1$ - "buck", //$NON-NLS-1$ - "burnell", //$NON-NLS-1$ - "cannon", //$NON-NLS-1$ - "carson", //$NON-NLS-1$ - "cartwright", //$NON-NLS-1$ - "carver", //$NON-NLS-1$ - "cerf", //$NON-NLS-1$ - "chandrasekhar", //$NON-NLS-1$ - "chaplygin", //$NON-NLS-1$ - "chatelet", //$NON-NLS-1$ - "chatterjee", //$NON-NLS-1$ - "chaum", //$NON-NLS-1$ - "chebyshev", //$NON-NLS-1$ - "clarke", //$NON-NLS-1$ - "cohen", //$NON-NLS-1$ - "colden", //$NON-NLS-1$ - "cori", //$NON-NLS-1$ - "cray", //$NON-NLS-1$ - "curran", //$NON-NLS-1$ - "curie", //$NON-NLS-1$ - "darwin", //$NON-NLS-1$ - "davinci", //$NON-NLS-1$ - "dewdney", //$NON-NLS-1$ - "dhawan", //$NON-NLS-1$ - "diffie", //$NON-NLS-1$ - "dijkstra", //$NON-NLS-1$ - "dirac", //$NON-NLS-1$ - "driscoll", //$NON-NLS-1$ - "dubinsky", //$NON-NLS-1$ - "easley", //$NON-NLS-1$ - "edison", //$NON-NLS-1$ - "einstein", //$NON-NLS-1$ - "elbakyan", //$NON-NLS-1$ - "elgamal", //$NON-NLS-1$ - "elion", //$NON-NLS-1$ - "ellis", //$NON-NLS-1$ - "engelbart", //$NON-NLS-1$ - "euclid", //$NON-NLS-1$ - "euler", //$NON-NLS-1$ - "faraday", //$NON-NLS-1$ - "feistel", //$NON-NLS-1$ - "fermat", //$NON-NLS-1$ - "fermi", //$NON-NLS-1$ - "feynman", //$NON-NLS-1$ - "franklin", //$NON-NLS-1$ - "gagarin", //$NON-NLS-1$ - "galileo", //$NON-NLS-1$ - "galois", //$NON-NLS-1$ - "ganguly", //$NON-NLS-1$ - "gates", //$NON-NLS-1$ - "gauss", //$NON-NLS-1$ - "germain", //$NON-NLS-1$ - "goldberg", //$NON-NLS-1$ - "goldstine", //$NON-NLS-1$ - "goldwasser", //$NON-NLS-1$ - "golick", //$NON-NLS-1$ - "goodall", //$NON-NLS-1$ - "gould", //$NON-NLS-1$ - "greider", //$NON-NLS-1$ - "grothendieck", //$NON-NLS-1$ - "haibt", //$NON-NLS-1$ - "hamilton", //$NON-NLS-1$ - "haslett", //$NON-NLS-1$ - "hawking", //$NON-NLS-1$ - "hellman", //$NON-NLS-1$ - "heisenberg", //$NON-NLS-1$ - "hermann", //$NON-NLS-1$ - "herschel", //$NON-NLS-1$ - "hertz", //$NON-NLS-1$ - "heyrovsky", //$NON-NLS-1$ - "hodgkin", //$NON-NLS-1$ - "hofstadter", //$NON-NLS-1$ - "hoover", //$NON-NLS-1$ - "hopper", //$NON-NLS-1$ - "hugle", //$NON-NLS-1$ - "hypatia", //$NON-NLS-1$ - "ishizaka", //$NON-NLS-1$ - "jackson", //$NON-NLS-1$ - "jang", //$NON-NLS-1$ - "jemison", //$NON-NLS-1$ - "jennings", //$NON-NLS-1$ - "jepsen", //$NON-NLS-1$ - "johnson", //$NON-NLS-1$ - "joliot", //$NON-NLS-1$ - "jones", //$NON-NLS-1$ - "kalam", //$NON-NLS-1$ - "kapitsa", //$NON-NLS-1$ - "kare", //$NON-NLS-1$ - "keldysh", //$NON-NLS-1$ - "keller", //$NON-NLS-1$ - "kepler", //$NON-NLS-1$ - "khayyam", //$NON-NLS-1$ - "khorana", //$NON-NLS-1$ - "kilby", //$NON-NLS-1$ - "kirch", //$NON-NLS-1$ - "knuth", //$NON-NLS-1$ - "kowalevski", //$NON-NLS-1$ - "lalande", //$NON-NLS-1$ - "lamarr", //$NON-NLS-1$ - "lamport", //$NON-NLS-1$ - "leakey", //$NON-NLS-1$ - "leavitt", //$NON-NLS-1$ - "lederberg", //$NON-NLS-1$ - "lehmann", //$NON-NLS-1$ - "lewin", //$NON-NLS-1$ - "lichterman", //$NON-NLS-1$ - "liskov", //$NON-NLS-1$ - "lovelace", //$NON-NLS-1$ - "lumiere", //$NON-NLS-1$ - "mahavira", //$NON-NLS-1$ - "margulis", //$NON-NLS-1$ - "matsumoto", //$NON-NLS-1$ - "maxwell", //$NON-NLS-1$ - "mayer", //$NON-NLS-1$ - "mccarthy", //$NON-NLS-1$ - "mcclintock", //$NON-NLS-1$ - "mclaren", //$NON-NLS-1$ - "mclean", //$NON-NLS-1$ - "mcnulty", //$NON-NLS-1$ - "mendel", //$NON-NLS-1$ - "mendeleev", //$NON-NLS-1$ - "meitner", //$NON-NLS-1$ - "meninsky", //$NON-NLS-1$ - "merkle", //$NON-NLS-1$ - "mestorf", //$NON-NLS-1$ - "mirzakhani", //$NON-NLS-1$ - "montalcini", //$NON-NLS-1$ - "moore", //$NON-NLS-1$ - "morse", //$NON-NLS-1$ - "murdock", //$NON-NLS-1$ - "moser", //$NON-NLS-1$ - "napier", //$NON-NLS-1$ - "nash", //$NON-NLS-1$ - "neumann", //$NON-NLS-1$ - "newton", //$NON-NLS-1$ - "nightingale", //$NON-NLS-1$ - "nobel", //$NON-NLS-1$ - "noether", //$NON-NLS-1$ - "northcutt", //$NON-NLS-1$ - "noyce", //$NON-NLS-1$ - "panini", //$NON-NLS-1$ - "pare", //$NON-NLS-1$ - "pascal", //$NON-NLS-1$ - "pasteur", //$NON-NLS-1$ - "payne", //$NON-NLS-1$ - "perlman", //$NON-NLS-1$ - "pike", //$NON-NLS-1$ - "poincare", //$NON-NLS-1$ - "poitras", //$NON-NLS-1$ - "proskuriakova", //$NON-NLS-1$ - "ptolemy", //$NON-NLS-1$ - "raman", //$NON-NLS-1$ - "ramanujan", //$NON-NLS-1$ - "ride", //$NON-NLS-1$ - "ritchie", //$NON-NLS-1$ - "rhodes", //$NON-NLS-1$ - "robinson", //$NON-NLS-1$ - "roentgen", //$NON-NLS-1$ - "rosalind", //$NON-NLS-1$ - "rubin", //$NON-NLS-1$ - "saha", //$NON-NLS-1$ - "sammet", //$NON-NLS-1$ - "sanderson", //$NON-NLS-1$ - "satoshi", //$NON-NLS-1$ - "shamir", //$NON-NLS-1$ - "shannon", //$NON-NLS-1$ - "shaw", //$NON-NLS-1$ - "shirley", //$NON-NLS-1$ - "shockley", //$NON-NLS-1$ - "shtern", //$NON-NLS-1$ - "sinoussi", //$NON-NLS-1$ - "snyder", //$NON-NLS-1$ - "solomon", //$NON-NLS-1$ - "spence", //$NON-NLS-1$ - "stonebraker", //$NON-NLS-1$ - "sutherland", //$NON-NLS-1$ - "swanson", //$NON-NLS-1$ - "swartz", //$NON-NLS-1$ - "swirles", //$NON-NLS-1$ - "taussig", //$NON-NLS-1$ - "tereshkova", //$NON-NLS-1$ - "tesla", //$NON-NLS-1$ - "tharp", //$NON-NLS-1$ - "thompson", //$NON-NLS-1$ - "torvalds", //$NON-NLS-1$ - "tu", //$NON-NLS-1$ - "turing", //$NON-NLS-1$ - "varahamihira", //$NON-NLS-1$ - "vaughan", //$NON-NLS-1$ - "villani", //$NON-NLS-1$ - "visvesvaraya", //$NON-NLS-1$ - "volhard", //$NON-NLS-1$ - "wescoff", //$NON-NLS-1$ - "wilbur", //$NON-NLS-1$ - "wiles", //$NON-NLS-1$ - "williams", //$NON-NLS-1$ - "williamson", //$NON-NLS-1$ - "wilson", //$NON-NLS-1$ - "wing", //$NON-NLS-1$ - "wozniak", //$NON-NLS-1$ - "wright", //$NON-NLS-1$ - "wu", //$NON-NLS-1$ - "yalow", //$NON-NLS-1$ - "yonath", //$NON-NLS-1$ - "zhukovsky" //$NON-NLS-1$ + "agnesi", + "albattani", + "allen", + "almeida", + "antonelli", + "archimedes", + "ardinghelli", + "aryabhata", + "austin", + "babbage", + "banach", + "banzai", + "bardeen", + "bartik", + "bassi", + "beaver", + "bell", + "benz", + "bhabha", + "bhaskara", + "black", + "blackburn", + "blackwell", + "bohr", + "booth", + "borg", + "bose", + "bouman", + "boyd", + "brahmagupta", + "brattain", + "brown", + "buck", + "burnell", + "cannon", + "carson", + "cartwright", + "carver", + "cerf", + "chandrasekhar", + "chaplygin", + "chatelet", + "chatterjee", + "chaum", + "chebyshev", + "clarke", + "cohen", + "colden", + "cori", + "cray", + "curran", + "curie", + "darwin", + "davinci", + "dewdney", + "dhawan", + "diffie", + "dijkstra", + "dirac", + "driscoll", + "dubinsky", + "easley", + "edison", + "einstein", + "elbakyan", + "elgamal", + "elion", + "ellis", + "engelbart", + "euclid", + "euler", + "faraday", + "feistel", + "fermat", + "fermi", + "feynman", + "franklin", + "gagarin", + "galileo", + "galois", + "ganguly", + "gates", + "gauss", + "germain", + "goldberg", + "goldstine", + "goldwasser", + "golick", + "goodall", + "gould", + "greider", + "grothendieck", + "haibt", + "hamilton", + "haslett", + "hawking", + "hellman", + "heisenberg", + "hermann", + "herschel", + "hertz", + "heyrovsky", + "hodgkin", + "hofstadter", + "hoover", + "hopper", + "hugle", + "hypatia", + "ishizaka", + "jackson", + "jang", + "jemison", + "jennings", + "jepsen", + "johnson", + "joliot", + "jones", + "kalam", + "kapitsa", + "kare", + "keldysh", + "keller", + "kepler", + "khayyam", + "khorana", + "kilby", + "kirch", + "knuth", + "kowalevski", + "lalande", + "lamarr", + "lamport", + "leakey", + "leavitt", + "lederberg", + "lehmann", + "lewin", + "lichterman", + "liskov", + "lovelace", + "lumiere", + "mahavira", + "margulis", + "matsumoto", + "maxwell", + "mayer", + "mccarthy", + "mcclintock", + "mclaren", + "mclean", + "mcnulty", + "mendel", + "mendeleev", + "meitner", + "meninsky", + "merkle", + "mestorf", + "mirzakhani", + "montalcini", + "moore", + "morse", + "murdock", + "moser", + "napier", + "nash", + "neumann", + "newton", + "nightingale", + "nobel", + "noether", + "northcutt", + "noyce", + "panini", + "pare", + "pascal", + "pasteur", + "payne", + "perlman", + "pike", + "poincare", + "poitras", + "proskuriakova", + "ptolemy", + "raman", + "ramanujan", + "ride", + "ritchie", + "rhodes", + "robinson", + "roentgen", + "rosalind", + "rubin", + "saha", + "sammet", + "sanderson", + "satoshi", + "shamir", + "shannon", + "shaw", + "shirley", + "shockley", + "shtern", + "sinoussi", + "snyder", + "solomon", + "spence", + "stonebraker", + "sutherland", + "swanson", + "swartz", + "swirles", + "taussig", + "tereshkova", + "tesla", + "tharp", + "thompson", + "torvalds", + "tu", + "turing", + "varahamihira", + "vaughan", + "villani", + "visvesvaraya", + "volhard", + "wescoff", + "wilbur", + "wiles", + "williams", + "williamson", + "wilson", + "wing", + "wozniak", + "wright", + "wu", + "yalow", + "yonath", + "zhukovsky" ); // @formatter:on @@ -330,12 +330,12 @@ public void addStereotypeDescriptions(IStereotypeDescriptionRegistry registry) { } registry.add(new StereotypeDescription(ROBOT_FLOW_ID, ROBOT_FLOW_LABEL, this::getRobotFlowContent)); registry.add(new StereotypeDescription(BIG_GUY_FLOW_ID, BIG_GUY_FLOW_LABEL, this::getBigGuyFlowContent)); - registry.add(new StereotypeDescription(EMPTY_ID, EMPTY_LABEL, "New", this::getEmptyContent)); //$NON-NLS-1$ + registry.add(new StereotypeDescription(EMPTY_ID, EMPTY_LABEL, "New", this::getEmptyContent)); } private String getEmptyDomainContent() { Domain domain = DomainFactory.eINSTANCE.createDomain(); - domain.setName("SampleDomain"); //$NON-NLS-1$ + domain.setName("SampleDomain"); if (!this.sampleDomainNames.isEmpty()) { int randomIndex = this.random.nextInt(this.sampleDomainNames.size()); domain.setName(this.sampleDomainNames.get(randomIndex)); @@ -346,7 +346,7 @@ private String getEmptyDomainContent() { private String getEmptyViewContent() { View newView = ViewFactory.eINSTANCE.createView(); DiagramDescription diagramDescription = ViewFactory.eINSTANCE.createDiagramDescription(); - diagramDescription.setName("New Diagram Description"); //$NON-NLS-1$ + diagramDescription.setName("New Diagram Description"); newView.getDescriptions().add(diagramDescription); return this.stereotypeBuilder.getStereotypeBody(newView); } @@ -360,10 +360,10 @@ private String getEmptyFlowContent() { } private String getRobotFlowContent() { - return this.stereotypeBuilder.getStereotypeBody(new ClassPathResource("robot.flow")); //$NON-NLS-1$ + return this.stereotypeBuilder.getStereotypeBody(new ClassPathResource("robot.flow")); } private String getBigGuyFlowContent() { - return this.stereotypeBuilder.getStereotypeBody(new ClassPathResource("Big_Guy.flow")); //$NON-NLS-1$ + return this.stereotypeBuilder.getStereotypeBody(new ClassPathResource("Big_Guy.flow")); } } diff --git a/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/filters/SiriusWebAuthenticationFilter.java b/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/filters/SiriusWebAuthenticationFilter.java index 3d231e4189..8ec8bfbec8 100644 --- a/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/filters/SiriusWebAuthenticationFilter.java +++ b/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/filters/SiriusWebAuthenticationFilter.java @@ -43,9 +43,9 @@ public class SiriusWebAuthenticationFilter extends GenericFilterBean { private final String authorizationHeader; public SiriusWebAuthenticationFilter() { - String rawCredentials = "system:012345678910"; //$NON-NLS-1$ + String rawCredentials = "system:012345678910"; String credentials = Base64.getEncoder().encodeToString(rawCredentials.getBytes()); - this.authorizationHeader = "Basic " + credentials; //$NON-NLS-1$ + this.authorizationHeader = "Basic " + credentials; } @Override diff --git a/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/services/ImagePathService.java b/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/services/ImagePathService.java index 4fcc72d6f0..1a00db197f 100644 --- a/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/services/ImagePathService.java +++ b/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/services/ImagePathService.java @@ -25,7 +25,7 @@ @Service public class ImagePathService implements IImagePathService { - private static final List IMAGES_PATHS = List.of("/img", "/images", "/icons", "/icons2"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + private static final List IMAGES_PATHS = List.of("/img", "/images", "/icons", "/icons2"); @Override public List getPaths() { diff --git a/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/services/ViewerProvider.java b/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/services/ViewerProvider.java index 3be3435846..46f3e958f4 100644 --- a/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/services/ViewerProvider.java +++ b/packages/sirius-web/backend/sirius-web-sample-application/src/main/java/org/eclipse/sirius/web/sample/services/ViewerProvider.java @@ -31,7 +31,7 @@ public class ViewerProvider implements IViewerProvider { @Override public Optional getViewer(DataFetchingEnvironment environment) { - return Optional.of(new User(UUID.randomUUID(), "system")); //$NON-NLS-1$ + return Optional.of(new User(UUID.randomUUID(), "system")); } } diff --git a/packages/sirius-web/backend/sirius-web-sample-application/src/test/java/org/eclipse/sirius/web/sample/tests/ViewDetailsRenderingIntegrationTests.java b/packages/sirius-web/backend/sirius-web-sample-application/src/test/java/org/eclipse/sirius/web/sample/tests/ViewDetailsRenderingIntegrationTests.java index a55c3a0b09..0d3040e958 100644 --- a/packages/sirius-web/backend/sirius-web-sample-application/src/test/java/org/eclipse/sirius/web/sample/tests/ViewDetailsRenderingIntegrationTests.java +++ b/packages/sirius-web/backend/sirius-web-sample-application/src/test/java/org/eclipse/sirius/web/sample/tests/ViewDetailsRenderingIntegrationTests.java @@ -96,7 +96,7 @@ public void setup() { this.editingDomain.getResourceSet().getPackageRegistry().put(FlowPackage.eNS_URI, FlowPackage.eINSTANCE); this.editingContext = new EditingContext(UUID.randomUUID().toString(), this.editingDomain); - this.view = this.loadFixture("ViewCompletionFixture.xmi"); //$NON-NLS-1$ + this.view = this.loadFixture("ViewCompletionFixture.xmi"); IObjectService objectService = new ObjectService(new EMFKindService(new KindParser()), composedAdapterFactory, new LabelFeatureProviderRegistry()); @@ -124,8 +124,8 @@ public void testDiagramDescriptionProperties() { Form propertiesForm = this.renderForm(diagramDescription, this.viewPropertiesFormDescription); assertThat(propertiesForm).isNotNull(); - this.checkDomainTypeField(propertiesForm, "Domain Type"); //$NON-NLS-1$ - this.checkExpressionField(propertiesForm, "Title Expression"); //$NON-NLS-1$ + this.checkDomainTypeField(propertiesForm, "Domain Type"); + this.checkExpressionField(propertiesForm, "Title Expression"); } @Test @@ -134,8 +134,8 @@ public void testFormDescriptionProperties() { Form propertiesForm = this.renderForm(formDescription, this.viewPropertiesFormDescription); assertThat(propertiesForm).isNotNull(); - this.checkDomainTypeField(propertiesForm, "Domain Type"); //$NON-NLS-1$ - this.checkExpressionField(propertiesForm, "Title Expression"); //$NON-NLS-1$ + this.checkDomainTypeField(propertiesForm, "Domain Type"); + this.checkExpressionField(propertiesForm, "Title Expression"); } private void checkDomainTypeField(Form form, String fieldName) { @@ -143,12 +143,12 @@ private void checkDomainTypeField(Form form, String fieldName) { assertThat(field.isSupportsCompletion()).isTrue(); assertThat(field.getCompletionProposalsProvider()).isNotNull(); assertThat(field.getStyle()).isNotNull(); - assertThat(field.getStyle().getBackgroundColor()).isEqualTo("#e6f4ee"); //$NON-NLS-1$ + assertThat(field.getStyle().getBackgroundColor()).isEqualTo("#e6f4ee"); - var proposals = this.requestCompletion(field, "flow:", 5); //$NON-NLS-1$ + var proposals = this.requestCompletion(field, "flow:", 5); assertThat(proposals).hasSize(16); - proposals = this.requestCompletion(field, "flow::PowerLink", "flow::Power".length()); //$NON-NLS-1$ //$NON-NLS-2$ + proposals = this.requestCompletion(field, "flow::PowerLink", "flow::Power".length()); List candidates = List.of(FlowPackage.Literals.POWER_INPUT, FlowPackage.Literals.POWER_LINK, FlowPackage.Literals.POWER_OUTPUT, FlowPackage.Literals.POWERED); this.checkProposalsText(proposals, candidates.stream().map(this::domainTypeName).collect(Collectors.toList())); } @@ -158,12 +158,12 @@ private void checkExpressionField(Form form, String fieldName) { assertThat(field.isSupportsCompletion()).isTrue(); assertThat(field.getCompletionProposalsProvider()).isNotNull(); assertThat(field.getStyle()).isNotNull(); - assertThat(field.getStyle().getBackgroundColor()).isEqualTo("#fff8e5"); //$NON-NLS-1$ + assertThat(field.getStyle().getBackgroundColor()).isEqualTo("#fff8e5"); } private View loadFixture(String viewResourcePath) { ResourceSet resourceSet = this.editingDomain.getResourceSet(); - resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("xmi", new XMIResourceFactoryImpl()); //$NON-NLS-1$ + resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("xmi", new XMIResourceFactoryImpl()); Resource resource = null; ClassPathResource classPathResource = new ClassPathResource(viewResourcePath); @@ -220,6 +220,6 @@ private Form renderForm(EObject eObject, FormDescription formDescription) { } private String domainTypeName(EClass klass) { - return String.format("%s::%s", klass.getEPackage().getName(), klass.getName()); //$NON-NLS-1$ + return String.format("%s::%s", klass.getEPackage().getName(), klass.getName()); } } diff --git a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/accounts/Profile.java b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/accounts/Profile.java index 8e55243e6f..e2c33ad962 100644 --- a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/accounts/Profile.java +++ b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/accounts/Profile.java @@ -41,7 +41,7 @@ public String getUsername() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, username: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, username: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.username); } } diff --git a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/document/Document.java b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/document/Document.java index 1a30be1370..f27a646f3d 100644 --- a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/document/Document.java +++ b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/document/Document.java @@ -57,7 +57,7 @@ public String getContent() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, projectId: {2}, name: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, projectId: {2}, name: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.project.getId(), this.name); } } diff --git a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/document/IDocumentService.java b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/document/IDocumentService.java index 8a211f0e7e..8845afe276 100644 --- a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/document/IDocumentService.java +++ b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/document/IDocumentService.java @@ -23,9 +23,9 @@ */ public interface IDocumentService { - String RESOURCE_KIND_JSON = "json"; //$NON-NLS-1$ + String RESOURCE_KIND_JSON = "json"; - String RESOURCE_KIND_XMI = "xmi"; //$NON-NLS-1$ + String RESOURCE_KIND_XMI = "xmi"; Optional createDocument(String projectId, String name, String content); diff --git a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/document/RewriteProxiesInput.java b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/document/RewriteProxiesInput.java index aefa3ddc09..31a55e8e62 100644 --- a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/document/RewriteProxiesInput.java +++ b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/document/RewriteProxiesInput.java @@ -52,7 +52,7 @@ public Map getOldDocumentIdToNewDocumentId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, oldDocumentIdToNewDocumentId: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, oldDocumentIdToNewDocumentId: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.oldDocumentIdToNewDocumentId); } } diff --git a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/document/RewriteProxiesSuccessPayload.java b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/document/RewriteProxiesSuccessPayload.java index 7a112fb0e2..8bbb04bada 100644 --- a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/document/RewriteProxiesSuccessPayload.java +++ b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/document/RewriteProxiesSuccessPayload.java @@ -38,7 +38,7 @@ public UUID getId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } } diff --git a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/document/UploadDocumentInput.java b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/document/UploadDocumentInput.java index 3dbcc60f90..02eefdeac1 100644 --- a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/document/UploadDocumentInput.java +++ b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/document/UploadDocumentInput.java @@ -60,7 +60,7 @@ public UploadFile getFile() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, file: '{'name: {3}'}''}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, file: '{'name: {3}'}''}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.file.getName()); } diff --git a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/document/UploadDocumentSuccessPayload.java b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/document/UploadDocumentSuccessPayload.java index be4aded93e..44d2f96090 100644 --- a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/document/UploadDocumentSuccessPayload.java +++ b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/document/UploadDocumentSuccessPayload.java @@ -45,7 +45,7 @@ public Document getDocument() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, document: '{'id: {2}, name: {3}'}''}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, document: '{'id: {2}, name: {3}'}''}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.document.getId(), this.getDocument().getName()); } } diff --git a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/images/CustomImageMetadata.java b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/images/CustomImageMetadata.java index 83d92aae19..06f3ec0453 100644 --- a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/images/CustomImageMetadata.java +++ b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/images/CustomImageMetadata.java @@ -55,7 +55,7 @@ public String getContentType() { @Override public String toString() { - String pattern = "{0} '{' id: {1}, url: {2}, label: {3}, contentType: {4} '}'"; //$NON-NLS-1$ + String pattern = "{0} '{' id: {1}, url: {2}, label: {3}, contentType: {4} '}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.url, this.label, this.contentType); } } diff --git a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/images/DeleteImageInput.java b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/images/DeleteImageInput.java index e8236793ac..2734bbcc8f 100644 --- a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/images/DeleteImageInput.java +++ b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/images/DeleteImageInput.java @@ -49,7 +49,7 @@ public UUID getImageId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, imageId: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, imageId: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.imageId); } diff --git a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/images/DeleteImageSuccessPayload.java b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/images/DeleteImageSuccessPayload.java index 75ad275e00..2698365f70 100644 --- a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/images/DeleteImageSuccessPayload.java +++ b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/images/DeleteImageSuccessPayload.java @@ -38,7 +38,7 @@ public UUID getId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } } diff --git a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/images/RenameImageInput.java b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/images/RenameImageInput.java index 99d9b8e420..12903d88b8 100644 --- a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/images/RenameImageInput.java +++ b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/images/RenameImageInput.java @@ -56,7 +56,7 @@ public String getNewLabel() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, imageId: {2}, newLabel: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, imageId: {2}, newLabel: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.imageId, this.newLabel); } diff --git a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/images/RenameImageSuccessPayload.java b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/images/RenameImageSuccessPayload.java index 4d21bd691a..f072941203 100644 --- a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/images/RenameImageSuccessPayload.java +++ b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/images/RenameImageSuccessPayload.java @@ -38,7 +38,7 @@ public UUID getId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } } diff --git a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/images/UploadImageSuccessPayload.java b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/images/UploadImageSuccessPayload.java index defe968675..2407580477 100644 --- a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/images/UploadImageSuccessPayload.java +++ b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/images/UploadImageSuccessPayload.java @@ -45,7 +45,7 @@ public UUID getImageId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, document: '{'id: {2} '}''}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, document: '{'id: {2} '}''}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.imageId); } } diff --git a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/projects/CreateProjectInput.java b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/projects/CreateProjectInput.java index ae75516c0d..cc71fbd040 100644 --- a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/projects/CreateProjectInput.java +++ b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/projects/CreateProjectInput.java @@ -56,7 +56,7 @@ public Visibility getVisibility() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, name: {2}, visibility: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, name: {2}, visibility: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.name, this.visibility); } diff --git a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/projects/CreateProjectSuccessPayload.java b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/projects/CreateProjectSuccessPayload.java index 96e109b185..97adf03b29 100644 --- a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/projects/CreateProjectSuccessPayload.java +++ b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/projects/CreateProjectSuccessPayload.java @@ -45,7 +45,7 @@ public Project getProject() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, project: '{'id: {2}, name: {3} '}''}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, project: '{'id: {2}, name: {3} '}''}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.project.getId(), this.project.getName()); } } diff --git a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/projects/DeleteProjectInput.java b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/projects/DeleteProjectInput.java index d00a2d75a9..f4b2c8824f 100644 --- a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/projects/DeleteProjectInput.java +++ b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/projects/DeleteProjectInput.java @@ -38,7 +38,7 @@ public UUID getProjectId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, projectId: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, projectId: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.projectId); } } diff --git a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/projects/DeleteProjectSuccessPayload.java b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/projects/DeleteProjectSuccessPayload.java index c8a7a9ad49..b17a70db2e 100644 --- a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/projects/DeleteProjectSuccessPayload.java +++ b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/projects/DeleteProjectSuccessPayload.java @@ -46,7 +46,7 @@ public IViewer getViewer() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, viewer: '{'id: {2}, username: {3}'}''}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, viewer: '{'id: {2}, username: {3}'}''}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.viewer.getId(), this.viewer.getUsername()); } } diff --git a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/projects/Project.java b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/projects/Project.java index f670d31b26..d5c2b920ad 100644 --- a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/projects/Project.java +++ b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/projects/Project.java @@ -57,7 +57,7 @@ public Visibility getVisibility() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, name: {2}, owner: {3}, visibility: {4}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, name: {2}, owner: {3}, visibility: {4}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.name, this.owner, this.visibility); } } diff --git a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/projects/RenameProjectInput.java b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/projects/RenameProjectInput.java index da28ab97b3..68370084f2 100644 --- a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/projects/RenameProjectInput.java +++ b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/projects/RenameProjectInput.java @@ -55,7 +55,7 @@ public String getNewName() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, projectId: {2}, newName: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, projectId: {2}, newName: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.projectId, this.newName); } } diff --git a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/projects/RenameProjectSuccessPayload.java b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/projects/RenameProjectSuccessPayload.java index 04214c13ef..e2b7129690 100644 --- a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/projects/RenameProjectSuccessPayload.java +++ b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/projects/RenameProjectSuccessPayload.java @@ -45,7 +45,7 @@ public Project getProject() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, project: '{'id: {2}, name: {3}'}''}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, project: '{'id: {2}, name: {3}'}''}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.project.getId(), this.project.getName()); } } diff --git a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/projects/UploadProjectInput.java b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/projects/UploadProjectInput.java index b92afd704a..d0c13b06fb 100644 --- a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/projects/UploadProjectInput.java +++ b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/projects/UploadProjectInput.java @@ -39,7 +39,7 @@ public UploadFile getFile() { @Override public String toString() { - String pattern = "{0}"; //$NON-NLS-1$ + String pattern = "{0}"; return MessageFormat.format(pattern, this.getClass().getSimpleName()); } } diff --git a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/projects/UploadProjectSuccessPayload.java b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/projects/UploadProjectSuccessPayload.java index 794392ee01..4d246d4320 100644 --- a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/projects/UploadProjectSuccessPayload.java +++ b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/projects/UploadProjectSuccessPayload.java @@ -44,7 +44,7 @@ public Project getProject() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, project: '{'id: {2}, name: {3}'}''}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, project: '{'id: {2}, name: {3}'}''}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.project.getId(), this.project.getName()); } } diff --git a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/viewer/User.java b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/viewer/User.java index 37a6357bee..5a3a088b60 100644 --- a/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/viewer/User.java +++ b/packages/sirius-web/backend/sirius-web-services-api/src/main/java/org/eclipse/sirius/web/services/api/viewer/User.java @@ -44,7 +44,7 @@ public String getUsername() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, username: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, username: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.username); } diff --git a/packages/sirius-web/backend/sirius-web-services-api/src/test/java/org/eclipse/sirius/web/services/api/architecture/ArchitectureConstants.java b/packages/sirius-web/backend/sirius-web-services-api/src/test/java/org/eclipse/sirius/web/services/api/architecture/ArchitectureConstants.java index 392a005a38..36577fe4da 100644 --- a/packages/sirius-web/backend/sirius-web-services-api/src/test/java/org/eclipse/sirius/web/services/api/architecture/ArchitectureConstants.java +++ b/packages/sirius-web/backend/sirius-web-services-api/src/test/java/org/eclipse/sirius/web/services/api/architecture/ArchitectureConstants.java @@ -22,7 +22,7 @@ * @author sbegaudeau */ public final class ArchitectureConstants { - public static final String SIRIUS_WEB_SERVICES_API_ROOT_PACKAGE = "org.eclipse.sirius.web.services.api.."; //$NON-NLS-1$ + public static final String SIRIUS_WEB_SERVICES_API_ROOT_PACKAGE = "org.eclipse.sirius.web.services.api.."; // @formatter:off public static final JavaClasses CLASSES = new ClassFileImporter() diff --git a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/compatibility/IdentifierProvider.java b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/compatibility/IdentifierProvider.java index 32262a13c2..d9e581c9d1 100644 --- a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/compatibility/IdentifierProvider.java +++ b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/compatibility/IdentifierProvider.java @@ -62,7 +62,7 @@ public String getIdentifier(Object element) { .map(EObject.class::cast) .map(EcoreUtil::getURI) .map(Object::toString) - .orElse(""); //$NON-NLS-1$ + .orElse(""); Optional optional = this.getOrFetchByExternalId(vsmElementId); return optional.orElseGet(() -> this.newIdMapping(vsmElementId)) diff --git a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/configuration/ServicesMessageServiceConfiguration.java b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/configuration/ServicesMessageServiceConfiguration.java index 027d933a0d..75150c67b9 100644 --- a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/configuration/ServicesMessageServiceConfiguration.java +++ b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/configuration/ServicesMessageServiceConfiguration.java @@ -24,7 +24,7 @@ */ @Configuration public class ServicesMessageServiceConfiguration { - private static final String PATH = "messages/sirius-web-services"; //$NON-NLS-1$ + private static final String PATH = "messages/sirius-web-services"; @Bean public MessageSourceAccessor servicesMessageSourceAccessor() { diff --git a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/documents/RewriteProxiesEventHandler.java b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/documents/RewriteProxiesEventHandler.java index 5b78c414c8..45bf76dfb1 100644 --- a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/documents/RewriteProxiesEventHandler.java +++ b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/documents/RewriteProxiesEventHandler.java @@ -87,7 +87,7 @@ private int rewriteProxyURIs(Resource resource, Map oldDocumentI String oldDocumentId = proxyURI.path().substring(1); String newDocumentId = oldDocumentIdToNewDocumentId.get(oldDocumentId); if (newDocumentId != null) { - String prefix = EditingContext.RESOURCE_SCHEME + ":///"; //$NON-NLS-1$ + String prefix = EditingContext.RESOURCE_SCHEME + ":///"; URI newProxyURI = URI.createURI(proxyURI.toString().replace(prefix + oldDocumentId, prefix + newDocumentId)); internalEObject.eSetProxyURI(newProxyURI); rewrittenCount.incrementAndGet(); diff --git a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/documents/UploadDocumentEventHandler.java b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/documents/UploadDocumentEventHandler.java index 1b83e0a3cd..5afd4ebb65 100644 --- a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/documents/UploadDocumentEventHandler.java +++ b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/documents/UploadDocumentEventHandler.java @@ -167,7 +167,7 @@ private Optional getContent(EPackage.Registry registry, UploadFile file, Resource inputResource = optionalInputResource.get(); if (checkProxies && this.containsProxies(inputResource)) { - this.logger.warn("The resource {} contains unresolvable proxies and will not be uploaded.", fileName); //$NON-NLS-1$ + this.logger.warn("The resource {} contains unresolvable proxies and will not be uploaded.", fileName); } else { JsonResource ouputResource = new JSONResourceFactory().createResourceFromPath(fileName); resourceSet.getResources().add(ouputResource); @@ -251,9 +251,9 @@ private Optional getResource(InputStream inputStream, URI resourceURI, String line = reader.readLine(); Map options = new HashMap<>(); if (line != null) { - if (line.contains("{")) { //$NON-NLS-1$ + if (line.contains("{")) { resource = new JSONResourceFactory().createResource(resourceURI); - } else if (line.contains("<")) { //$NON-NLS-1$ + } else if (line.contains("<")) { resource = new XMIResourceImpl(resourceURI); options = new EMFResourceUtils().getXMILoadOptions(); } diff --git a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/editingcontext/EditingContextEPackageService.java b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/editingcontext/EditingContextEPackageService.java index 93417f68f2..6eeafb5381 100644 --- a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/editingcontext/EditingContextEPackageService.java +++ b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/editingcontext/EditingContextEPackageService.java @@ -70,14 +70,14 @@ public List getEPackages(String editingContextId) { if (previous != null) { // This should never happen for EPackages coming from the global registry, but // it does not cost much to check it. - this.logger.warn("Duplicate EPackages with nsURI {} found.", ePackage.getNsURI()); //$NON-NLS-1$ + this.logger.warn("Duplicate EPackages with nsURI {} found.", ePackage.getNsURI()); } }); if (this.isStudioDefinitionEnabled) { this.findDynamicEPackages(new DomainConverter()::convert).forEach(ePackage -> { EPackage previous = allEPackages.put(ePackage.getNsURI(), ePackage); if (previous != null) { - this.logger.warn("Duplicate EPackages with nsURI {} found.", ePackage.getNsURI()); //$NON-NLS-1$ + this.logger.warn("Duplicate EPackages with nsURI {} found.", ePackage.getNsURI()); } }); } diff --git a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/editingcontext/EditingContextPersistenceService.java b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/editingcontext/EditingContextPersistenceService.java index 51087a765b..8cef8974bc 100644 --- a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/editingcontext/EditingContextPersistenceService.java +++ b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/editingcontext/EditingContextPersistenceService.java @@ -51,7 +51,7 @@ @Service public class EditingContextPersistenceService implements IEditingContextPersistenceService { - private static final String TIMER_NAME = "siriusweb_editingcontext_save"; //$NON-NLS-1$ + private static final String TIMER_NAME = "siriusweb_editingcontext_save"; private final Logger logger = LoggerFactory.getLogger(EditingContextPersistenceService.class); diff --git a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/editingcontext/EditingContextSearchService.java b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/editingcontext/EditingContextSearchService.java index 30550dc129..554c2ca22d 100644 --- a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/editingcontext/EditingContextSearchService.java +++ b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/editingcontext/EditingContextSearchService.java @@ -48,7 +48,7 @@ @Service public class EditingContextSearchService implements IEditingContextSearchService { - private static final String TIMER_NAME = "siriusweb_editingcontext_load"; //$NON-NLS-1$ + private static final String TIMER_NAME = "siriusweb_editingcontext_load"; private final Logger logger = LoggerFactory.getLogger(EditingContextSearchService.class); @@ -79,7 +79,7 @@ public boolean existsById(String editingContextId) { public Optional findById(String editingContextId) { long start = System.currentTimeMillis(); - this.logger.debug("Loading the editing context {}", editingContextId); //$NON-NLS-1$ + this.logger.debug("Loading the editing context {}", editingContextId); AdapterFactoryEditingDomain editingDomain = this.editingDomainFactoryService.createEditingDomain(editingContextId); ResourceSet resourceSet = editingDomain.getResourceSet(); @@ -94,7 +94,7 @@ public Optional findById(String editingContextId) { resource.eAdapters().add(new DocumentMetadataAdapter(documentEntity.getName())); } catch (IOException | IllegalArgumentException exception) { - this.logger.warn("An error occured while loading document {}: {}.", documentEntity.getId(), exception.getMessage()); //$NON-NLS-1$ + this.logger.warn("An error occured while loading document {}: {}.", documentEntity.getId(), exception.getMessage()); resourceSet.getResources().remove(resource); } } @@ -103,7 +103,7 @@ public Optional findById(String editingContextId) { // of inter-resources references resourceSet.eAdapters().add(new EditingContextCrossReferenceAdapter()); - this.logger.debug("{} documents loaded for the editing context {}", resourceSet.getResources().size(), editingContextId); //$NON-NLS-1$ + this.logger.debug("{} documents loaded for the editing context {}", resourceSet.getResources().size(), editingContextId); long end = System.currentTimeMillis(); this.timer.record(end - start, TimeUnit.MILLISECONDS); diff --git a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/explorer/DeleteDocumentTreeItemEventHandler.java b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/explorer/DeleteDocumentTreeItemEventHandler.java index 3e761c6f27..571c41906f 100644 --- a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/explorer/DeleteDocumentTreeItemEventHandler.java +++ b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/explorer/DeleteDocumentTreeItemEventHandler.java @@ -83,6 +83,6 @@ public IStatus handle(IEditingContext editingContext, TreeItem treeItem) { return new Success(ChangeKind.SEMANTIC_CHANGE, Map.of()); } - return new Failure(""); //$NON-NLS-1$ + return new Failure(""); } } diff --git a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/explorer/DeleteObjectTreeItemEventHandler.java b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/explorer/DeleteObjectTreeItemEventHandler.java index 6f4f197940..da0c352669 100644 --- a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/explorer/DeleteObjectTreeItemEventHandler.java +++ b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/explorer/DeleteObjectTreeItemEventHandler.java @@ -63,8 +63,8 @@ public IStatus handle(IEditingContext editingContext, TreeItem treeItem) { return new Success(ChangeKind.SEMANTIC_CHANGE, Map.of()); } else { - this.logger.warn("The object with the id {} does not exist", treeItem.getId()); //$NON-NLS-1$ + this.logger.warn("The object with the id {} does not exist", treeItem.getId()); } - return new Failure(""); //$NON-NLS-1$ + return new Failure(""); } } diff --git a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/explorer/ExplorerDescriptionProvider.java b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/explorer/ExplorerDescriptionProvider.java index d02ce6da6f..361f109b82 100644 --- a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/explorer/ExplorerDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/explorer/ExplorerDescriptionProvider.java @@ -53,9 +53,9 @@ @Service public class ExplorerDescriptionProvider implements IExplorerDescriptionProvider { - public static final String DESCRIPTION_ID = UUID.nameUUIDFromBytes("explorer_tree_description".getBytes()).toString(); //$NON-NLS-1$ + public static final String DESCRIPTION_ID = UUID.nameUUIDFromBytes("explorer_tree_description".getBytes()).toString(); - public static final String DOCUMENT_KIND = "siriusWeb://document"; //$NON-NLS-1$ + public static final String DOCUMENT_KIND = "siriusWeb://document"; private final IObjectService objectService; @@ -87,7 +87,7 @@ public TreeDescription getDescription() { // @formatter:off return TreeDescription.newTreeDescription(DESCRIPTION_ID) - .label("Explorer") //$NON-NLS-1$ + .label("Explorer") .idProvider(new GetOrCreateRandomIdProvider()) .treeItemIdProvider(this::getTreeItemId) .kindProvider(this::getKind) @@ -121,7 +121,7 @@ private String getTreeItemId(VariableManager variableManager) { } private String getKind(VariableManager variableManager) { - String kind = ""; //$NON-NLS-1$ + String kind = ""; Object self = variableManager.getVariables().get(VariableManager.SELF); if (self instanceof RepresentationMetadata) { RepresentationMetadata representationMetadata = (RepresentationMetadata) self; @@ -137,7 +137,7 @@ private String getKind(VariableManager variableManager) { private String getLabel(VariableManager variableManager) { Object self = variableManager.getVariables().get(VariableManager.SELF); - String label = ""; //$NON-NLS-1$ + String label = ""; if (self instanceof RepresentationMetadata) { label = ((RepresentationMetadata) self).getLabel(); } else if (self instanceof Resource) { @@ -296,7 +296,7 @@ private IStatus getDeleteHandler(VariableManager variableManager) { return deleteTreeItemHandler.handle(editingContext, treeItem); } } - return new Failure(""); //$NON-NLS-1$ + return new Failure(""); } private IStatus getRenameHandler(VariableManager variableManager, String newLabel) { @@ -316,6 +316,6 @@ private IStatus getRenameHandler(VariableManager variableManager, String newLabe return renameTreeItemHandler.handle(editingContext, treeItem, newLabel); } } - return new Failure(""); //$NON-NLS-1$ + return new Failure(""); } } diff --git a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/explorer/RenameDocumentTreeItemHandler.java b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/explorer/RenameDocumentTreeItemHandler.java index 737f271e55..678ec9efec 100644 --- a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/explorer/RenameDocumentTreeItemHandler.java +++ b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/explorer/RenameDocumentTreeItemHandler.java @@ -83,6 +83,6 @@ public IStatus handle(IEditingContext editingContext, TreeItem treeItem, String // @formatter:on return new Success(ChangeKind.SEMANTIC_CHANGE, Map.of()); } - return new Failure(""); //$NON-NLS-1$ + return new Failure(""); } } diff --git a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/explorer/RenameObjectTreeItemEventHandler.java b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/explorer/RenameObjectTreeItemEventHandler.java index 1c4116076c..15294ee8b7 100644 --- a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/explorer/RenameObjectTreeItemEventHandler.java +++ b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/explorer/RenameObjectTreeItemEventHandler.java @@ -62,7 +62,7 @@ public IStatus handle(IEditingContext editingContext, TreeItem treeItem, String } } - return new Failure(""); //$NON-NLS-1$ + return new Failure(""); } } diff --git a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/images/CustomImageEditService.java b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/images/CustomImageEditService.java index 5cba3c94b2..5d38bed127 100644 --- a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/images/CustomImageEditService.java +++ b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/images/CustomImageEditService.java @@ -40,7 +40,7 @@ public CustomImageEditService(ICustomImageMetadataRepository customImageMetadata @Override public IPayload renameImage(UUID inputId, UUID imageId, String newLabel) { - IPayload result = new ErrorPayload(inputId, "Unable to rename the image"); //$NON-NLS-1$ + IPayload result = new ErrorPayload(inputId, "Unable to rename the image"); Optional optionalImageEntity = this.customImageMetadataRepository.findById(imageId); if (optionalImageEntity.isPresent()) { CustomImageMetadataEntity imageEntity = optionalImageEntity.get(); diff --git a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/images/CustomImageImportService.java b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/images/CustomImageImportService.java index 15b5dc5940..86f4ff5490 100644 --- a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/images/CustomImageImportService.java +++ b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/images/CustomImageImportService.java @@ -49,7 +49,7 @@ public CustomImageImportService(IProjectRepository projectRepository, ICustomIma @Override public IPayload importImage(UUID inputId, String editingContextId, String label, UploadFile file) { - IPayload result = new ErrorPayload(inputId, "Error while uploading image " + file.getName()); //$NON-NLS-1$ + IPayload result = new ErrorPayload(inputId, "Error while uploading image " + file.getName()); if (this.isImageFile(Path.of(file.getName()))) { try { CustomImageEntity customImageEntity = new CustomImageEntity(); @@ -72,7 +72,7 @@ public IPayload importImage(UUID inputId, String editingContextId, String label, customImageEntity = this.customImageRepository.save(customImageEntity); result = new UploadImageSuccessPayload(inputId, customImageEntity.getId()); } catch (IOException e) { - result = new ErrorPayload(inputId, String.format("Error while uploading image %s: %s", file.getName(), e.getMessage())); //$NON-NLS-1$ + result = new ErrorPayload(inputId, String.format("Error while uploading image %s: %s", file.getName(), e.getMessage())); } } return result; @@ -81,7 +81,7 @@ public IPayload importImage(UUID inputId, String editingContextId, String label, private boolean isImageFile(Path path) { try { String probedType = Files.probeContentType(path); - return probedType != null && probedType.startsWith("image/"); //$NON-NLS-1$ + return probedType != null && probedType.startsWith("image/"); } catch (IOException ioe) { return false; } diff --git a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/images/ProjectCustomImageMetadataSearchService.java b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/images/ProjectCustomImageMetadataSearchService.java index 302cdf705b..3ca92b5c9d 100644 --- a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/images/ProjectCustomImageMetadataSearchService.java +++ b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/images/ProjectCustomImageMetadataSearchService.java @@ -49,7 +49,7 @@ public List getProjectImages(String editingContextId) { } private CustomImageMetadata toDTO(CustomImageMetadataEntity customImageMetadataEntity) { - String url = String.format("/custom/%s", customImageMetadataEntity.getId().toString()); //$NON-NLS-1$ + String url = String.format("/custom/%s", customImageMetadataEntity.getId().toString()); return new CustomImageMetadata(customImageMetadataEntity.getId(), customImageMetadataEntity.getLabel(), url, customImageMetadataEntity.getContentType()); } diff --git a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/messages/ServicesMessageService.java b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/messages/ServicesMessageService.java index 85f87c4116..df56ffc906 100644 --- a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/messages/ServicesMessageService.java +++ b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/messages/ServicesMessageService.java @@ -35,31 +35,31 @@ public ServicesMessageService(@Qualifier("servicesMessageSourceAccessor") Messag @Override public String invalidInput(String expectedInputTypeName, String receivedInputTypeName) { - return this.messageSourceAccessor.getMessage("INVALID_INPUT", new Object[] { expectedInputTypeName, receivedInputTypeName }); //$NON-NLS-1$ + return this.messageSourceAccessor.getMessage("INVALID_INPUT", new Object[] { expectedInputTypeName, receivedInputTypeName }); } @Override public String invalidProjectName() { - return this.messageSourceAccessor.getMessage("INVALID_PROJECT_NAME"); //$NON-NLS-1$ + return this.messageSourceAccessor.getMessage("INVALID_PROJECT_NAME"); } @Override public String projectNotFound() { - return this.messageSourceAccessor.getMessage("PROJECT_NOT_FOUND"); //$NON-NLS-1$ + return this.messageSourceAccessor.getMessage("PROJECT_NOT_FOUND"); } @Override public String unexpectedError() { - return this.messageSourceAccessor.getMessage("UNEXPECTED_ERROR"); //$NON-NLS-1$ + return this.messageSourceAccessor.getMessage("UNEXPECTED_ERROR"); } @Override public String invalidDocumentName(String name) { - return this.messageSourceAccessor.getMessage("INVALID_DOCUMENT_NAME", new Object[] { name }); //$NON-NLS-1$ + return this.messageSourceAccessor.getMessage("INVALID_DOCUMENT_NAME", new Object[] { name }); } @Override public String stereotypeDescriptionNotFound(UUID stereotypeDescriptionId) { - return this.messageSourceAccessor.getMessage("STEREOTYPE_DESCRIPTION_NOT_FOUND", new Object[] { stereotypeDescriptionId }); //$NON-NLS-1$ + return this.messageSourceAccessor.getMessage("STEREOTYPE_DESCRIPTION_NOT_FOUND", new Object[] { stereotypeDescriptionId }); } } diff --git a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/projects/ProjectExportService.java b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/projects/ProjectExportService.java index 6ddb75f0cc..8860442d1c 100644 --- a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/projects/ProjectExportService.java +++ b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/projects/ProjectExportService.java @@ -76,7 +76,7 @@ @Service public class ProjectExportService implements IProjectExportService { - private static final String CURRENT_MANIFEST_VERSION = "1.0"; //$NON-NLS-1$ + private static final String CURRENT_MANIFEST_VERSION = "1.0"; private final Logger logger = LoggerFactory.getLogger(ProjectExportService.class); @@ -166,13 +166,13 @@ private Map addDocuments(String projectId, String projectName, Z if (optionalBytes.isPresent()) { byte[] bytes = optionalBytes.get(); id2DocumentName.put(document.getId().toString(), document.getName()); - String name = projectName + "/documents/" + document.getId() + "." + JsonResourceFactoryImpl.EXTENSION; //$NON-NLS-1$ //$NON-NLS-2$ + String name = projectName + "/documents/" + document.getId() + "." + JsonResourceFactoryImpl.EXTENSION; ZipEntry zipEntry = this.createZipEntry(name, bytes.length); zippedOut.putNextEntry(zipEntry); zippedOut.write(bytes); zippedOut.closeEntry(); } else { - this.logger.warn("The serialization of the document {} has failed.", document.getName()); //$NON-NLS-1$ + this.logger.warn("The serialization of the document {} has failed.", document.getName()); } } return id2DocumentName; @@ -212,7 +212,7 @@ private Map addRepresentation(String projectId, representationManifests.put(representationId.toString(), representationManifest); byte[] bytes = new ObjectMapper().writeValueAsBytes(representationDescriptor); - String name = projectName + "/representations/" + representationId + "." + JsonResourceFactoryImpl.EXTENSION; //$NON-NLS-1$ //$NON-NLS-2$ + String name = projectName + "/representations/" + representationId + "." + JsonResourceFactoryImpl.EXTENSION; ZipEntry zipEntry = this.createZipEntry(name, bytes.length); zippedout.putNextEntry(zipEntry); zippedout.write(bytes); @@ -245,7 +245,7 @@ private RepresentationManifest createRepresentationManifest(RepresentationDescri .orElse(descriptionId.toString()); // @formatter:on - String uriFragment = ""; //$NON-NLS-1$ + String uriFragment = ""; String targetObjectId = representationDescriptor.getTargetObjectId(); for (Resource resource : resourceSet.getResources()) { EObject eObject = resource.getEObject(targetObjectId); @@ -255,7 +255,7 @@ private RepresentationManifest createRepresentationManifest(RepresentationDescri } } if (uriFragment.isEmpty()) { - this.logger.warn("The serialization of the representationManifest won't be complete."); //$NON-NLS-1$ + this.logger.warn("The serialization of the representationManifest won't be complete."); } // @formatter:off return RepresentationManifest.newRepresentationManifest() @@ -332,7 +332,7 @@ private void addManifest(String projectId, String projectName, Map groupDescripti .orElseGet(() -> UUID.randomUUID().toString())) .labelProvider(variableManager -> variableManager.get(VariableManager.SELF, Object.class) .map(this.objectService::getLabel) - .orElse("")) //$NON-NLS-1$ + .orElse("")) .semanticElementsProvider(variableManager -> variableManager.get(VariableManager.SELF, Object.class).stream().collect(Collectors.toList())) .groupDescriptions(groupDescriptions) .canCreatePredicate(variableManager -> true) diff --git a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/relatedelements/IncomingTreeProvider.java b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/relatedelements/IncomingTreeProvider.java index 2cc5ff115f..9b1e2432e4 100644 --- a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/relatedelements/IncomingTreeProvider.java +++ b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/relatedelements/IncomingTreeProvider.java @@ -45,15 +45,15 @@ */ public class IncomingTreeProvider { - private static final String WIDGET_ID = "related/incoming"; //$NON-NLS-1$ + private static final String WIDGET_ID = "related/incoming"; - private static final String TITLE = "Incoming"; //$NON-NLS-1$ + private static final String TITLE = "Incoming"; - private static final String WIDGET_ICON_URL = "/images/west_black_24dp.svg"; //$NON-NLS-1$ + private static final String WIDGET_ICON_URL = "/images/west_black_24dp.svg"; - private static final String INCOMING_REFERENCE_ICON_URL = "/images/west_black_24dp.svg"; //$NON-NLS-1$ + private static final String INCOMING_REFERENCE_ICON_URL = "/images/west_black_24dp.svg"; - private static final String INCOMING_REFERENCES_KIND = "siriusWeb://category/incoming-references"; //$NON-NLS-1$ + private static final String INCOMING_REFERENCES_KIND = "siriusWeb://category/incoming-references"; private final IObjectService objectService; @@ -122,7 +122,7 @@ private String getNodeId(VariableManager variableManager) { String result = null; var self = variableManager.get(VariableManager.SELF, Object.class).orElse(null); if (self instanceof IncomingReferences) { - result = "reference/" + ((IncomingReferences) self).getReference().getName(); //$NON-NLS-1$ + result = "reference/" + ((IncomingReferences) self).getReference().getName(); } else if (self != null) { result = this.objectService.getId(self); } @@ -137,11 +137,11 @@ private String getNodeLabel(VariableManager variableManager) { EObject eObject = ((IncomingReferences) self).getSources().get(0); result = eReference.getName(); if (eReference.isContainment()) { - result = "owned " + result; //$NON-NLS-1$ + result = "owned " + result; Adapter adapter = this.adapterFactory.adapt(eObject, IItemLabelProvider.class); if (adapter instanceof ItemProviderAdapter) { ItemProviderAdapter editingDomainItemProvider = (ItemProviderAdapter) adapter; - String key = String.format("_UI_%s_%s_feature", eReference.getEContainingClass().getName(), eReference.getName()); //$NON-NLS-1$ + String key = String.format("_UI_%s_%s_feature", eReference.getEContainingClass().getName(), eReference.getName()); result = editingDomainItemProvider.getString(key); } } else { diff --git a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/relatedelements/OutgoingTreeProvider.java b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/relatedelements/OutgoingTreeProvider.java index 99e2c6a089..9d53289ed9 100644 --- a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/relatedelements/OutgoingTreeProvider.java +++ b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/relatedelements/OutgoingTreeProvider.java @@ -48,15 +48,15 @@ * @author pcdavid */ public class OutgoingTreeProvider { - private static final String WIDGET_ID = "related/outgoing"; //$NON-NLS-1$ + private static final String WIDGET_ID = "related/outgoing"; - private static final String TITLE = "Outgoing"; //$NON-NLS-1$ + private static final String TITLE = "Outgoing"; - private static final String WIDGET_ICON_URL = "/images/east_black_24dp.svg"; //$NON-NLS-1$ + private static final String WIDGET_ICON_URL = "/images/east_black_24dp.svg"; - private static final String OUTGOING_REFERENCE_ICON_URL = "/images/east_black_24dp.svg"; //$NON-NLS-1$ + private static final String OUTGOING_REFERENCE_ICON_URL = "/images/east_black_24dp.svg"; - private static final String OUTGOING_REFERENCE_KIND = "siriusWeb://category/outgoing-references"; //$NON-NLS-1$ + private static final String OUTGOING_REFERENCE_KIND = "siriusWeb://category/outgoing-references"; private final IObjectService objectService; @@ -135,7 +135,7 @@ private String getNodeId(VariableManager variableManager) { String result = null; var self = variableManager.get(VariableManager.SELF, Object.class).orElse(null); if (self instanceof EReference) { - result = "reference/" + ((EReference) self).getName(); //$NON-NLS-1$ + result = "reference/" + ((EReference) self).getName(); } else if (self != null) { result = this.objectService.getId(self); } diff --git a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/representations/RepresentationService.java b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/representations/RepresentationService.java index 6ca4d80fc5..8b57a3fa30 100644 --- a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/representations/RepresentationService.java +++ b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/representations/RepresentationService.java @@ -51,7 +51,7 @@ @Service public class RepresentationService implements IRepresentationService, IRepresentationPersistenceService, IDanglingRepresentationDeletionService { - private static final String TIMER_NAME = "siriusweb_representation_save"; //$NON-NLS-1$ + private static final String TIMER_NAME = "siriusweb_representation_save"; private final IObjectService objectService; diff --git a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/representations/RepresentationsDescriptionProvider.java b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/representations/RepresentationsDescriptionProvider.java index 2fc556d3b8..aaf86c57e7 100644 --- a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/representations/RepresentationsDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/representations/RepresentationsDescriptionProvider.java @@ -53,7 +53,7 @@ @Service public class RepresentationsDescriptionProvider implements IRepresentationsDescriptionProvider { - public static final String REPRESENTATIONS_DEFAULT_FORM_DESCRIPTION_ID = "representations_default_form_description"; //$NON-NLS-1$ + public static final String REPRESENTATIONS_DEFAULT_FORM_DESCRIPTION_ID = "representations_default_form_description"; private final IObjectService objectService; @@ -84,7 +84,7 @@ public FormDescription getRepresentationsDescription() { .map(self -> (List) self) .flatMap(self -> self.stream().findFirst()) .map(this.objectService::getFullLabel) - .orElse("Properties"); //$NON-NLS-1$ + .orElse("Properties"); // @formatter:on // @formatter:off @@ -96,7 +96,7 @@ public FormDescription getRepresentationsDescription() { .orElse(null); return FormDescription.newFormDescription(UUID.nameUUIDFromBytes(REPRESENTATIONS_DEFAULT_FORM_DESCRIPTION_ID.getBytes()).toString()) - .label("Representations default form description") //$NON-NLS-1$ + .label("Representations default form description") .idProvider(new GetOrCreateRandomIdProvider()) .labelProvider(labelProvider) .targetObjectIdProvider(targetObjectIdProvider) @@ -109,9 +109,9 @@ public FormDescription getRepresentationsDescription() { private PageDescription getPageDescription(List groupDescriptions) { // @formatter:off - return PageDescription.newPageDescription("representationPageId") //$NON-NLS-1$ - .idProvider(variableManager -> "Representations Page") //$NON-NLS-1$ - .labelProvider(variableManager -> "Representations Page") //$NON-NLS-1$ + return PageDescription.newPageDescription("representationPageId") + .idProvider(variableManager -> "Representations Page") + .labelProvider(variableManager -> "Representations Page") .semanticElementsProvider(variableManager -> Collections.singletonList(variableManager.getVariables().get(VariableManager.SELF))) .groupDescriptions(groupDescriptions) .canCreatePredicate(variableManager -> true) @@ -124,9 +124,9 @@ private GroupDescription getGroupDescription() { Function itemClickHandlerProvider = variableManager -> new Success(); // @formatter:off - ListDescription listDescription = ListDescription.newListDescription("RepresentationsList") //$NON-NLS-1$ + ListDescription listDescription = ListDescription.newListDescription("RepresentationsList") .idProvider(new WidgetIdProvider()) - .labelProvider((variableManager) -> "Representations") //$NON-NLS-1$ + .labelProvider((variableManager) -> "Representations") .itemsProvider(this.getItemsProvider()) .itemIdProvider(this.getItemIdProvider()) .itemLabelProvider(this.getItemLabelProvider()) @@ -136,8 +136,8 @@ private GroupDescription getGroupDescription() { .itemDeleteHandlerProvider(this.getItemDeleteHandlerProvider()) .itemKindProvider(this.getItemKindProvider()) .diagnosticsProvider((variableManager) -> List.of()) - .kindProvider((object) -> "") //$NON-NLS-1$ - .messageProvider((object) -> "") //$NON-NLS-1$ + .kindProvider((object) -> "") + .messageProvider((object) -> "") .styleProvider(variableManager -> null) .build(); // @formatter:on @@ -145,9 +145,9 @@ private GroupDescription getGroupDescription() { controlDescriptions.add(listDescription); // @formatter:off - return GroupDescription.newGroupDescription("representationsGroupId") //$NON-NLS-1$ - .idProvider(variableManager -> "Representations Group") //$NON-NLS-1$ - .labelProvider(variableManager -> "Representations Group") //$NON-NLS-1$ + return GroupDescription.newGroupDescription("representationsGroupId") + .idProvider(variableManager -> "Representations Group") + .labelProvider(variableManager -> "Representations Group") .semanticElementsProvider(variableManager -> Collections.singletonList(variableManager.getVariables().get(VariableManager.SELF))) .controlDescriptions(controlDescriptions) .build(); @@ -160,7 +160,7 @@ private Function getItemDeleteHandlerProvider() { return variableManager.get(ListComponent.CANDIDATE_VARIABLE, RepresentationMetadata.class) .map(RepresentationMetadata::getId) .map(this::getSuccessStatus) - .orElse(new Failure("")); //$NON-NLS-1$ + .orElse(new Failure("")); // @formatter:on }; } diff --git a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/validation/ValidationDescriptionProvider.java b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/validation/ValidationDescriptionProvider.java index c12cf8c0ef..fc71c92c08 100644 --- a/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/validation/ValidationDescriptionProvider.java +++ b/packages/sirius-web/backend/sirius-web-services/src/main/java/org/eclipse/sirius/web/services/validation/ValidationDescriptionProvider.java @@ -45,8 +45,8 @@ public ValidationDescription getDescription() { Predicate canCreatePredicate = variableManager -> false; // @formatter:off - return ValidationDescription.newValidationDescription(UUID.nameUUIDFromBytes("validation_description".getBytes()).toString()) //$NON-NLS-1$ - .label("Validation") //$NON-NLS-1$ + return ValidationDescription.newValidationDescription(UUID.nameUUIDFromBytes("validation_description".getBytes()).toString()) + .label("Validation") .canCreatePredicate(canCreatePredicate) .diagnosticsProvider(this::getDiagnosticsProvider) .kindProvider(this::kindProvider) @@ -66,21 +66,21 @@ private List getDiagnosticsProvider(VariableManager variableManager) { } private String kindProvider(Object object) { - String kind = "Unknown"; //$NON-NLS-1$ + String kind = "Unknown"; if (object instanceof Diagnostic) { Diagnostic diagnostic = (Diagnostic) object; switch (diagnostic.getSeverity()) { case org.eclipse.emf.common.util.Diagnostic.ERROR: - kind = "Error"; //$NON-NLS-1$ + kind = "Error"; break; case org.eclipse.emf.common.util.Diagnostic.WARNING: - kind = "Warning"; //$NON-NLS-1$ + kind = "Warning"; break; case org.eclipse.emf.common.util.Diagnostic.INFO: - kind = "Info"; //$NON-NLS-1$ + kind = "Info"; break; default: - kind = "Unknown"; //$NON-NLS-1$ + kind = "Unknown"; break; } } @@ -92,7 +92,7 @@ private String messageProvider(Object object) { Diagnostic diagnostic = (Diagnostic) object; return diagnostic.getMessage(); } - return ""; //$NON-NLS-1$ + return ""; } } diff --git a/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/architecture/ArchitectureConstants.java b/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/architecture/ArchitectureConstants.java index 94998ac814..c073ff0c84 100644 --- a/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/architecture/ArchitectureConstants.java +++ b/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/architecture/ArchitectureConstants.java @@ -22,7 +22,7 @@ * @author sbegaudeau */ public final class ArchitectureConstants { - public static final String SIRIUS_WEB_SERVICES_ROOT_PACKAGE = "org.eclipse.sirius.web.services.."; //$NON-NLS-1$ + public static final String SIRIUS_WEB_SERVICES_ROOT_PACKAGE = "org.eclipse.sirius.web.services.."; // @formatter:off public static final JavaClasses CLASSES = new ClassFileImporter() diff --git a/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/documents/CreateDocumentEventHandlerTests.java b/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/documents/CreateDocumentEventHandlerTests.java index 4abf33146c..ea4b2d6bb5 100644 --- a/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/documents/CreateDocumentEventHandlerTests.java +++ b/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/documents/CreateDocumentEventHandlerTests.java @@ -49,51 +49,51 @@ public class CreateDocumentEventHandlerTests { // @formatter:off - private static final String CONTENT = "{" + System.lineSeparator() //$NON-NLS-1$ - + " \"json\": {" + System.lineSeparator() //$NON-NLS-1$ - + " \"version\": \"1.0\"," + System.lineSeparator() //$NON-NLS-1$ - + " \"encoding\": \"utf-8\"" + System.lineSeparator() //$NON-NLS-1$ - + " }," + System.lineSeparator() //$NON-NLS-1$ - + " \"ns\": {" + System.lineSeparator() //$NON-NLS-1$ - + " \"ecore\": \"http://www.eclipse.org/emf/2002/Ecore\"" + System.lineSeparator() //$NON-NLS-1$ - + " }," + System.lineSeparator() //$NON-NLS-1$ - + " \"content\": [" + System.lineSeparator() //$NON-NLS-1$ - + " {" + System.lineSeparator() //$NON-NLS-1$ - + " \"eClass\": \"ecore:EPackage\"," + System.lineSeparator() //$NON-NLS-1$ - + " \"data\": {" + System.lineSeparator() //$NON-NLS-1$ - + " \"name\": \"ecore\"," + System.lineSeparator() //$NON-NLS-1$ - + " \"nsURI\": \"http://www.eclipse.org/emf/2002/Ecore\"," + System.lineSeparator() //$NON-NLS-1$ - + " \"nsPrefix\": \"ecore\"," + System.lineSeparator() //$NON-NLS-1$ - + " \"eClassifiers\": [" + System.lineSeparator() //$NON-NLS-1$ - + " {" + System.lineSeparator() //$NON-NLS-1$ - + " \"eClass\": \"ecore:EClass\"," + System.lineSeparator() //$NON-NLS-1$ - + " \"data\": {" + System.lineSeparator() //$NON-NLS-1$ - + " \"name\": \"AClass\"" + System.lineSeparator() //$NON-NLS-1$ - + " }" + System.lineSeparator() //$NON-NLS-1$ - + " }" + System.lineSeparator() //$NON-NLS-1$ - + " ]" + System.lineSeparator() //$NON-NLS-1$ - + " }" + System.lineSeparator() //$NON-NLS-1$ - + " }" + System.lineSeparator() //$NON-NLS-1$ - + " ]" + System.lineSeparator() //$NON-NLS-1$ - + "}" + System.lineSeparator(); //$NON-NLS-1$ + private static final String CONTENT = "{" + System.lineSeparator() + + " \"json\": {" + System.lineSeparator() + + " \"version\": \"1.0\"," + System.lineSeparator() + + " \"encoding\": \"utf-8\"" + System.lineSeparator() + + " }," + System.lineSeparator() + + " \"ns\": {" + System.lineSeparator() + + " \"ecore\": \"http://www.eclipse.org/emf/2002/Ecore\"" + System.lineSeparator() + + " }," + System.lineSeparator() + + " \"content\": [" + System.lineSeparator() + + " {" + System.lineSeparator() + + " \"eClass\": \"ecore:EPackage\"," + System.lineSeparator() + + " \"data\": {" + System.lineSeparator() + + " \"name\": \"ecore\"," + System.lineSeparator() + + " \"nsURI\": \"http://www.eclipse.org/emf/2002/Ecore\"," + System.lineSeparator() + + " \"nsPrefix\": \"ecore\"," + System.lineSeparator() + + " \"eClassifiers\": [" + System.lineSeparator() + + " {" + System.lineSeparator() + + " \"eClass\": \"ecore:EClass\"," + System.lineSeparator() + + " \"data\": {" + System.lineSeparator() + + " \"name\": \"AClass\"" + System.lineSeparator() + + " }" + System.lineSeparator() + + " }" + System.lineSeparator() + + " ]" + System.lineSeparator() + + " }" + System.lineSeparator() + + " }" + System.lineSeparator() + + " ]" + System.lineSeparator() + + "}" + System.lineSeparator(); // @formatter:on - private static final String DOCUMENT_NAME = "name"; //$NON-NLS-1$ + private static final String DOCUMENT_NAME = "name"; - private static final UUID STEREOTYPE_DESCRIPTION_ID = UUID.nameUUIDFromBytes("stereotypeDescriptionId".getBytes()); //$NON-NLS-1$ + private static final UUID STEREOTYPE_DESCRIPTION_ID = UUID.nameUUIDFromBytes("stereotypeDescriptionId".getBytes()); @Test public void testCreateDocument() { IDocumentService documentService = new IDocumentService.NoOp() { @Override public Optional createDocument(String projectId, String name, String content) { - return Optional.of(new Document(UUID.randomUUID(), new Project(UUID.fromString(projectId), "", new Profile(UUID.randomUUID(), "username"), Visibility.PUBLIC), name, content)); //$NON-NLS-1$ //$NON-NLS-2$ + return Optional.of(new Document(UUID.randomUUID(), new Project(UUID.fromString(projectId), "", new Profile(UUID.randomUUID(), "username"), Visibility.PUBLIC), name, content)); } }; IStereotypeDescriptionService stereotypeDescriptionService = new IStereotypeDescriptionService.NoOp() { @Override public Optional getStereotypeDescriptionById(String editingContextId, UUID stereotypeId) { - StereotypeDescription stereotypeDescription = new StereotypeDescription(stereotypeId, "label", () -> CONTENT); //$NON-NLS-1$ + StereotypeDescription stereotypeDescription = new StereotypeDescription(stereotypeId, "label", () -> CONTENT); return Optional.of(stereotypeDescription); } }; @@ -118,7 +118,7 @@ public Optional getStereotypeDescriptionById(String editi assertThat(payload).isInstanceOf(CreateDocumentSuccessPayload.class); assertThat(editingDomain.getResourceSet().getResources().size()).isEqualTo(1); - Condition condition = new Condition<>(adapter -> adapter instanceof DocumentMetadataAdapter, "has an DocumentMetadataAdapter"); //$NON-NLS-1$ + Condition condition = new Condition<>(adapter -> adapter instanceof DocumentMetadataAdapter, "has an DocumentMetadataAdapter"); assertThat(editingDomain.getResourceSet().getResources().get(0).eAdapters()).areAtLeastOne(condition); } @@ -127,13 +127,13 @@ public void testCreateTwoDocumentWithSameName() { IDocumentService documentService = new IDocumentService.NoOp() { @Override public Optional createDocument(String projectId, String name, String content) { - return Optional.of(new Document(UUID.randomUUID(), new Project(UUID.fromString(projectId), "", new Profile(UUID.randomUUID(), "username"), Visibility.PUBLIC), name, content)); //$NON-NLS-1$ //$NON-NLS-2$ + return Optional.of(new Document(UUID.randomUUID(), new Project(UUID.fromString(projectId), "", new Profile(UUID.randomUUID(), "username"), Visibility.PUBLIC), name, content)); } }; IStereotypeDescriptionService stereotypeDescriptionService = new IStereotypeDescriptionService.NoOp() { @Override public Optional getStereotypeDescriptionById(String editingContextId, UUID stereotypeId) { - StereotypeDescription stereotypeDescription = new StereotypeDescription(stereotypeId, "label", () -> CONTENT); //$NON-NLS-1$ + StereotypeDescription stereotypeDescription = new StereotypeDescription(stereotypeId, "label", () -> CONTENT); return Optional.of(stereotypeDescription); } }; diff --git a/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/documents/DeleteDocumentEventHandlerTests.java b/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/documents/DeleteDocumentEventHandlerTests.java index c41bd0ebdd..62c301c11d 100644 --- a/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/documents/DeleteDocumentEventHandlerTests.java +++ b/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/documents/DeleteDocumentEventHandlerTests.java @@ -48,7 +48,7 @@ public class DeleteDocumentEventHandlerTests { @Test public void testDeleteDocument() { UUID projectId = UUID.randomUUID(); - Document document = new Document(UUID.randomUUID(), new Project(projectId, "", new Profile(UUID.randomUUID(), "username"), Visibility.PUBLIC), "name", "content"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + Document document = new Document(UUID.randomUUID(), new Project(projectId, "", new Profile(UUID.randomUUID(), "username"), Visibility.PUBLIC), "name", "content"); IDocumentService documentService = new IDocumentService.NoOp() { @Override diff --git a/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/documents/RenameDocumentEventHandlerTests.java b/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/documents/RenameDocumentEventHandlerTests.java index 7e0c6719b8..d07d812c6f 100644 --- a/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/documents/RenameDocumentEventHandlerTests.java +++ b/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/documents/RenameDocumentEventHandlerTests.java @@ -47,16 +47,16 @@ * @author fbarbin */ public class RenameDocumentEventHandlerTests { - private static final String OLD_NAME = "oldName"; //$NON-NLS-1$ + private static final String OLD_NAME = "oldName"; - private static final String NEW_NAME = "newName"; //$NON-NLS-1$ + private static final String NEW_NAME = "newName"; @Test public void testRenameDocument() { IDocumentService noOpDocumentService = new IDocumentService.NoOp() { @Override public Optional rename(UUID documentId, String newName) { - return Optional.of(new Document(documentId, new Project(UUID.randomUUID(), "", new Profile(UUID.randomUUID(), "username"), Visibility.PUBLIC), newName, "noContent")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + return Optional.of(new Document(documentId, new Project(UUID.randomUUID(), "", new Profile(UUID.randomUUID(), "username"), Visibility.PUBLIC), newName, "noContent")); } }; RenameDocumentEventHandler handler = new RenameDocumentEventHandler(noOpDocumentService, new NoOpServicesMessageService(), new SimpleMeterRegistry()); diff --git a/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/documents/UploadDocumentEventHandlerTests.java b/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/documents/UploadDocumentEventHandlerTests.java index 8adbb3f2a4..eda620330c 100644 --- a/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/documents/UploadDocumentEventHandlerTests.java +++ b/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/documents/UploadDocumentEventHandlerTests.java @@ -70,48 +70,48 @@ */ public class UploadDocumentEventHandlerTests { - private static final String FILE_NAME = "name"; //$NON-NLS-1$ + private static final String FILE_NAME = "name"; - private static final String PATH_TO_XMI_DOCUMENT = "test_import/document.xmi"; //$NON-NLS-1$ + private static final String PATH_TO_XMI_DOCUMENT = "test_import/document.xmi"; // @formatter:off - private static final String JSON_CONTENT = "{" + System.lineSeparator() //$NON-NLS-1$ - + " \"json\": {" + System.lineSeparator() //$NON-NLS-1$ - + " \"version\": \"1.0\"," + System.lineSeparator() //$NON-NLS-1$ - + " \"encoding\": \"utf-8\"" + System.lineSeparator() //$NON-NLS-1$ - + " }," + System.lineSeparator() //$NON-NLS-1$ - + " \"ns\": {" + System.lineSeparator() //$NON-NLS-1$ - + " \"ecore\": \"http://www.eclipse.org/emf/2002/Ecore\"" + System.lineSeparator() //$NON-NLS-1$ - + " }," + System.lineSeparator() //$NON-NLS-1$ - + " \"content\": [" + System.lineSeparator() //$NON-NLS-1$ - + " {" + System.lineSeparator() //$NON-NLS-1$ - + " \"id\": \"c7fb6833-1452-49bb-aa54-5d148925c2cb\"," + System.lineSeparator() //$NON-NLS-1$ - + " \"eClass\": \"ecore:EPackage\"," + System.lineSeparator() //$NON-NLS-1$ - + " \"data\": {" + System.lineSeparator() //$NON-NLS-1$ - + " \"name\": \"ecore\"," + System.lineSeparator() //$NON-NLS-1$ - + " \"nsURI\": \"http://www.eclipse.org/emf/2002/Ecore\"," + System.lineSeparator() //$NON-NLS-1$ - + " \"nsPrefix\": \"ecore\"," + System.lineSeparator() //$NON-NLS-1$ - + " \"eClassifiers\": [" + System.lineSeparator() //$NON-NLS-1$ - + " {" + System.lineSeparator() //$NON-NLS-1$ - + " \"id\": \"031e998a-26b8-4eb0-9f62-d31ad2f96ca3\"," + System.lineSeparator() //$NON-NLS-1$ - + " \"eClass\": \"ecore:EClass\"," + System.lineSeparator() //$NON-NLS-1$ - + " \"data\": {" + System.lineSeparator() //$NON-NLS-1$ - + " \"name\": \"AClass\"" + System.lineSeparator() //$NON-NLS-1$ - + " }" + System.lineSeparator() //$NON-NLS-1$ - + " }" + System.lineSeparator() //$NON-NLS-1$ - + " ]" + System.lineSeparator() //$NON-NLS-1$ - + " }" + System.lineSeparator() //$NON-NLS-1$ - + " }" + System.lineSeparator() //$NON-NLS-1$ - + " ]" + System.lineSeparator() //$NON-NLS-1$ - + "}" + System.lineSeparator(); //$NON-NLS-1$ + private static final String JSON_CONTENT = "{" + System.lineSeparator() + + " \"json\": {" + System.lineSeparator() + + " \"version\": \"1.0\"," + System.lineSeparator() + + " \"encoding\": \"utf-8\"" + System.lineSeparator() + + " }," + System.lineSeparator() + + " \"ns\": {" + System.lineSeparator() + + " \"ecore\": \"http://www.eclipse.org/emf/2002/Ecore\"" + System.lineSeparator() + + " }," + System.lineSeparator() + + " \"content\": [" + System.lineSeparator() + + " {" + System.lineSeparator() + + " \"id\": \"c7fb6833-1452-49bb-aa54-5d148925c2cb\"," + System.lineSeparator() + + " \"eClass\": \"ecore:EPackage\"," + System.lineSeparator() + + " \"data\": {" + System.lineSeparator() + + " \"name\": \"ecore\"," + System.lineSeparator() + + " \"nsURI\": \"http://www.eclipse.org/emf/2002/Ecore\"," + System.lineSeparator() + + " \"nsPrefix\": \"ecore\"," + System.lineSeparator() + + " \"eClassifiers\": [" + System.lineSeparator() + + " {" + System.lineSeparator() + + " \"id\": \"031e998a-26b8-4eb0-9f62-d31ad2f96ca3\"," + System.lineSeparator() + + " \"eClass\": \"ecore:EClass\"," + System.lineSeparator() + + " \"data\": {" + System.lineSeparator() + + " \"name\": \"AClass\"" + System.lineSeparator() + + " }" + System.lineSeparator() + + " }" + System.lineSeparator() + + " ]" + System.lineSeparator() + + " }" + System.lineSeparator() + + " }" + System.lineSeparator() + + " ]" + System.lineSeparator() + + "}" + System.lineSeparator(); // @formatter:on // @formatter:off - private static final String XMI_CONTENT = "" + System.lineSeparator() //$NON-NLS-1$ - + "" + System.lineSeparator() //$NON-NLS-1$ - + " " + System.lineSeparator() //$NON-NLS-1$ - + ""; //$NON-NLS-1$ + private static final String XMI_CONTENT = "" + System.lineSeparator() + + "" + System.lineSeparator() + + " " + System.lineSeparator() + + ""; // @formatter:on @Test @@ -159,7 +159,7 @@ private EditingDomain uploadDocument(InputStream inputstream, String expectedCha IDocumentService documentService = new IDocumentService.NoOp() { @Override public Optional createDocument(String projectId, String name, String content) { - return Optional.of(new Document(UUID.randomUUID(), new Project(UUID.fromString(projectId), "", new Profile(UUID.randomUUID(), "username"), Visibility.PUBLIC), name, content)); //$NON-NLS-1$ //$NON-NLS-2$ + return Optional.of(new Document(UUID.randomUUID(), new Project(UUID.fromString(projectId), "", new Profile(UUID.randomUUID(), "username"), Visibility.PUBLIC), name, content)); } }; IServicesMessageService messageService = new NoOpServicesMessageService(); @@ -239,7 +239,7 @@ private void simulatesDocumentUpload(AdapterFactoryEditingDomain editingDomain, @Override public Optional createDocument(String projectId, String name, String content) { - return Optional.of(new Document(documentId, new Project(UUID.fromString(projectId), "", new Profile(UUID.randomUUID(), "username"), Visibility.PUBLIC), name, content)); //$NON-NLS-1$ //$NON-NLS-2$ + return Optional.of(new Document(documentId, new Project(UUID.fromString(projectId), "", new Profile(UUID.randomUUID(), "username"), Visibility.PUBLIC), name, content)); } }; IServicesMessageService messageService = new NoOpServicesMessageService(); @@ -269,7 +269,7 @@ public Optional createDocument(String projectId, String name, String c */ private Map getEObjectUriToId(EditingDomain editingDomain, byte[] resourceBytes) { Map eObjectUriToId = new HashMap<>(); - JsonResource jsonResource = new JSONResourceFactory().createResourceFromPath("json.flow"); //$NON-NLS-1$ + JsonResource jsonResource = new JSONResourceFactory().createResourceFromPath("json.flow"); editingDomain.getResourceSet().getResources().add(jsonResource); Map options = new HashMap<>(); diff --git a/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/editingcontext/EditingContextPersistenceServiceTests.java b/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/editingcontext/EditingContextPersistenceServiceTests.java index c741d8b0fc..477cced668 100644 --- a/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/editingcontext/EditingContextPersistenceServiceTests.java +++ b/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/editingcontext/EditingContextPersistenceServiceTests.java @@ -47,13 +47,13 @@ public class EditingContextPersistenceServiceTests { public void testDocumentPersistence() { UUID projectId = UUID.randomUUID(); - String name = "New Document"; //$NON-NLS-1$ + String name = "New Document"; UUID id = UUID.randomUUID(); JsonResource resource = new JSONResourceFactory().createResourceFromPath(id.toString()); resource.eAdapters().add(new DocumentMetadataAdapter(name)); EClass eClass = EcoreFactory.eINSTANCE.createEClass(); - eClass.setName("Concept"); //$NON-NLS-1$ + eClass.setName("Concept"); resource.getContents().add(eClass); AdapterFactoryEditingDomain editingDomain = new EditingDomainFactory().create(); @@ -61,17 +61,17 @@ public void testDocumentPersistence() { ProjectEntity projectEntity = new ProjectEntity(); projectEntity.setId(projectId); - projectEntity.setName(""); //$NON-NLS-1$ + projectEntity.setName(""); AccountEntity owner = new AccountEntity(); owner.setId(UUID.randomUUID()); - owner.setUsername("jdoe"); //$NON-NLS-1$ + owner.setUsername("jdoe"); projectEntity.setOwner(owner); DocumentEntity existingEntity = new DocumentEntity(); existingEntity.setId(id); existingEntity.setProject(projectEntity); existingEntity.setName(name); - existingEntity.setContent(""); //$NON-NLS-1$ + existingEntity.setContent(""); List entities = new ArrayList<>(); IDocumentRepository documentRepository = new NoOpDocumentRepository() { diff --git a/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/editingcontext/EditingContextSearchServiceTests.java b/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/editingcontext/EditingContextSearchServiceTests.java index 6f5f0de540..9f7b9c92d5 100644 --- a/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/editingcontext/EditingContextSearchServiceTests.java +++ b/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/editingcontext/EditingContextSearchServiceTests.java @@ -46,33 +46,33 @@ */ public class EditingContextSearchServiceTests { // @formatter:off - private static final String CONTENT = "{" + System.lineSeparator() //$NON-NLS-1$ - + " \"json\": {" + System.lineSeparator() //$NON-NLS-1$ - + " \"version\": \"1.0\"," + System.lineSeparator() //$NON-NLS-1$ - + " \"encoding\": \"utf-8\"" + System.lineSeparator() //$NON-NLS-1$ - + " }," + System.lineSeparator() //$NON-NLS-1$ - + " \"ns\": {" + System.lineSeparator() //$NON-NLS-1$ - + " \"ecore\": \"http://www.eclipse.org/emf/2002/Ecore\"" + System.lineSeparator() //$NON-NLS-1$ - + " }," + System.lineSeparator() //$NON-NLS-1$ - + " \"content\": [" + System.lineSeparator() //$NON-NLS-1$ - + " {" + System.lineSeparator() //$NON-NLS-1$ - + " \"eClass\": \"ecore:EPackage\"," + System.lineSeparator() //$NON-NLS-1$ - + " \"data\": {" + System.lineSeparator() //$NON-NLS-1$ - + " \"name\": \"ecore\"," + System.lineSeparator() //$NON-NLS-1$ - + " \"nsURI\": \"http://www.eclipse.org/emf/2002/Ecore\"," + System.lineSeparator() //$NON-NLS-1$ - + " \"nsPrefix\": \"ecore\"," + System.lineSeparator() //$NON-NLS-1$ - + " \"eClassifiers\": [" + System.lineSeparator() //$NON-NLS-1$ - + " {" + System.lineSeparator() //$NON-NLS-1$ - + " \"eClass\": \"ecore:EClass\"," + System.lineSeparator() //$NON-NLS-1$ - + " \"data\": {" + System.lineSeparator() //$NON-NLS-1$ - + " \"name\": \"AClass\"" + System.lineSeparator() //$NON-NLS-1$ - + " }" + System.lineSeparator() //$NON-NLS-1$ - + " }" + System.lineSeparator() //$NON-NLS-1$ - + " ]" + System.lineSeparator() //$NON-NLS-1$ - + " }" + System.lineSeparator() //$NON-NLS-1$ - + " }" + System.lineSeparator() //$NON-NLS-1$ - + " ]" + System.lineSeparator() //$NON-NLS-1$ - + "}" + System.lineSeparator(); //$NON-NLS-1$ + private static final String CONTENT = "{" + System.lineSeparator() + + " \"json\": {" + System.lineSeparator() + + " \"version\": \"1.0\"," + System.lineSeparator() + + " \"encoding\": \"utf-8\"" + System.lineSeparator() + + " }," + System.lineSeparator() + + " \"ns\": {" + System.lineSeparator() + + " \"ecore\": \"http://www.eclipse.org/emf/2002/Ecore\"" + System.lineSeparator() + + " }," + System.lineSeparator() + + " \"content\": [" + System.lineSeparator() + + " {" + System.lineSeparator() + + " \"eClass\": \"ecore:EPackage\"," + System.lineSeparator() + + " \"data\": {" + System.lineSeparator() + + " \"name\": \"ecore\"," + System.lineSeparator() + + " \"nsURI\": \"http://www.eclipse.org/emf/2002/Ecore\"," + System.lineSeparator() + + " \"nsPrefix\": \"ecore\"," + System.lineSeparator() + + " \"eClassifiers\": [" + System.lineSeparator() + + " {" + System.lineSeparator() + + " \"eClass\": \"ecore:EClass\"," + System.lineSeparator() + + " \"data\": {" + System.lineSeparator() + + " \"name\": \"AClass\"" + System.lineSeparator() + + " }" + System.lineSeparator() + + " }" + System.lineSeparator() + + " ]" + System.lineSeparator() + + " }" + System.lineSeparator() + + " }" + System.lineSeparator() + + " ]" + System.lineSeparator() + + "}" + System.lineSeparator(); // @formatter:on @Test @@ -102,17 +102,17 @@ public void testEditingContextWithDocuments() { ProjectEntity projectEntity = new ProjectEntity(); projectEntity.setId(projectId); - projectEntity.setName(""); //$NON-NLS-1$ + projectEntity.setName(""); DocumentEntity firstDocumentEntity = new DocumentEntity(); firstDocumentEntity.setId(UUID.randomUUID()); - firstDocumentEntity.setName("First Document"); //$NON-NLS-1$ + firstDocumentEntity.setName("First Document"); firstDocumentEntity.setProject(projectEntity); firstDocumentEntity.setContent(CONTENT); DocumentEntity secondDocumentEntity = new DocumentEntity(); secondDocumentEntity.setId(UUID.randomUUID()); - secondDocumentEntity.setName("Second Document"); //$NON-NLS-1$ + secondDocumentEntity.setName("Second Document"); secondDocumentEntity.setProject(projectEntity); secondDocumentEntity.setContent(CONTENT); diff --git a/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/projects/NoOpServicesMessageService.java b/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/projects/NoOpServicesMessageService.java index d6e67c4fcb..714cba45c6 100644 --- a/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/projects/NoOpServicesMessageService.java +++ b/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/projects/NoOpServicesMessageService.java @@ -25,32 +25,32 @@ public class NoOpServicesMessageService implements IServicesMessageService { @Override public String invalidInput(String expectedInputTypeName, String receivedInputTypeName) { - return ""; //$NON-NLS-1$ + return ""; } @Override public String invalidProjectName() { - return ""; //$NON-NLS-1$ + return ""; } @Override public String projectNotFound() { - return ""; //$NON-NLS-1$ + return ""; } @Override public String unexpectedError() { - return ""; //$NON-NLS-1$ + return ""; } @Override public String invalidDocumentName(String name) { - return ""; //$NON-NLS-1$ + return ""; } @Override public String stereotypeDescriptionNotFound(UUID stereotypeDescriptionId) { - return ""; //$NON-NLS-1$ + return ""; } } diff --git a/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/projects/ProjectServiceTests.java b/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/projects/ProjectServiceTests.java index 34deb631d9..8b36dd9b87 100644 --- a/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/projects/ProjectServiceTests.java +++ b/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/projects/ProjectServiceTests.java @@ -41,9 +41,9 @@ */ public class ProjectServiceTests { - private static final String NEW_PROJECT = "New Project"; //$NON-NLS-1$ + private static final String NEW_PROJECT = "New Project"; - private static final String OWNER_NAME = "jdoe"; //$NON-NLS-1$ + private static final String OWNER_NAME = "jdoe"; private IServicesMessageService noOpMessageService = new NoOpServicesMessageService(); @@ -73,10 +73,10 @@ public Optional findByUsername(String userName) { @Test public void testProjectCreationWithInvalidName() { - Object principal = new User(OWNER_NAME, "", List.of()); //$NON-NLS-1$ + Object principal = new User(OWNER_NAME, "", List.of()); SecurityContextHolder.getContext().setAuthentication(new UsernamePasswordAuthenticationToken(principal, new Object())); - CreateProjectInput input = new CreateProjectInput(UUID.randomUUID(), "", Visibility.PRIVATE); //$NON-NLS-1$ + CreateProjectInput input = new CreateProjectInput(UUID.randomUUID(), "", Visibility.PRIVATE); IPayload payload = this.projectService.createProject(input); assertThat(payload).isInstanceOf(ErrorPayload.class); @@ -85,7 +85,7 @@ public void testProjectCreationWithInvalidName() { @Test public void testProjectCreationSuccess() { - Object principal = new User(OWNER_NAME, "", List.of()); //$NON-NLS-1$ + Object principal = new User(OWNER_NAME, "", List.of()); SecurityContextHolder.getContext().setAuthentication(new UsernamePasswordAuthenticationToken(principal, new Object())); CreateProjectInput input = new CreateProjectInput(UUID.randomUUID(), NEW_PROJECT, Visibility.PRIVATE); @@ -97,7 +97,7 @@ public void testProjectCreationSuccess() { @Test public void testCreateProjectsWithSameName() { - Object principal = new User(OWNER_NAME, "", List.of()); //$NON-NLS-1$ + Object principal = new User(OWNER_NAME, "", List.of()); SecurityContextHolder.getContext().setAuthentication(new UsernamePasswordAuthenticationToken(principal, new Object())); CreateProjectInput firstInput = new CreateProjectInput(UUID.randomUUID(), NEW_PROJECT, Visibility.PRIVATE); diff --git a/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/projects/RenameProjectEventHandlerTests.java b/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/projects/RenameProjectEventHandlerTests.java index 97ea267eb4..fb6c5074fc 100644 --- a/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/projects/RenameProjectEventHandlerTests.java +++ b/packages/sirius-web/backend/sirius-web-services/src/test/java/org/eclipse/sirius/web/services/projects/RenameProjectEventHandlerTests.java @@ -42,7 +42,7 @@ public class RenameProjectEventHandlerTests { @Test public void testRenameProject() { - Project project = new Project(UUID.randomUUID(), "newName", new Profile(UUID.randomUUID(), "system"), Visibility.PUBLIC); //$NON-NLS-1$ //$NON-NLS-2$ + Project project = new Project(UUID.randomUUID(), "newName", new Profile(UUID.randomUUID(), "system"), Visibility.PUBLIC); AtomicBoolean hasBeenCalled = new AtomicBoolean(); IProjectService projectService = new IProjectService.NoOp() { @@ -54,7 +54,7 @@ public Optional renameProject(UUID projectId, String newName) { }; RenameProjectEventHandler handler = new RenameProjectEventHandler(new NoOpServicesMessageService(), projectService); - var input = new RenameProjectInput(UUID.randomUUID(), UUID.randomUUID(), "newName"); //$NON-NLS-1$ + var input = new RenameProjectInput(UUID.randomUUID(), UUID.randomUUID(), "newName"); IEditingContext editingContext = () -> UUID.randomUUID().toString(); Many changeDescriptionSink = Sinks.many().unicast().onBackpressureBuffer(); diff --git a/packages/sirius-web/backend/sirius-web-spring/src/main/java/org/eclipse/sirius/web/spring/configuration/SpringWebMvcConfigurerConstants.java b/packages/sirius-web/backend/sirius-web-spring/src/main/java/org/eclipse/sirius/web/spring/configuration/SpringWebMvcConfigurerConstants.java index 6e3753b4de..adcabec928 100644 --- a/packages/sirius-web/backend/sirius-web-spring/src/main/java/org/eclipse/sirius/web/spring/configuration/SpringWebMvcConfigurerConstants.java +++ b/packages/sirius-web/backend/sirius-web-spring/src/main/java/org/eclipse/sirius/web/spring/configuration/SpringWebMvcConfigurerConstants.java @@ -19,46 +19,46 @@ */ public final class SpringWebMvcConfigurerConstants { /** Pattern used to match CSS resources from the front-end. */ - public static final String CSS_PATTERN = "/**/*.css"; //$NON-NLS-1$ + public static final String CSS_PATTERN = "/**/*.css"; /** Pattern used to match HTML resources from the front-end. */ - public static final String HTML_PATTERN = "/**/*.html"; //$NON-NLS-1$ + public static final String HTML_PATTERN = "/**/*.html"; /** Pattern used to match JS resources from the front-end. */ - public static final String JS_PATTERN = "/**/*.js"; //$NON-NLS-1$ + public static final String JS_PATTERN = "/**/*.js"; /** Pattern used to match JS source maps resources from the front-end. */ - public static final String JS_MAP_PATTERN = "/**/*.js.map"; //$NON-NLS-1$ + public static final String JS_MAP_PATTERN = "/**/*.js.map"; /** Pattern used to match JS chunk resources from the front-end. */ - public static final String JS_CHUNK_PATTERN = "/**/*.chunk.js"; //$NON-NLS-1$ + public static final String JS_CHUNK_PATTERN = "/**/*.chunk.js"; /** Pattern used to match JSON resources from the front-end. */ - public static final String JSON_PATTERN = "/**/*.json"; //$NON-NLS-1$ + public static final String JSON_PATTERN = "/**/*.json"; /** Pattern used to match ICO resources from the front-end. */ - public static final String ICO_PATTERN = "/**/*.ico"; //$NON-NLS-1$ + public static final String ICO_PATTERN = "/**/*.ico"; /** Pattern used to match TTF resources from the front-end. */ - public static final String TTF_PATTERN = "/**/*.ttf"; //$NON-NLS-1$ + public static final String TTF_PATTERN = "/**/*.ttf"; /** Pattern used to match media resources from the front-end. */ - public static final String MEDIA_PATTERN = "/**/media/**"; //$NON-NLS-1$ + public static final String MEDIA_PATTERN = "/**/media/**"; /** Pattern used to match the raw hostname with any specific path. */ - public static final String EMPTY_PATTERN = ""; //$NON-NLS-1$ + public static final String EMPTY_PATTERN = ""; /** Pattern used to match the path of the homepage. */ - public static final String HOMEPAGE_PATTERN = "/"; //$NON-NLS-1$ + public static final String HOMEPAGE_PATTERN = "/"; /** Pattern used to match any path. */ - public static final String ANY_PATTERN = "/**"; //$NON-NLS-1$ + public static final String ANY_PATTERN = "/**"; /** Path of the folder containing the static resources. */ - public static final String STATIC_ASSETS_PATH = "classpath:/static/"; //$NON-NLS-1$ + public static final String STATIC_ASSETS_PATH = "classpath:/static/"; /** Path of the index.html file. */ - public static final String INDEX_HTML_PATH = "classpath:/static/index.html"; //$NON-NLS-1$ + public static final String INDEX_HTML_PATH = "classpath:/static/index.html"; private SpringWebMvcConfigurerConstants() { // Prevent instantiation diff --git a/packages/sirius-web/backend/sirius-web-spring/src/main/java/org/eclipse/sirius/web/spring/controllers/DocumentController.java b/packages/sirius-web/backend/sirius-web-spring/src/main/java/org/eclipse/sirius/web/spring/controllers/DocumentController.java index 7cec4efdac..62a782d8b9 100644 --- a/packages/sirius-web/backend/sirius-web-spring/src/main/java/org/eclipse/sirius/web/spring/controllers/DocumentController.java +++ b/packages/sirius-web/backend/sirius-web-spring/src/main/java/org/eclipse/sirius/web/spring/controllers/DocumentController.java @@ -79,7 +79,7 @@ public ResponseEntity getDocument(@PathVariable String editingContextI byte[] bytes = optionalBytes.get(); // @formatter:off - ContentDisposition contentDisposition = ContentDisposition.builder("attachment") //$NON-NLS-1$ + ContentDisposition contentDisposition = ContentDisposition.builder("attachment") .filename(document.getName()) .build(); // @formatter:on diff --git a/packages/sirius-web/backend/sirius-web-spring/src/main/java/org/eclipse/sirius/web/spring/controllers/ImagesController.java b/packages/sirius-web/backend/sirius-web-spring/src/main/java/org/eclipse/sirius/web/spring/controllers/ImagesController.java index 0eb26d5943..fdebc664e3 100644 --- a/packages/sirius-web/backend/sirius-web-spring/src/main/java/org/eclipse/sirius/web/spring/controllers/ImagesController.java +++ b/packages/sirius-web/backend/sirius-web-spring/src/main/java/org/eclipse/sirius/web/spring/controllers/ImagesController.java @@ -72,21 +72,21 @@ @RequestMapping(URLConstants.IMAGE_BASE_PATH + "/**/*") public class ImagesController { - private static final String EXTENSION_SEPARATOR = "."; //$NON-NLS-1$ + private static final String EXTENSION_SEPARATOR = "."; - private static final String IMAGE_GIF_EXTENSION = "gif"; //$NON-NLS-1$ + private static final String IMAGE_GIF_EXTENSION = "gif"; - private static final String IMAGE_JPG_EXTENSION = "jpeg"; //$NON-NLS-1$ + private static final String IMAGE_JPG_EXTENSION = "jpeg"; - private static final String IMAGE_PNG_EXTENSION = "png"; //$NON-NLS-1$ + private static final String IMAGE_PNG_EXTENSION = "png"; - private static final String IMAGE_SVG_EXTENSION = "svg"; //$NON-NLS-1$ + private static final String IMAGE_SVG_EXTENSION = "svg"; - private static final String CUSTOM_IMAGE_PREFIX = "/custom/"; //$NON-NLS-1$ + private static final String CUSTOM_IMAGE_PREFIX = "/custom/"; - private static final MediaType IMAGE_SVG = MediaType.valueOf("image/svg+xml"); //$NON-NLS-1$ + private static final MediaType IMAGE_SVG = MediaType.valueOf("image/svg+xml"); - private static final String TIMER = "siriusweb_images"; //$NON-NLS-1$ + private static final String TIMER = "siriusweb_images"; private final List pathResourcesServices; @@ -132,7 +132,7 @@ public ResponseEntity getImage(HttpServletRequest request) { private ResponseEntity getCustomImage(String imagePath) { ResponseEntity response = new ResponseEntity<>(null, new HttpHeaders(), HttpStatus.NOT_FOUND); - String[] imageDescriptor = imagePath.substring(CUSTOM_IMAGE_PREFIX.length()).split("/"); //$NON-NLS-1$ + String[] imageDescriptor = imagePath.substring(CUSTOM_IMAGE_PREFIX.length()).split("/"); Optional optionalImageId = Optional.empty(); if (imageDescriptor.length == 1) { optionalImageId = new IDParser().parse(imageDescriptor[0]); diff --git a/packages/sirius-web/backend/sirius-web-spring/src/main/java/org/eclipse/sirius/web/spring/controllers/ProjectController.java b/packages/sirius-web/backend/sirius-web-spring/src/main/java/org/eclipse/sirius/web/spring/controllers/ProjectController.java index 1d0d2a0060..fd5a61864f 100644 --- a/packages/sirius-web/backend/sirius-web-spring/src/main/java/org/eclipse/sirius/web/spring/controllers/ProjectController.java +++ b/packages/sirius-web/backend/sirius-web-spring/src/main/java/org/eclipse/sirius/web/spring/controllers/ProjectController.java @@ -76,14 +76,14 @@ public ResponseEntity getProject(@PathVariable UUID projectId) { byte[] zip = this.projectExportService.exportProjectAsZip(projectId); // @formatter:off - ContentDisposition contentDisposition = ContentDisposition.builder("attachment") //$NON-NLS-1$ - .filename(project.getName() + ".zip") //$NON-NLS-1$ + ContentDisposition contentDisposition = ContentDisposition.builder("attachment") + .filename(project.getName() + ".zip") .build(); // @formatter:on HttpHeaders headers = new HttpHeaders(); headers.setContentDisposition(contentDisposition); - headers.setContentType(MediaType.parseMediaType("application/zip")); //$NON-NLS-1$ + headers.setContentType(MediaType.parseMediaType("application/zip")); headers.setContentLength(zip.length); InputStreamResource resource = new InputStreamResource(new ByteArrayInputStream(zip)); return new ResponseEntity<>(resource, headers, HttpStatus.OK); diff --git a/packages/sirius-web/backend/sirius-web-spring/src/main/java/org/eclipse/sirius/web/spring/controllers/RepresentationController.java b/packages/sirius-web/backend/sirius-web-spring/src/main/java/org/eclipse/sirius/web/spring/controllers/RepresentationController.java index c7ab2ac539..6c8f439e6a 100644 --- a/packages/sirius-web/backend/sirius-web-spring/src/main/java/org/eclipse/sirius/web/spring/controllers/RepresentationController.java +++ b/packages/sirius-web/backend/sirius-web-spring/src/main/java/org/eclipse/sirius/web/spring/controllers/RepresentationController.java @@ -90,7 +90,7 @@ public ResponseEntity getRepresentation(HttpServletRequest request, @P private ResponseEntity toResponseEntity(String name, byte[] bytes) { // @formatter:off - ContentDisposition contentDisposition = ContentDisposition.builder("attachment") //$NON-NLS-1$ + ContentDisposition contentDisposition = ContentDisposition.builder("attachment") .filename(name) .build(); // @formatter:on diff --git a/packages/sirius-web/backend/sirius-web-spring/src/main/java/org/eclipse/sirius/web/spring/controllers/URLConstants.java b/packages/sirius-web/backend/sirius-web-spring/src/main/java/org/eclipse/sirius/web/spring/controllers/URLConstants.java index 50abe258f0..60588a2cb7 100644 --- a/packages/sirius-web/backend/sirius-web-spring/src/main/java/org/eclipse/sirius/web/spring/controllers/URLConstants.java +++ b/packages/sirius-web/backend/sirius-web-spring/src/main/java/org/eclipse/sirius/web/spring/controllers/URLConstants.java @@ -18,23 +18,23 @@ * @author sbegaudeau */ public final class URLConstants { - public static final String API_BASE_PATH = "/api"; //$NON-NLS-1$ + public static final String API_BASE_PATH = "/api"; - public static final String GRAPHQL_BASE_PATH = API_BASE_PATH + "/graphql"; //$NON-NLS-1$ + public static final String GRAPHQL_BASE_PATH = API_BASE_PATH + "/graphql"; - public static final String GRAPHQL_UPLOAD_PATH = API_BASE_PATH + "/graphql/upload"; //$NON-NLS-1$ + public static final String GRAPHQL_UPLOAD_PATH = API_BASE_PATH + "/graphql/upload"; - public static final String GRAPHQL_SUBSCRIPTION_PATH = "/subscriptions"; //$NON-NLS-1$ + public static final String GRAPHQL_SUBSCRIPTION_PATH = "/subscriptions"; - public static final String IMAGE_BASE_PATH = API_BASE_PATH + "/images"; //$NON-NLS-1$ + public static final String IMAGE_BASE_PATH = API_BASE_PATH + "/images"; - public static final String DOCUMENT_BASE_PATH = API_BASE_PATH + "/editingcontexts/{editingContextId}/documents"; //$NON-NLS-1$ + public static final String DOCUMENT_BASE_PATH = API_BASE_PATH + "/editingcontexts/{editingContextId}/documents"; - public static final String PROJECT_BASE_PATH = API_BASE_PATH + "/projects"; //$NON-NLS-1$ + public static final String PROJECT_BASE_PATH = API_BASE_PATH + "/projects"; - public static final String REPRESENTATION_BASE_PATH = API_BASE_PATH + "/editingcontexts/{editingContextId}/representations"; //$NON-NLS-1$ + public static final String REPRESENTATION_BASE_PATH = API_BASE_PATH + "/editingcontexts/{editingContextId}/representations"; - public static final String ANY_PATTERN = "/**"; //$NON-NLS-1$ + public static final String ANY_PATTERN = "/**"; private URLConstants() { // Prevent instantiation diff --git a/packages/sirius-web/backend/sirius-web-spring/src/test/java/org/eclipse/sirius/web/spring/architecture/ArchitectureConstants.java b/packages/sirius-web/backend/sirius-web-spring/src/test/java/org/eclipse/sirius/web/spring/architecture/ArchitectureConstants.java index 84b4443c32..a7bb90d676 100644 --- a/packages/sirius-web/backend/sirius-web-spring/src/test/java/org/eclipse/sirius/web/spring/architecture/ArchitectureConstants.java +++ b/packages/sirius-web/backend/sirius-web-spring/src/test/java/org/eclipse/sirius/web/spring/architecture/ArchitectureConstants.java @@ -22,7 +22,7 @@ * @author sbegaudeau */ public final class ArchitectureConstants { - public static final String SIRIUS_WEB_SPRING_ROOT_PACKAGE = "org.eclipse.sirius.web.spring.."; //$NON-NLS-1$ + public static final String SIRIUS_WEB_SPRING_ROOT_PACKAGE = "org.eclipse.sirius.web.spring.."; // @formatter:off public static final JavaClasses CLASSES = new ClassFileImporter() diff --git a/packages/sirius-web/backend/sirius-web-spring/src/test/java/org/eclipse/sirius/web/spring/controllers/DocumentControllerTests.java b/packages/sirius-web/backend/sirius-web-spring/src/test/java/org/eclipse/sirius/web/spring/controllers/DocumentControllerTests.java index ed25bcd7b9..cc58df5ef1 100644 --- a/packages/sirius-web/backend/sirius-web-spring/src/test/java/org/eclipse/sirius/web/spring/controllers/DocumentControllerTests.java +++ b/packages/sirius-web/backend/sirius-web-spring/src/test/java/org/eclipse/sirius/web/spring/controllers/DocumentControllerTests.java @@ -49,12 +49,12 @@ public void testDocumentDoesNotExist() { @Test public void testDocumentExist() { - String name = "Document"; //$NON-NLS-1$ + String name = "Document"; IDocumentService documentService = new IDocumentService.NoOp() { @Override public Optional getDocument(String projectId, UUID documentId) { - return Optional.of(new Document(documentId, new Project(UUID.fromString(projectId), "", new Profile(UUID.randomUUID(), "username"), Visibility.PUBLIC), name, null)); //$NON-NLS-1$ //$NON-NLS-2$ + return Optional.of(new Document(documentId, new Project(UUID.fromString(projectId), "", new Profile(UUID.randomUUID(), "username"), Visibility.PUBLIC), name, null)); } @Override diff --git a/packages/sirius-web/backend/sirius-web-spring/src/test/java/org/eclipse/sirius/web/spring/controllers/ImagesControllerTests.java b/packages/sirius-web/backend/sirius-web-spring/src/test/java/org/eclipse/sirius/web/spring/controllers/ImagesControllerTests.java index b5239a61eb..a9cb12850e 100644 --- a/packages/sirius-web/backend/sirius-web-spring/src/test/java/org/eclipse/sirius/web/spring/controllers/ImagesControllerTests.java +++ b/packages/sirius-web/backend/sirius-web-spring/src/test/java/org/eclipse/sirius/web/spring/controllers/ImagesControllerTests.java @@ -46,7 +46,7 @@ public class ImagesControllerTests { @Test public void testInvalidFolder() { ImagesController imagesController = new ImagesController(new ArrayList<>(), new ICustomImageContentService.NoOp(), new SimpleMeterRegistry()); - HttpServletRequest request = new MockHttpServletRequest(HttpMethod.GET.name(), "/api/images/invalidFolder/doesNotExist.png"); //$NON-NLS-1$ + HttpServletRequest request = new MockHttpServletRequest(HttpMethod.GET.name(), "/api/images/invalidFolder/doesNotExist.png"); ResponseEntity responseEntity = imagesController.getImage(request); assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND); } @@ -56,11 +56,11 @@ public void testValidFolderWithImageWhichDoesNotExist() { IImagePathService imagePathService = new IImagePathService() { @Override public List getPaths() { - return List.of("/validFolder"); //$NON-NLS-1$ + return List.of("/validFolder"); } }; ImagesController imagesController = new ImagesController(List.of(imagePathService), new ICustomImageContentService.NoOp(), new SimpleMeterRegistry()); - HttpServletRequest request = new MockHttpServletRequest(HttpMethod.GET.name(), "/api/images/validFolder/doesNotExist.png"); //$NON-NLS-1$ + HttpServletRequest request = new MockHttpServletRequest(HttpMethod.GET.name(), "/api/images/validFolder/doesNotExist.png"); ResponseEntity responseEntity = imagesController.getImage(request); assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND); } @@ -70,18 +70,18 @@ public void testValidImage() { IImagePathService imagePathService = new IImagePathService() { @Override public List getPaths() { - return List.of("/icons"); //$NON-NLS-1$ + return List.of("/icons"); } }; ImagesController imagesController = new ImagesController(List.of(imagePathService), new ICustomImageContentService.NoOp(), new SimpleMeterRegistry()); - HttpServletRequest request = new MockHttpServletRequest(HttpMethod.GET.name(), "/api/images/icons/full/obj16/EClass.gif"); //$NON-NLS-1$ + HttpServletRequest request = new MockHttpServletRequest(HttpMethod.GET.name(), "/api/images/icons/full/obj16/EClass.gif"); // We need to replace the current class loader to trick Spring into thinking that the resource exists ClassLoader testClassLoader = new URLClassLoader(new URL[] {}) { @Override public URL getResource(String name) { try { - return new URL("jar:file:somejar!/icons/full/obj16/EClass.gif"); //$NON-NLS-1$ + return new URL("jar:file:somejar!/icons/full/obj16/EClass.gif"); } catch (MalformedURLException exception) { fail(exception.getMessage(), exception); } diff --git a/packages/sirius-web/backend/sirius-web-spring/src/test/java/org/eclipse/sirius/web/spring/controllers/ProjectControllerTests.java b/packages/sirius-web/backend/sirius-web-spring/src/test/java/org/eclipse/sirius/web/spring/controllers/ProjectControllerTests.java index 2739ff12e3..48949f3b7e 100644 --- a/packages/sirius-web/backend/sirius-web-spring/src/test/java/org/eclipse/sirius/web/spring/controllers/ProjectControllerTests.java +++ b/packages/sirius-web/backend/sirius-web-spring/src/test/java/org/eclipse/sirius/web/spring/controllers/ProjectControllerTests.java @@ -42,19 +42,19 @@ public void testProjectDoesNotExist() { IProjectExportService projectExportService = new IProjectExportService.NoOp(); ProjectController projectController = new ProjectController(projectService, projectExportService); - String projectId = "631fcb2d-3463-4084-b5da-fd8022ebae53"; //$NON-NLS-1$ + String projectId = "631fcb2d-3463-4084-b5da-fd8022ebae53"; ResponseEntity responseEntity = projectController.getProject(UUID.fromString(projectId)); assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND); } @Test public void testProjectExists() { - String projectFoundId = "631fcb2d-3463-4084-b5da-fd8022ebae53"; //$NON-NLS-1$ + String projectFoundId = "631fcb2d-3463-4084-b5da-fd8022ebae53"; IProjectService projectService = new IProjectService.NoOp() { @Override public Optional getProject(UUID projectId) { - return Optional.of(new Project(UUID.fromString(projectFoundId), projectFoundId, new Profile(UUID.randomUUID(), "username"), Visibility.PUBLIC)); //$NON-NLS-1$ + return Optional.of(new Project(UUID.fromString(projectFoundId), projectFoundId, new Profile(UUID.randomUUID(), "username"), Visibility.PUBLIC)); } }; IProjectExportService projectExportService = new IProjectExportService.NoOp(); @@ -64,9 +64,9 @@ public Optional getProject(UUID projectId) { assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); HttpHeaders headers = responseEntity.getHeaders(); - assertThat(headers.getContentType()).isEqualTo(MediaType.parseMediaType("application/zip")); //$NON-NLS-1$ + assertThat(headers.getContentType()).isEqualTo(MediaType.parseMediaType("application/zip")); assertThat(headers.getContentLength()).isEqualTo(0); - assertThat(headers.getContentDisposition().getFilename()).isEqualTo(projectFoundId + ".zip"); //$NON-NLS-1$ + assertThat(headers.getContentDisposition().getFilename()).isEqualTo(projectFoundId + ".zip"); } } diff --git a/packages/starters/backend/sirius-components-starter/src/main/java/org/eclipse/sirius/components/starter/SiriusWebStarterConfiguration.java b/packages/starters/backend/sirius-components-starter/src/main/java/org/eclipse/sirius/components/starter/SiriusWebStarterConfiguration.java index f4967e640e..882fdb93fc 100644 --- a/packages/starters/backend/sirius-components-starter/src/main/java/org/eclipse/sirius/components/starter/SiriusWebStarterConfiguration.java +++ b/packages/starters/backend/sirius-components-starter/src/main/java/org/eclipse/sirius/components/starter/SiriusWebStarterConfiguration.java @@ -68,7 +68,7 @@ // @formatter:on public class SiriusWebStarterConfiguration { - private static final String PATH = "messages/sirius-components-starter"; //$NON-NLS-1$ + private static final String PATH = "messages/sirius-components-starter"; @Bean public MessageSourceAccessor siriusComponentsStarterMessageSourceAccessor() { @@ -95,7 +95,7 @@ public IEditingContextEventProcessorExecutorServiceProvider editingContextEventP return editingContext -> { var executorService = Executors.newSingleThreadExecutor((Runnable runnable) -> { Thread thread = Executors.defaultThreadFactory().newThread(runnable); - thread.setName("Editing context " + editingContext.getId()); //$NON-NLS-1$ + thread.setName("Editing context " + editingContext.getId()); return thread; }); return new DelegatingRequestContextExecutorService(executorService); diff --git a/packages/starters/backend/sirius-components-starter/src/main/java/org/eclipse/sirius/components/starter/services/EditingContextDispatcher.java b/packages/starters/backend/sirius-components-starter/src/main/java/org/eclipse/sirius/components/starter/services/EditingContextDispatcher.java index b1b9176bf7..d729e28a2d 100644 --- a/packages/starters/backend/sirius-components-starter/src/main/java/org/eclipse/sirius/components/starter/services/EditingContextDispatcher.java +++ b/packages/starters/backend/sirius-components-starter/src/main/java/org/eclipse/sirius/components/starter/services/EditingContextDispatcher.java @@ -44,7 +44,7 @@ public EditingContextDispatcher(IEditingContextEventProcessorRegistry editingCon public Mono dispatchQuery(String editingContextId, IInput input) { // @formatter:off return this.editingContextEventProcessorRegistry.dispatchEvent(editingContextId, input) - .defaultIfEmpty(new ErrorPayload(input.getId(), this.messageSourceAccessor.getMessage("UNEXPECTED_ERROR"))); //$NON-NLS-1$ + .defaultIfEmpty(new ErrorPayload(input.getId(), this.messageSourceAccessor.getMessage("UNEXPECTED_ERROR"))); // @formatter:on } @@ -52,7 +52,7 @@ public Mono dispatchQuery(String editingContextId, IInput input) { public Mono dispatchMutation(String editingContextId, IInput input) { // @formatter:off return this.editingContextEventProcessorRegistry.dispatchEvent(editingContextId, input) - .defaultIfEmpty(new ErrorPayload(input.getId(), this.messageSourceAccessor.getMessage("UNEXPECTED_ERROR"))); //$NON-NLS-1$ + .defaultIfEmpty(new ErrorPayload(input.getId(), this.messageSourceAccessor.getMessage("UNEXPECTED_ERROR"))); // @formatter:on } diff --git a/packages/tests/backend/sirius-components-spring-tests/src/main/java/org/eclipse/sirius/components/spring/tests/architecture/AbstractConfigurationTests.java b/packages/tests/backend/sirius-components-spring-tests/src/main/java/org/eclipse/sirius/components/spring/tests/architecture/AbstractConfigurationTests.java index b5bdbc339b..ef5c40c3bd 100644 --- a/packages/tests/backend/sirius-components-spring-tests/src/main/java/org/eclipse/sirius/components/spring/tests/architecture/AbstractConfigurationTests.java +++ b/packages/tests/backend/sirius-components-spring-tests/src/main/java/org/eclipse/sirius/components/spring/tests/architecture/AbstractConfigurationTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -26,7 +26,7 @@ */ public abstract class AbstractConfigurationTests { - private static final String CONFIGURATION_PACKAGE = "..configuration.."; //$NON-NLS-1$ + private static final String CONFIGURATION_PACKAGE = "..configuration.."; protected abstract String getProjectRootPackage(); diff --git a/packages/tests/backend/sirius-components-spring-tests/src/main/java/org/eclipse/sirius/components/spring/tests/architecture/AbstractServicesTests.java b/packages/tests/backend/sirius-components-spring-tests/src/main/java/org/eclipse/sirius/components/spring/tests/architecture/AbstractServicesTests.java index f8b7ad28c2..1873ea89c2 100644 --- a/packages/tests/backend/sirius-components-spring-tests/src/main/java/org/eclipse/sirius/components/spring/tests/architecture/AbstractServicesTests.java +++ b/packages/tests/backend/sirius-components-spring-tests/src/main/java/org/eclipse/sirius/components/spring/tests/architecture/AbstractServicesTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -47,13 +47,13 @@ public void serviceClassShouldOnlyUseAuditedRepositoryMethods() { } private DescribedPredicate nonAuditedRepositoryMethod() { - return new DescribedPredicate<>("the repository method called has not been audited") { //$NON-NLS-1$ + return new DescribedPredicate<>("the repository method called has not been audited") { @Override public boolean apply(JavaMethodCall javaMethodCall) { JavaClass targetJavaClass = javaMethodCall.getTargetOwner(); String fullName = targetJavaClass.getFullName(); - boolean isRepository = fullName.endsWith("Repository"); //$NON-NLS-1$ + boolean isRepository = fullName.endsWith("Repository"); boolean hasBeenAudited = javaMethodCall.getTarget().isAnnotatedWith(Audited.class); return isRepository && !hasBeenAudited; diff --git a/packages/tests/backend/sirius-components-tests/src/main/java/org/eclipse/sirius/components/tests/architecture/AbstractCodingRulesTests.java b/packages/tests/backend/sirius-components-tests/src/main/java/org/eclipse/sirius/components/tests/architecture/AbstractCodingRulesTests.java index ac4d5cb3a1..b332bbac5e 100644 --- a/packages/tests/backend/sirius-components-tests/src/main/java/org/eclipse/sirius/components/tests/architecture/AbstractCodingRulesTests.java +++ b/packages/tests/backend/sirius-components-tests/src/main/java/org/eclipse/sirius/components/tests/architecture/AbstractCodingRulesTests.java @@ -40,51 +40,51 @@ * @author sbegaudeau */ public abstract class AbstractCodingRulesTests { - private static final String GUAVA_ANNOTATIONS = "com.google.common.annotations.."; //$NON-NLS-1$ + private static final String GUAVA_ANNOTATIONS = "com.google.common.annotations.."; - private static final String GUAVA_BASE = "com.google.common.base.."; //$NON-NLS-1$ + private static final String GUAVA_BASE = "com.google.common.base.."; - private static final String GUAVA_COLLECT = "com.google.common.collect.."; //$NON-NLS-1$ + private static final String GUAVA_COLLECT = "com.google.common.collect.."; - private static final String GUAVA_ESCAPE = "com.google.common.escape.."; //$NON-NLS-1$ + private static final String GUAVA_ESCAPE = "com.google.common.escape.."; - private static final String GUAVA_EVENTBUS = "com.google.common.eventbus.."; //$NON-NLS-1$ + private static final String GUAVA_EVENTBUS = "com.google.common.eventbus.."; - private static final String GUAVA_HASH = "com.google.common.hash.."; //$NON-NLS-1$ + private static final String GUAVA_HASH = "com.google.common.hash.."; - private static final String GUAVA_HTML = "com.google.common.html.."; //$NON-NLS-1$ + private static final String GUAVA_HTML = "com.google.common.html.."; - private static final String GUAVA_IO = "com.google.common.io.."; //$NON-NLS-1$ + private static final String GUAVA_IO = "com.google.common.io.."; - private static final String GUAVA_MATH = "com.google.common.math.."; //$NON-NLS-1$ + private static final String GUAVA_MATH = "com.google.common.math.."; - private static final String GUAVA_NET = "com.google.common.net.."; //$NON-NLS-1$ + private static final String GUAVA_NET = "com.google.common.net.."; - private static final String GUAVA_PRIMITIVES = "com.google.common.primitives.."; //$NON-NLS-1$ + private static final String GUAVA_PRIMITIVES = "com.google.common.primitives.."; - private static final String GUAVA_REFLECT = "com.google.common.reflect.."; //$NON-NLS-1$ + private static final String GUAVA_REFLECT = "com.google.common.reflect.."; - private static final String GUAVA_UTIL = "com.google.common.util.."; //$NON-NLS-1$ + private static final String GUAVA_UTIL = "com.google.common.util.."; - private static final String GUAVA_XML = "com.google.common.xml.."; //$NON-NLS-1$ + private static final String GUAVA_XML = "com.google.common.xml.."; - private static final String GUAVA_THIRDPARTY = "com.google.thirdparty.."; //$NON-NLS-1$ + private static final String GUAVA_THIRDPARTY = "com.google.thirdparty.."; - private static final String SPRING_STRINGUTILS = "org.springframework.util.StringUtils"; //$NON-NLS-1$ + private static final String SPRING_STRINGUTILS = "org.springframework.util.StringUtils"; - private static final String TESTCASE_SUFFIX = "TestCases"; //$NON-NLS-1$ + private static final String TESTCASE_SUFFIX = "TestCases"; - private static final String EMF = "org.eclipse.emf.."; //$NON-NLS-1$ + private static final String EMF = "org.eclipse.emf.."; - private static final String EMFJSON = "org.eclipse.sirius.emfjson.."; //$NON-NLS-1$ + private static final String EMFJSON = "org.eclipse.sirius.emfjson.."; - private static final String APACHE_COMMONS = "org.apache.commons.."; //$NON-NLS-1$ + private static final String APACHE_COMMONS = "org.apache.commons.."; - private static final String JACKSON_ANNOTATION = "com.fasterxml.jackson.annotation.."; //$NON-NLS-1$ + private static final String JACKSON_ANNOTATION = "com.fasterxml.jackson.annotation.."; - private static final String IS = "is"; //$NON-NLS-1$ + private static final String IS = "is"; - private static final String GET = "get"; //$NON-NLS-1$ + private static final String GET = "get"; protected abstract String getProjectRootPackage(); @@ -238,7 +238,7 @@ public void classesShouldHavePublicOrPrivateConstructors() { } private ArchCondition haveProtectedOrPackageConstructor() { - return new ArchCondition<>("have a package private constructor") { //$NON-NLS-1$ + return new ArchCondition<>("have a package private constructor") { @Override public void check(JavaClass javaClass, ConditionEvents events) { // @formatter:off @@ -258,7 +258,7 @@ public void check(JavaClass javaClass, ConditionEvents events) { boolean conditionSatisfied = hasProtectedOrPackageConstructor && !isAnonymousClass && !isEnum; - String pattern = "The class {0} has a constructor with a protected or package visibility"; //$NON-NLS-1$ + String pattern = "The class {0} has a constructor with a protected or package visibility"; String message = MessageFormat.format(pattern, javaClass.getSimpleName()); events.add(new SimpleConditionEvent(javaClass, conditionSatisfied, message)); } @@ -276,7 +276,7 @@ public void interfacesShouldRespectNamingConventions() { .and() .areNotAnnotatedWith(Target.class) .should() - .haveSimpleNameStartingWith("I"); //$NON-NLS-1$ + .haveSimpleNameStartingWith("I"); // @formatter:on rule.check(this.getClasses()); @@ -293,7 +293,7 @@ public void abstractClassesShouldRespectNamingConventions() { .and() .haveModifier(ABSTRACT) .should() - .haveSimpleNameStartingWith("Abstract"); //$NON-NLS-1$ + .haveSimpleNameStartingWith("Abstract"); // @formatter:on rule.check(this.getClasses()); @@ -332,7 +332,7 @@ public void abstractClassesShouldNotContainBusinessCode() { * @return A predicate which can be used to identify business code in a class */ private ArchCondition notContainBusinessCode() { - return new ArchCondition<>("not contain business code") { //$NON-NLS-1$ + return new ArchCondition<>("not contain business code") { @Override public void check(JavaClass javaClass, ConditionEvents events) { boolean isConditionSatisfied = true; @@ -356,9 +356,9 @@ public void check(JavaClass javaClass, ConditionEvents events) { } } - String message = "The abstract class does not have any business code"; //$NON-NLS-1$ + String message = "The abstract class does not have any business code"; if (!isConditionSatisfied) { - String pattern = "The abstract class {0} does contain business code, please favor composition over inheritance to share business code"; //$NON-NLS-1$ + String pattern = "The abstract class {0} does contain business code, please favor composition over inheritance to share business code"; message = MessageFormat.format(pattern, javaClass.getSimpleName()); } events.add(new SimpleConditionEvent(javaClass, isConditionSatisfied, message)); @@ -413,7 +413,7 @@ public void noMethodsShouldBeStatic() { } private DescribedPredicate isNotTestCase() { - return new DescribedPredicate<>("is not a test case") { //$NON-NLS-1$ + return new DescribedPredicate<>("is not a test case") { @Override public boolean apply(JavaClass javaClass) { return !javaClass.getName().endsWith(TESTCASE_SUFFIX); @@ -427,10 +427,10 @@ public boolean apply(JavaClass javaClass) { * @return A predicate which will help us ignore lambda methods */ private DescribedPredicate isNotLambda() { - return new DescribedPredicate<>("is not a lambda") { //$NON-NLS-1$ + return new DescribedPredicate<>("is not a lambda") { @Override public boolean apply(JavaMethod javaMethod) { - return !javaMethod.getName().startsWith("lambda$"); //$NON-NLS-1$ + return !javaMethod.getName().startsWith("lambda$"); } }; } @@ -442,10 +442,10 @@ public boolean apply(JavaMethod javaMethod) { * @return A predicate which help us ignore switch expressions */ private DescribedPredicate isNotSwitchTable() { - return new DescribedPredicate<>("is not a switch table (whatever that is...)") { //$NON-NLS-1$ + return new DescribedPredicate<>("is not a switch table (whatever that is...)") { @Override public boolean apply(JavaMethod javaMethod) { - return !javaMethod.getFullName().contains("$SWITCH_TABLE$"); //$NON-NLS-1$ + return !javaMethod.getFullName().contains("$SWITCH_TABLE$"); } }; } diff --git a/packages/tests/backend/sirius-components-tests/src/main/java/org/eclipse/sirius/components/tests/architecture/AbstractImmutableTests.java b/packages/tests/backend/sirius-components-tests/src/main/java/org/eclipse/sirius/components/tests/architecture/AbstractImmutableTests.java index 01fb237c60..a33b16c2be 100644 --- a/packages/tests/backend/sirius-components-tests/src/main/java/org/eclipse/sirius/components/tests/architecture/AbstractImmutableTests.java +++ b/packages/tests/backend/sirius-components-tests/src/main/java/org/eclipse/sirius/components/tests/architecture/AbstractImmutableTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -88,15 +88,15 @@ public void immutableClassesShouldHavePublicGetters() { } private ArchCondition haveAPublicGetter() { - return new ArchCondition<>("have a public getter") { //$NON-NLS-1$ + return new ArchCondition<>("have a public getter") { @Override public void check(JavaField javaField, ConditionEvents events) { if (!javaField.getModifiers().contains(STATIC)) { JavaClass javaClass = javaField.getOwner(); - String getterName = "get" + javaField.getName().substring(0, 1).toUpperCase() + javaField.getName().substring(1); //$NON-NLS-1$ - if (javaField.getRawType().getFullName().equals("java.lang.Boolean") || javaField.getRawType().getFullName().equals("boolean")) { //$NON-NLS-1$ //$NON-NLS-2$ - getterName = "is" + javaField.getName().substring(0, 1).toUpperCase() + javaField.getName().substring(1); //$NON-NLS-1$ + String getterName = "get" + javaField.getName().substring(0, 1).toUpperCase() + javaField.getName().substring(1); + if (javaField.getRawType().getFullName().equals("java.lang.Boolean") || javaField.getRawType().getFullName().equals("boolean")) { + getterName = "is" + javaField.getName().substring(0, 1).toUpperCase() + javaField.getName().substring(1); } boolean isConditionSatisfied = false; @@ -108,9 +108,9 @@ public void check(JavaField javaField, ConditionEvents events) { isConditionSatisfied = false; } - String message = "The field has a getter"; //$NON-NLS-1$ + String message = "The field has a getter"; if (!isConditionSatisfied) { - message = "The field " + javaField.getFullName() + " does not have a getter"; //$NON-NLS-1$ //$NON-NLS-2$ + message = "The field " + javaField.getFullName() + " does not have a getter"; } events.add(new SimpleConditionEvent(javaField, isConditionSatisfied, message)); } @@ -133,19 +133,19 @@ public void immutableClassesShouldNotHaveSetters() { } private ArchCondition notHaveSetters() { - return new ArchCondition<>("not have setters") { //$NON-NLS-1$ + return new ArchCondition<>("not have setters") { @Override public void check(JavaClass javaClass, ConditionEvents events) { // @formatter:off long settersCount = javaClass.getMethods().stream() - .filter(javaMethod -> javaMethod.getName().startsWith("set")) //$NON-NLS-1$ + .filter(javaMethod -> javaMethod.getName().startsWith("set")) .count(); // @formatter:on boolean isConditionSatisfied = settersCount == 0; - String message = "The class does not have any setters"; //$NON-NLS-1$ + String message = "The class does not have any setters"; if (!isConditionSatisfied) { - message = "The class " + javaClass.getName() + " does have setters"; //$NON-NLS-1$//$NON-NLS-2$ + message = "The class " + javaClass.getName() + " does have setters"; } events.add(new SimpleConditionEvent(javaClass, isConditionSatisfied, message)); } @@ -167,20 +167,20 @@ public void immutableClassesShouldHaveABuilderMethod() { } private ArchCondition haveABuilderMethod() { - return new ArchCondition<>("have a builder method") { //$NON-NLS-1$ + return new ArchCondition<>("have a builder method") { @Override public void check(JavaClass javaClass, ConditionEvents events) { // @formatter:off long count = javaClass.getMethods().stream() - .filter(method -> method.getName().equals("new" + javaClass.getSimpleName())) //$NON-NLS-1$ - .filter(method -> "Builder".equals(method.getRawReturnType().getSimpleName())) //$NON-NLS-1$ + .filter(method -> method.getName().equals("new" + javaClass.getSimpleName())) + .filter(method -> "Builder".equals(method.getRawReturnType().getSimpleName())) .count(); // @formatter:on boolean isConditionSatisfied = count > 0; - String message = "The class has a builder method"; //$NON-NLS-1$ + String message = "The class has a builder method"; if (!isConditionSatisfied) { - message = MessageFormat.format("The class {0} does not have a builder method", javaClass.getSimpleName()); //$NON-NLS-1$ + message = MessageFormat.format("The class {0} does not have a builder method", javaClass.getSimpleName()); } events.add(new SimpleConditionEvent(javaClass, isConditionSatisfied, message)); } diff --git a/packages/tests/backend/sirius-components-tests/src/main/java/org/eclipse/sirius/components/tests/architecture/HaveAValidBuilderCondition.java b/packages/tests/backend/sirius-components-tests/src/main/java/org/eclipse/sirius/components/tests/architecture/HaveAValidBuilderCondition.java index 8ea1432cd0..2872d1db1d 100644 --- a/packages/tests/backend/sirius-components-tests/src/main/java/org/eclipse/sirius/components/tests/architecture/HaveAValidBuilderCondition.java +++ b/packages/tests/backend/sirius-components-tests/src/main/java/org/eclipse/sirius/components/tests/architecture/HaveAValidBuilderCondition.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -36,21 +36,21 @@ */ public class HaveAValidBuilderCondition extends ArchCondition { - private static final String BUILD_METHOD_NAME = "build"; //$NON-NLS-1$ + private static final String BUILD_METHOD_NAME = "build"; - private static final String LAMBDA = "lambda$"; //$NON-NLS-1$ + private static final String LAMBDA = "lambda$"; private final JavaClasses javaClasses; public HaveAValidBuilderCondition(JavaClasses javaClasses) { - super("have a builder"); //$NON-NLS-1$ + super("have a builder"); this.javaClasses = Objects.requireNonNull(javaClasses); } @Override public void check(JavaClass javaClass, ConditionEvents events) { String fullName = javaClass.getFullName(); - JavaClass builderJavaClass = this.javaClasses.get(fullName + "$Builder"); //$NON-NLS-1$ + JavaClass builderJavaClass = this.javaClasses.get(fullName + "$Builder"); boolean isValidBuilder = builderJavaClass.getModifiers().contains(FINAL); isValidBuilder = isValidBuilder && builderJavaClass.getModifiers().contains(PUBLIC); @@ -85,9 +85,9 @@ public void check(JavaClass javaClass, ConditionEvents events) { isValidBuilder = isValidBuilder && buildMethodCount == 1; - String message = "The builder is valid"; //$NON-NLS-1$ + String message = "The builder is valid"; if (!isValidBuilder) { - message = MessageFormat.format("The builder of the class {0} is not valid", javaClass.getSimpleName()); //$NON-NLS-1$ + message = MessageFormat.format("The builder of the class {0} is not valid", javaClass.getSimpleName()); } events.add(new SimpleConditionEvent(builderJavaClass, isValidBuilder, message)); } diff --git a/packages/tests/backend/sirius-components-tests/src/test/java/org/eclipse/sirius/components/tests/GeneralPurposeTests.java b/packages/tests/backend/sirius-components-tests/src/test/java/org/eclipse/sirius/components/tests/GeneralPurposeTests.java index 735046a033..65fcd1d3c8 100644 --- a/packages/tests/backend/sirius-components-tests/src/test/java/org/eclipse/sirius/components/tests/GeneralPurposeTests.java +++ b/packages/tests/backend/sirius-components-tests/src/test/java/org/eclipse/sirius/components/tests/GeneralPurposeTests.java @@ -37,72 +37,72 @@ */ public class GeneralPurposeTests { - private static final String UNIX_PATH_SEPARATOR = "/"; //$NON-NLS-1$ + private static final String UNIX_PATH_SEPARATOR = "/"; - private static final String WINDOWS_PATH_SEPARATOR = "\\"; //$NON-NLS-1$ + private static final String WINDOWS_PATH_SEPARATOR = "\\"; - private static final String GIT_FOLDER_NAME = ".git"; //$NON-NLS-1$ + private static final String GIT_FOLDER_NAME = ".git"; - private static final String BACKEND_FOLDER_PATH = "packages"; //$NON-NLS-1$ + private static final String BACKEND_FOLDER_PATH = "packages"; - private static final String FRONTEND_SRC_FOLDER_PATH = "packages"; //$NON-NLS-1$ + private static final String FRONTEND_SRC_FOLDER_PATH = "packages"; - private static final String TYPESCRIPT_FILE_EXTENSION = ".ts"; //$NON-NLS-1$ + private static final String TYPESCRIPT_FILE_EXTENSION = ".ts"; - private static final String TYPESCRIPT_JSX_FILE_EXTENSION = ".tsx"; //$NON-NLS-1$ + private static final String TYPESCRIPT_JSX_FILE_EXTENSION = ".tsx"; - private static final String CSS_FILE_EXTENSION = ".css"; //$NON-NLS-1$ + private static final String CSS_FILE_EXTENSION = ".css"; - private static final String JAVA_FILE_EXTENSION = "java"; //$NON-NLS-1$ + private static final String JAVA_FILE_EXTENSION = "java"; - private static final String SUPPRESS_WARNINGS = "@SuppressWarnings"; //$NON-NLS-1$ + private static final String SUPPRESS_WARNINGS = "@SuppressWarnings"; - private static final String CHECKSTYLE_HIDDEN_FIELD = "@SuppressWarnings(\"checkstyle:HiddenField\")"; //$NON-NLS-1$ + private static final String CHECKSTYLE_HIDDEN_FIELD = "@SuppressWarnings(\"checkstyle:HiddenField\")"; - private static final String CHECKSTYLE_ILLEGAL_CATCH = "@SuppressWarnings(\"checkstyle:IllegalCatch\")"; //$NON-NLS-1$ + private static final String CHECKSTYLE_ILLEGAL_CATCH = "@SuppressWarnings(\"checkstyle:IllegalCatch\")"; - private static final String CHECKSTYLE_MULTIPLE_STRING_LITERALS = "@SuppressWarnings(\"checkstyle:MultipleStringLiterals\")"; //$NON-NLS-1$ + private static final String CHECKSTYLE_MULTIPLE_STRING_LITERALS = "@SuppressWarnings(\"checkstyle:MultipleStringLiterals\")"; - private static final String CHECKSTYLE_NCSS = "@SuppressWarnings(\"checkstyle:JavaNCSS\")"; //$NON-NLS-1$ + private static final String CHECKSTYLE_NCSS = "@SuppressWarnings(\"checkstyle:JavaNCSS\")"; - private static final String BUILDER = "Builder"; //$NON-NLS-1$ + private static final String BUILDER = "Builder"; - private static final String CHECKSTYLE_OFF = "CHECKSTYLE:OFF"; //$NON-NLS-1$ + private static final String CHECKSTYLE_OFF = "CHECKSTYLE:OFF"; - private static final String ESLINT_DISABLE = "eslint-disable"; //$NON-NLS-1$ + private static final String ESLINT_DISABLE = "eslint-disable"; - private static final String THROW_NEW = "throw new"; //$NON-NLS-1$ + private static final String THROW_NEW = "throw new"; - private static final String DEBUGGER = "debugger"; //$NON-NLS-1$ + private static final String DEBUGGER = "debugger"; - private static final String CONSOLE_LOG = "console.log"; //$NON-NLS-1$ + private static final String CONSOLE_LOG = "console.log"; - private static final String ALERT = "alert("; //$NON-NLS-1$ + private static final String ALERT = "alert("; - private static final String CONFIRM = "confirm("; //$NON-NLS-1$ + private static final String CONFIRM = "confirm("; - private static final String PROMPT = "prompt("; //$NON-NLS-1$ + private static final String PROMPT = "prompt("; - private static final String WIDTH_100 = "width: 100%;"; //$NON-NLS-1$ + private static final String WIDTH_100 = "width: 100%;"; - private static final String HEIGHT_100 = "height: 100%;"; //$NON-NLS-1$ + private static final String HEIGHT_100 = "height: 100%;"; - private static final String INVALID_MATERIALUI_IMPORT = "from '@material-ui/core';"; //$NON-NLS-1$ + private static final String INVALID_MATERIALUI_IMPORT = "from '@material-ui/core';"; //// @formatter:off private static final List COPYRIGHT_HEADER = List.of( - Pattern.compile(Pattern.quote("/*******************************************************************************")), //$NON-NLS-1$ - Pattern.compile(" \\* Copyright \\(c\\) [0-9]{4}(, [0-9]{4})* (.*)\\.$"), //$NON-NLS-1$ - Pattern.compile(Pattern.quote(" * This program and the accompanying materials")), //$NON-NLS-1$ - Pattern.compile(Pattern.quote(" * are made available under the terms of the Eclipse Public License v2.0")), //$NON-NLS-1$ - Pattern.compile(Pattern.quote(" * which accompanies this distribution, and is available at")), //$NON-NLS-1$ - Pattern.compile(Pattern.quote(" * https://www.eclipse.org/legal/epl-2.0/")), //$NON-NLS-1$ - Pattern.compile(Pattern.quote(" *")), //$NON-NLS-1$ - Pattern.compile(Pattern.quote(" * SPDX-License-Identifier: EPL-2.0")), //$NON-NLS-1$ - Pattern.compile(Pattern.quote(" *")), //$NON-NLS-1$ - Pattern.compile(Pattern.quote(" * Contributors:")), //$NON-NLS-1$ - Pattern.compile(Pattern.quote(" * Obeo - initial API and implementation")), //$NON-NLS-1$ - Pattern.compile(Pattern.quote(" *******************************************************************************/"))); //$NON-NLS-1$ + Pattern.compile(Pattern.quote("/*******************************************************************************")), + Pattern.compile(" \\* Copyright \\(c\\) [0-9]{4}(, [0-9]{4})* (.*)\\.$"), + Pattern.compile(Pattern.quote(" * This program and the accompanying materials")), + Pattern.compile(Pattern.quote(" * are made available under the terms of the Eclipse Public License v2.0")), + Pattern.compile(Pattern.quote(" * which accompanies this distribution, and is available at")), + Pattern.compile(Pattern.quote(" * https://www.eclipse.org/legal/epl-2.0/")), + Pattern.compile(Pattern.quote(" *")), + Pattern.compile(Pattern.quote(" * SPDX-License-Identifier: EPL-2.0")), + Pattern.compile(Pattern.quote(" *")), + Pattern.compile(Pattern.quote(" * Contributors:")), + Pattern.compile(Pattern.quote(" * Obeo - initial API and implementation")), + Pattern.compile(Pattern.quote(" *******************************************************************************/"))); // @formatter:on /** @@ -111,7 +111,7 @@ public class GeneralPurposeTests { * @return The root folder */ private File getRootFolder() { - String path = System.getProperty("user.dir"); //$NON-NLS-1$ + String path = System.getProperty("user.dir"); File classpathRoot = new File(path); File repositoryRootFolder = classpathRoot; @@ -136,21 +136,21 @@ private List findFilePaths(Path sourceFolderPath, String extension) { // @formatter:off List filePaths = paths.filter(Files::isRegularFile) .filter(filePath -> filePath.toFile().getName().endsWith(extension)) - .filter(filePath -> !filePath.toString().replace(WINDOWS_PATH_SEPARATOR, UNIX_PATH_SEPARATOR).contains("/node_modules/")) //$NON-NLS-1$ - .filter(filePath -> !filePath.toString().replace(WINDOWS_PATH_SEPARATOR, UNIX_PATH_SEPARATOR).contains("/coverage/")) //$NON-NLS-1$ - .filter(filePath -> !filePath.toString().replace(WINDOWS_PATH_SEPARATOR, UNIX_PATH_SEPARATOR).contains("/dist/")) //$NON-NLS-1$ - .filter(filePath -> !filePath.toString().replace(WINDOWS_PATH_SEPARATOR, UNIX_PATH_SEPARATOR).contains("/.turbo/")) //$NON-NLS-1$ - .filter(filePath -> !filePath.toString().replace(WINDOWS_PATH_SEPARATOR, UNIX_PATH_SEPARATOR).contains("/bin/")) //$NON-NLS-1$ - .filter(filePath -> !filePath.toString().replace(WINDOWS_PATH_SEPARATOR, UNIX_PATH_SEPARATOR).contains("/__mocks__/")) //$NON-NLS-1$ - .filter(filePath -> !filePath.toString().replace(WINDOWS_PATH_SEPARATOR, UNIX_PATH_SEPARATOR).contains("/static/")) //$NON-NLS-1$ - .filter(filePath -> !filePath.toString().replace(WINDOWS_PATH_SEPARATOR, UNIX_PATH_SEPARATOR).contains("/target/")) //$NON-NLS-1$ - .filter(filePath -> !filePath.toString().replace(WINDOWS_PATH_SEPARATOR, UNIX_PATH_SEPARATOR).contains("graphiql")) //$NON-NLS-1$ - .filter(filePath -> !filePath.toString().replace(WINDOWS_PATH_SEPARATOR, UNIX_PATH_SEPARATOR).contains("graphql-voyager")) //$NON-NLS-1$ - .filter(filePath -> !filePath.toString().replace(WINDOWS_PATH_SEPARATOR, UNIX_PATH_SEPARATOR).contains("/.vscode/")) //$NON-NLS-1$ - .filter(filePath -> !filePath.toString().replace(WINDOWS_PATH_SEPARATOR, UNIX_PATH_SEPARATOR).contains(".d.ts")) //$NON-NLS-1$ - .filter(filePath -> !filePath.toString().replace(WINDOWS_PATH_SEPARATOR, UNIX_PATH_SEPARATOR).contains("/.mvn/wrapper/")) //$NON-NLS-1$ - .filter(filePath -> !filePath.toString().replace(WINDOWS_PATH_SEPARATOR, UNIX_PATH_SEPARATOR).contains("/sirius-components-domain")) //$NON-NLS-1$ - .filter(filePath -> !filePath.toString().replace(WINDOWS_PATH_SEPARATOR, UNIX_PATH_SEPARATOR).contains("/sirius-components-view")) //$NON-NLS-1$ + .filter(filePath -> !filePath.toString().replace(WINDOWS_PATH_SEPARATOR, UNIX_PATH_SEPARATOR).contains("/node_modules/")) + .filter(filePath -> !filePath.toString().replace(WINDOWS_PATH_SEPARATOR, UNIX_PATH_SEPARATOR).contains("/coverage/")) + .filter(filePath -> !filePath.toString().replace(WINDOWS_PATH_SEPARATOR, UNIX_PATH_SEPARATOR).contains("/dist/")) + .filter(filePath -> !filePath.toString().replace(WINDOWS_PATH_SEPARATOR, UNIX_PATH_SEPARATOR).contains("/.turbo/")) + .filter(filePath -> !filePath.toString().replace(WINDOWS_PATH_SEPARATOR, UNIX_PATH_SEPARATOR).contains("/bin/")) + .filter(filePath -> !filePath.toString().replace(WINDOWS_PATH_SEPARATOR, UNIX_PATH_SEPARATOR).contains("/__mocks__/")) + .filter(filePath -> !filePath.toString().replace(WINDOWS_PATH_SEPARATOR, UNIX_PATH_SEPARATOR).contains("/static/")) + .filter(filePath -> !filePath.toString().replace(WINDOWS_PATH_SEPARATOR, UNIX_PATH_SEPARATOR).contains("/target/")) + .filter(filePath -> !filePath.toString().replace(WINDOWS_PATH_SEPARATOR, UNIX_PATH_SEPARATOR).contains("graphiql")) + .filter(filePath -> !filePath.toString().replace(WINDOWS_PATH_SEPARATOR, UNIX_PATH_SEPARATOR).contains("graphql-voyager")) + .filter(filePath -> !filePath.toString().replace(WINDOWS_PATH_SEPARATOR, UNIX_PATH_SEPARATOR).contains("/.vscode/")) + .filter(filePath -> !filePath.toString().replace(WINDOWS_PATH_SEPARATOR, UNIX_PATH_SEPARATOR).contains(".d.ts")) + .filter(filePath -> !filePath.toString().replace(WINDOWS_PATH_SEPARATOR, UNIX_PATH_SEPARATOR).contains("/.mvn/wrapper/")) + .filter(filePath -> !filePath.toString().replace(WINDOWS_PATH_SEPARATOR, UNIX_PATH_SEPARATOR).contains("/sirius-components-domain")) + .filter(filePath -> !filePath.toString().replace(WINDOWS_PATH_SEPARATOR, UNIX_PATH_SEPARATOR).contains("/sirius-components-view")) .collect(Collectors.toList()); // @formatter:on @@ -168,7 +168,7 @@ public void checkJavaCode() { Path backendFolderPath = Paths.get(rootFolder.getAbsolutePath(), BACKEND_FOLDER_PATH); List javaFilePaths = this.findFilePaths(backendFolderPath, JAVA_FILE_EXTENSION); for (Path javaFilePath : javaFilePaths) { - if (!javaFilePath.endsWith(GeneralPurposeTests.class.getSimpleName() + "." + JAVA_FILE_EXTENSION)) { //$NON-NLS-1$ + if (!javaFilePath.endsWith(GeneralPurposeTests.class.getSimpleName() + "." + JAVA_FILE_EXTENSION)) { try { List lines = Files.readAllLines(javaFilePath); for (int index = 0; index < lines.size(); index++) { @@ -188,7 +188,7 @@ public void checkJavaCode() { private void testCopyrightHeader(Path filePath, List lines) { if (!this.isWhiteListed(filePath)) { for (int i = 0; i < COPYRIGHT_HEADER.size(); i++) { - assertThat("Invalid copyright header in " + filePath, lines.get(i), matchesPattern(COPYRIGHT_HEADER.get(i))); //$NON-NLS-1$ + assertThat("Invalid copyright header in " + filePath, lines.get(i), matchesPattern(COPYRIGHT_HEADER.get(i))); } assertTrue(lines.size() >= COPYRIGHT_HEADER.size()); } @@ -196,8 +196,8 @@ private void testCopyrightHeader(Path filePath, List lines) { private boolean isWhiteListed(Path filePath) { // @formatter:off - return filePath.toString().replace(WINDOWS_PATH_SEPARATOR, UNIX_PATH_SEPARATOR).contains("src/icons") //$NON-NLS-1$ - || filePath.toString().replace(WINDOWS_PATH_SEPARATOR, UNIX_PATH_SEPARATOR).contains("GenericTool.tsx"); //$NON-NLS-1$ + return filePath.toString().replace(WINDOWS_PATH_SEPARATOR, UNIX_PATH_SEPARATOR).contains("src/icons") + || filePath.toString().replace(WINDOWS_PATH_SEPARATOR, UNIX_PATH_SEPARATOR).contains("GenericTool.tsx"); // @formatter:on } @@ -216,20 +216,20 @@ private void testNoSuppressWarnings(int index, String line, Path javaFilePath, L isValidUsage = true; } if (!isValidUsage) { - fail(this.createErrorMessage("@SuppressWarnings", javaFilePath, index)); //$NON-NLS-1$ + fail(this.createErrorMessage("@SuppressWarnings", javaFilePath, index)); } } } private void testNoCheckstyleOff(int index, String line, Path javaFilePath) { if (line.contains(CHECKSTYLE_OFF)) { - fail(this.createErrorMessage("CHECKSTYLE:OFF", javaFilePath, index)); //$NON-NLS-1$ + fail(this.createErrorMessage("CHECKSTYLE:OFF", javaFilePath, index)); } } private void testNoThrowNewException(int index, String line, Path javaFilePath) { if (line.contains(THROW_NEW)) { - fail(this.createErrorMessage("throw new XXXException", javaFilePath, index)); //$NON-NLS-1$ + fail(this.createErrorMessage("throw new XXXException", javaFilePath, index)); } } @@ -349,9 +349,9 @@ public void checkCSSCode() { private void testHeight100Percent(int index, String line, Path cssFilePath) { // @formatter:off var whitelist = Stream.of( - Path.of("Sprotty.css"), //$NON-NLS-1$ - Path.of("Modal.module.css"), //$NON-NLS-1$ - Path.of("ToolSection.module.css") //$NON-NLS-1$ + Path.of("Sprotty.css"), + Path.of("Modal.module.css"), + Path.of("ToolSection.module.css") ); // @formatter:on if (whitelist.filter(cssFilePath::endsWith).findFirst().isEmpty()) { @@ -383,9 +383,9 @@ private void testHeight100Percent(int index, String line, Path cssFilePath) { private void testWidth100Percent(int index, String line, Path cssFilePath) { // @formatter:off var whitelist = Stream.of( - Path.of("Sprotty.css"), //$NON-NLS-1$ - Path.of("Modal.module.css"), //$NON-NLS-1$ - Path.of("ToolSection.module.css") //$NON-NLS-1$ + Path.of("Sprotty.css"), + Path.of("Modal.module.css"), + Path.of("ToolSection.module.css") ); // @formatter:on if (whitelist.filter(cssFilePath::endsWith).findFirst().isEmpty()) { @@ -396,6 +396,6 @@ private void testWidth100Percent(int index, String line, Path cssFilePath) { } private String createErrorMessage(String pattern, Path path, int lineNumber) { - return "Invalid use of " + pattern + " in " + path.toString() + " line " + lineNumber; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + return "Invalid use of " + pattern + " in " + path.toString() + " line " + lineNumber; } } diff --git a/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/TreeEventProcessor.java b/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/TreeEventProcessor.java index 864aa1cfd4..731f0a7d4f 100644 --- a/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/TreeEventProcessor.java +++ b/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/TreeEventProcessor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -78,7 +78,7 @@ public class TreeEventProcessor implements ITreeEventProcessor { public TreeEventProcessor(IEditingContext editingContext, ITreeService treeService, TreeCreationParameters treeCreationParameters, List treeEventHandlers, ISubscriptionManager subscriptionManager, MeterRegistry meterRegistry, IRepresentationRefreshPolicyRegistry representationRefreshPolicyRegistry) { - this.logger.trace("Creating the tree event processor {}", treeCreationParameters.getEditingContext().getId()); //$NON-NLS-1$ + this.logger.trace("Creating the tree event processor {}", treeCreationParameters.getEditingContext().getId()); this.editingContext = Objects.requireNonNull(editingContext); this.treeService = Objects.requireNonNull(treeService); @@ -89,7 +89,7 @@ public TreeEventProcessor(IEditingContext editingContext, ITreeService treeServi // @formatter:off this.timer = Timer.builder(Monitoring.REPRESENTATION_EVENT_PROCESSOR_REFRESH) - .tag(Monitoring.NAME, "tree") //$NON-NLS-1$ + .tag(Monitoring.NAME, "tree") .register(meterRegistry); // @formatter:on @@ -117,7 +117,7 @@ public void handle(One payloadSink, Many changeDesc ITreeEventHandler treeEventHandler = optionalTreeEventHandler.get(); treeEventHandler.handle(payloadSink, changeDescriptionSink, this.editingContext, this.currentTree.get(), treeInput); } else { - this.logger.warn("No handler found for event: {}", treeInput); //$NON-NLS-1$ + this.logger.warn("No handler found for event: {}", treeInput); } } } @@ -133,7 +133,7 @@ public void refresh(ChangeDescription changeDescription) { if (this.sink.currentSubscriberCount() > 0) { EmitResult emitResult = this.sink.tryEmitNext(new TreeRefreshedEventPayload(changeDescription.getInput().getId(), tree)); if (emitResult.isFailure()) { - String pattern = "An error has occurred while emitting a TreeRefreshedEventPayload: {}"; //$NON-NLS-1$ + String pattern = "An error has occurred while emitting a TreeRefreshedEventPayload: {}"; this.logger.warn(pattern, emitResult); } } @@ -178,7 +178,7 @@ private IRepresentationRefreshPolicy getDefaultRefreshPolicy() { private Tree refreshTree() { Tree tree = this.treeService.create(this.treeCreationParameters); - this.logger.trace("Tree refreshed: {}", this.treeCreationParameters.getEditingContext().getId()); //$NON-NLS-1$ + this.logger.trace("Tree refreshed: {}", this.treeCreationParameters.getEditingContext().getId()); return tree; } @@ -197,13 +197,13 @@ public Flux getOutputEvents(IInput input) { @Override public void dispose() { - this.logger.trace("Disposing the tree event processor {}", this.treeCreationParameters.getEditingContext().getId()); //$NON-NLS-1$ + this.logger.trace("Disposing the tree event processor {}", this.treeCreationParameters.getEditingContext().getId()); this.subscriptionManager.dispose(); EmitResult emitResult = this.sink.tryEmitComplete(); if (emitResult.isFailure()) { - String pattern = "An error has occurred while marking the publisher as complete: {}"; //$NON-NLS-1$ + String pattern = "An error has occurred while marking the publisher as complete: {}"; this.logger.warn(pattern, emitResult); } } diff --git a/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/api/TreeCreationParameters.java b/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/api/TreeCreationParameters.java index bc24143f1a..f7b3f96b2b 100644 --- a/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/api/TreeCreationParameters.java +++ b/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/api/TreeCreationParameters.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -61,7 +61,7 @@ public static Builder newTreeCreationParameters(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, treeDescriptionId: {2}, expanded: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, treeDescriptionId: {2}, expanded: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.treeDescription.getId(), this.expanded); } diff --git a/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/configuration/CollaborativeTreeMessageServiceConfiguration.java b/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/configuration/CollaborativeTreeMessageServiceConfiguration.java index fecfa1229c..eee60f5f15 100644 --- a/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/configuration/CollaborativeTreeMessageServiceConfiguration.java +++ b/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/configuration/CollaborativeTreeMessageServiceConfiguration.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -24,7 +24,7 @@ */ @Configuration public class CollaborativeTreeMessageServiceConfiguration { - private static final String PATH = "messages/sirius-web-spring-collaborative-trees"; //$NON-NLS-1$ + private static final String PATH = "messages/sirius-web-spring-collaborative-trees"; @Bean public MessageSourceAccessor collaborativeTreeMessageSourceAccessor() { diff --git a/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/dto/DeleteTreeItemInput.java b/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/dto/DeleteTreeItemInput.java index 903ce91af8..9fd3e34001 100644 --- a/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/dto/DeleteTreeItemInput.java +++ b/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/dto/DeleteTreeItemInput.java @@ -63,7 +63,7 @@ public UUID getTreeItemId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, treeItemId: {4}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, treeItemId: {4}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.treeItemId); } } diff --git a/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/dto/DeleteTreeItemSuccessPayload.java b/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/dto/DeleteTreeItemSuccessPayload.java index 9e23faa967..8d5d6b7a8d 100644 --- a/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/dto/DeleteTreeItemSuccessPayload.java +++ b/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/dto/DeleteTreeItemSuccessPayload.java @@ -38,7 +38,7 @@ public UUID getId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } } diff --git a/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/dto/RenameTreeItemInput.java b/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/dto/RenameTreeItemInput.java index d10fd91562..ea36af66f9 100644 --- a/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/dto/RenameTreeItemInput.java +++ b/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/dto/RenameTreeItemInput.java @@ -70,7 +70,7 @@ public String getNewLabel() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, treeItemId: {4}, newLabel: {5}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, representationId: {3}, treeItemId: {4}, newLabel: {5}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.treeItemId, this.newLabel); } } diff --git a/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/dto/RenameTreeItemSuccessPayload.java b/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/dto/RenameTreeItemSuccessPayload.java index ac371ac0ba..f5a97000d8 100644 --- a/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/dto/RenameTreeItemSuccessPayload.java +++ b/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/dto/RenameTreeItemSuccessPayload.java @@ -38,7 +38,7 @@ public UUID getId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id); } } diff --git a/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/dto/TreeEventInput.java b/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/dto/TreeEventInput.java index 3c00f61a92..fb2f85fd61 100644 --- a/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/dto/TreeEventInput.java +++ b/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/dto/TreeEventInput.java @@ -56,7 +56,7 @@ public List getExpanded() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, expanded: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, expanded: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.expanded); } } diff --git a/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/dto/TreePath.java b/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/dto/TreePath.java index a44b2ff146..465684a1b2 100644 --- a/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/dto/TreePath.java +++ b/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/dto/TreePath.java @@ -41,7 +41,7 @@ public int getMaxDepth() { @Override public String toString() { - String pattern = "{0} '{'treeItemIdsToExpand: {2}, maxDepth: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'treeItemIdsToExpand: {2}, maxDepth: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.treeItemIdsToExpand, this.maxDepth); } } diff --git a/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/dto/TreePathInput.java b/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/dto/TreePathInput.java index 48321d856f..1692b65241 100644 --- a/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/dto/TreePathInput.java +++ b/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/dto/TreePathInput.java @@ -60,7 +60,7 @@ public List getSelectionEntryIds() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}, selectionEntryIds: {3}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}, selectionEntryIds: {3}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId, this.selectionEntryIds); } diff --git a/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/dto/TreePathSuccessPayload.java b/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/dto/TreePathSuccessPayload.java index 19c817d04c..3393129aa7 100644 --- a/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/dto/TreePathSuccessPayload.java +++ b/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/dto/TreePathSuccessPayload.java @@ -44,7 +44,7 @@ public TreePath getTreePath() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, treePath: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, treePath: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.treePath); } } diff --git a/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/dto/TreeRefreshedEventPayload.java b/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/dto/TreeRefreshedEventPayload.java index 3093d77810..9c0818dea1 100644 --- a/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/dto/TreeRefreshedEventPayload.java +++ b/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/dto/TreeRefreshedEventPayload.java @@ -45,7 +45,7 @@ public Tree getTree() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, tree: '{'id: {2}, label: {3}'}''}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, tree: '{'id: {2}, label: {3}'}''}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.tree.getId(), this.tree.getLabel()); } } diff --git a/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/services/CollaborativeTreeMessageService.java b/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/services/CollaborativeTreeMessageService.java index 30b6351a4a..74b2023221 100644 --- a/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/services/CollaborativeTreeMessageService.java +++ b/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/services/CollaborativeTreeMessageService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -34,6 +34,6 @@ public CollaborativeTreeMessageService(@Qualifier("collaborativeTreeMessageSourc @Override public String invalidInput(String expectedInputTypeName, String receivedInputTypeName) { - return this.messageSourceAccessor.getMessage("INVALID_INPUT", new Object[] { expectedInputTypeName, receivedInputTypeName }); //$NON-NLS-1$ + return this.messageSourceAccessor.getMessage("INVALID_INPUT", new Object[] { expectedInputTypeName, receivedInputTypeName }); } } diff --git a/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/services/api/ICollaborativeTreeMessageService.java b/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/services/api/ICollaborativeTreeMessageService.java index 0962b9e335..7cb0c4094f 100644 --- a/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/services/api/ICollaborativeTreeMessageService.java +++ b/packages/trees/backend/sirius-components-collaborative-trees/src/main/java/org/eclipse/sirius/components/collaborative/trees/services/api/ICollaborativeTreeMessageService.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -29,7 +29,7 @@ class NoOp implements ICollaborativeTreeMessageService { @Override public String invalidInput(String expectedInputTypeName, String receivedInputTypeName) { - return ""; //$NON-NLS-1$ + return ""; } } diff --git a/packages/trees/backend/sirius-components-collaborative-trees/src/test/java/org/eclipse/sirius/components/collaborative/trees/architecture/ArchitectureConstants.java b/packages/trees/backend/sirius-components-collaborative-trees/src/test/java/org/eclipse/sirius/components/collaborative/trees/architecture/ArchitectureConstants.java index b01eb2affe..60ff6ae9dd 100644 --- a/packages/trees/backend/sirius-components-collaborative-trees/src/test/java/org/eclipse/sirius/components/collaborative/trees/architecture/ArchitectureConstants.java +++ b/packages/trees/backend/sirius-components-collaborative-trees/src/test/java/org/eclipse/sirius/components/collaborative/trees/architecture/ArchitectureConstants.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -22,7 +22,7 @@ * @author sbegaudeau */ public final class ArchitectureConstants { - public static final String SIRIUS_COMPONENTS_COLLABORATIVE_TREES_ROOT_PACKAGE = "org.eclipse.sirius.components.collaborative.trees.."; //$NON-NLS-1$ + public static final String SIRIUS_COMPONENTS_COLLABORATIVE_TREES_ROOT_PACKAGE = "org.eclipse.sirius.components.collaborative.trees.."; // @formatter:off public static final JavaClasses CLASSES = new ClassFileImporter() diff --git a/packages/trees/backend/sirius-components-trees-graphql/src/main/java/org/eclipse/sirius/components/trees/graphql/datafetchers/editingcontext/EditingContextTreePathDataFetcher.java b/packages/trees/backend/sirius-components-trees-graphql/src/main/java/org/eclipse/sirius/components/trees/graphql/datafetchers/editingcontext/EditingContextTreePathDataFetcher.java index 2066f7a1f3..51630ff0bc 100644 --- a/packages/trees/backend/sirius-components-trees-graphql/src/main/java/org/eclipse/sirius/components/trees/graphql/datafetchers/editingcontext/EditingContextTreePathDataFetcher.java +++ b/packages/trees/backend/sirius-components-trees-graphql/src/main/java/org/eclipse/sirius/components/trees/graphql/datafetchers/editingcontext/EditingContextTreePathDataFetcher.java @@ -34,9 +34,9 @@ @QueryDataFetcher(type = "EditingContext", field = "treePath") public class EditingContextTreePathDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String TREE_ID = "treeId"; //$NON-NLS-1$ + private static final String TREE_ID = "treeId"; - private static final String SELECTION_ENTRY_IDS = "selectionEntryIds"; //$NON-NLS-1$ + private static final String SELECTION_ENTRY_IDS = "selectionEntryIds"; private final IEditingContextEventProcessorRegistry editingContextEventProcessorRegistry; diff --git a/packages/trees/backend/sirius-components-trees-graphql/src/main/java/org/eclipse/sirius/components/trees/graphql/datafetchers/mutation/MutationDeleteTreeItemDataFetcher.java b/packages/trees/backend/sirius-components-trees-graphql/src/main/java/org/eclipse/sirius/components/trees/graphql/datafetchers/mutation/MutationDeleteTreeItemDataFetcher.java index caa7f5abc0..f4251866e9 100644 --- a/packages/trees/backend/sirius-components-trees-graphql/src/main/java/org/eclipse/sirius/components/trees/graphql/datafetchers/mutation/MutationDeleteTreeItemDataFetcher.java +++ b/packages/trees/backend/sirius-components-trees-graphql/src/main/java/org/eclipse/sirius/components/trees/graphql/datafetchers/mutation/MutationDeleteTreeItemDataFetcher.java @@ -34,7 +34,7 @@ @MutationDataFetcher(type = "Mutation", field = "deleteTreeItem") public class MutationDeleteTreeItemDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/trees/backend/sirius-components-trees-graphql/src/main/java/org/eclipse/sirius/components/trees/graphql/datafetchers/mutation/MutationRenameTreeItemDataFetcher.java b/packages/trees/backend/sirius-components-trees-graphql/src/main/java/org/eclipse/sirius/components/trees/graphql/datafetchers/mutation/MutationRenameTreeItemDataFetcher.java index 4b0a0626e2..82e69715f3 100644 --- a/packages/trees/backend/sirius-components-trees-graphql/src/main/java/org/eclipse/sirius/components/trees/graphql/datafetchers/mutation/MutationRenameTreeItemDataFetcher.java +++ b/packages/trees/backend/sirius-components-trees-graphql/src/main/java/org/eclipse/sirius/components/trees/graphql/datafetchers/mutation/MutationRenameTreeItemDataFetcher.java @@ -34,7 +34,7 @@ @MutationDataFetcher(type = "Mutation", field = "renameTreeItem") public class MutationRenameTreeItemDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/trees/backend/sirius-components-trees-graphql/src/main/java/org/eclipse/sirius/components/trees/graphql/datafetchers/subscription/SubscriptionTreeEventDataFetcher.java b/packages/trees/backend/sirius-components-trees-graphql/src/main/java/org/eclipse/sirius/components/trees/graphql/datafetchers/subscription/SubscriptionTreeEventDataFetcher.java index f5ff6c218a..afa2e391c2 100644 --- a/packages/trees/backend/sirius-components-trees-graphql/src/main/java/org/eclipse/sirius/components/trees/graphql/datafetchers/subscription/SubscriptionTreeEventDataFetcher.java +++ b/packages/trees/backend/sirius-components-trees-graphql/src/main/java/org/eclipse/sirius/components/trees/graphql/datafetchers/subscription/SubscriptionTreeEventDataFetcher.java @@ -37,7 +37,7 @@ @SubscriptionDataFetcher(type = "Subscription", field = "treeEvent") public class SubscriptionTreeEventDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/trees/backend/sirius-components-trees-graphql/src/test/java/org/eclipse/sirius/components/trees/graphql/architecture/ArchitectureConstants.java b/packages/trees/backend/sirius-components-trees-graphql/src/test/java/org/eclipse/sirius/components/trees/graphql/architecture/ArchitectureConstants.java index 9f9875c290..19d487225a 100644 --- a/packages/trees/backend/sirius-components-trees-graphql/src/test/java/org/eclipse/sirius/components/trees/graphql/architecture/ArchitectureConstants.java +++ b/packages/trees/backend/sirius-components-trees-graphql/src/test/java/org/eclipse/sirius/components/trees/graphql/architecture/ArchitectureConstants.java @@ -22,7 +22,7 @@ * @author gcoutable */ public final class ArchitectureConstants { - public static final String SIRIUS_COMPONENTS_TREES_GRAPHQL_ROOT_PACKAGE = "org.eclipse.sirius.components.trees.graphql.."; //$NON-NLS-1$ + public static final String SIRIUS_COMPONENTS_TREES_GRAPHQL_ROOT_PACKAGE = "org.eclipse.sirius.components.trees.graphql.."; // @formatter:off public static final JavaClasses CLASSES = new ClassFileImporter() diff --git a/packages/trees/backend/sirius-components-trees/src/main/java/org/eclipse/sirius/components/trees/Tree.java b/packages/trees/backend/sirius-components-trees/src/main/java/org/eclipse/sirius/components/trees/Tree.java index b2409c2c1d..7cdcdcbac8 100644 --- a/packages/trees/backend/sirius-components-trees/src/main/java/org/eclipse/sirius/components/trees/Tree.java +++ b/packages/trees/backend/sirius-components-trees/src/main/java/org/eclipse/sirius/components/trees/Tree.java @@ -28,7 +28,7 @@ public final class Tree implements IRepresentation { - public static final String KIND = IRepresentation.KIND_PREFIX + "?type=Tree"; //$NON-NLS-1$ + public static final String KIND = IRepresentation.KIND_PREFIX + "?type=Tree"; private String id; @@ -74,7 +74,7 @@ public static Builder newTree(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, descriptionId: {2}, label: {3}, childCount: {4}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, descriptionId: {2}, label: {3}, childCount: {4}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.descriptionId, this.label, this.children.size()); } diff --git a/packages/trees/backend/sirius-components-trees/src/main/java/org/eclipse/sirius/components/trees/TreeItem.java b/packages/trees/backend/sirius-components-trees/src/main/java/org/eclipse/sirius/components/trees/TreeItem.java index 069090f3af..bbbae739ee 100644 --- a/packages/trees/backend/sirius-components-trees/src/main/java/org/eclipse/sirius/components/trees/TreeItem.java +++ b/packages/trees/backend/sirius-components-trees/src/main/java/org/eclipse/sirius/components/trees/TreeItem.java @@ -26,7 +26,7 @@ @Immutable public final class TreeItem { - public static final String SELECTED_TREE_ITEM = "selectedTreeItem"; //$NON-NLS-1$ + public static final String SELECTED_TREE_ITEM = "selectedTreeItem"; private String id; @@ -92,7 +92,7 @@ public static Builder newTreeItem(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, kind: {2}, label: {3}, editable: {4}, deletable: {5}, imageURL: {6}, hasChildren: {7}, expanded: {8}, childCount: {9}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, kind: {2}, label: {3}, editable: {4}, deletable: {5}, imageURL: {6}, hasChildren: {7}, expanded: {8}, childCount: {9}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.kind, this.label, this.editable, this.deletable, this.imageURL, this.hasChildren, this.expanded, this.children.size()); } diff --git a/packages/trees/backend/sirius-components-trees/src/main/java/org/eclipse/sirius/components/trees/description/TreeDescription.java b/packages/trees/backend/sirius-components-trees/src/main/java/org/eclipse/sirius/components/trees/description/TreeDescription.java index 395898d113..d2c04065e0 100644 --- a/packages/trees/backend/sirius-components-trees/src/main/java/org/eclipse/sirius/components/trees/description/TreeDescription.java +++ b/packages/trees/backend/sirius-components-trees/src/main/java/org/eclipse/sirius/components/trees/description/TreeDescription.java @@ -134,7 +134,7 @@ public static Builder newTreeDescription(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label); } diff --git a/packages/trees/backend/sirius-components-trees/src/main/java/org/eclipse/sirius/components/trees/renderer/TreeRenderer.java b/packages/trees/backend/sirius-components-trees/src/main/java/org/eclipse/sirius/components/trees/renderer/TreeRenderer.java index 5c08d58d9e..87e8699b14 100644 --- a/packages/trees/backend/sirius-components-trees/src/main/java/org/eclipse/sirius/components/trees/renderer/TreeRenderer.java +++ b/packages/trees/backend/sirius-components-trees/src/main/java/org/eclipse/sirius/components/trees/renderer/TreeRenderer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -28,7 +28,7 @@ */ public class TreeRenderer { - public static final String EXPANDED = "expanded"; //$NON-NLS-1$ + public static final String EXPANDED = "expanded"; private VariableManager variableManager; diff --git a/packages/trees/backend/sirius-components-trees/src/test/java/org/eclipse/sirius/components/trees/architecture/ArchitectureConstants.java b/packages/trees/backend/sirius-components-trees/src/test/java/org/eclipse/sirius/components/trees/architecture/ArchitectureConstants.java index c4ffc1a65c..5177a93956 100644 --- a/packages/trees/backend/sirius-components-trees/src/test/java/org/eclipse/sirius/components/trees/architecture/ArchitectureConstants.java +++ b/packages/trees/backend/sirius-components-trees/src/test/java/org/eclipse/sirius/components/trees/architecture/ArchitectureConstants.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -22,7 +22,7 @@ * @author sbegaudeau */ public final class ArchitectureConstants { - public static final String SIRIUS_COMPONENTS_TREES_ROOT_PACKAGE = "org.eclipse.sirius.components.trees.."; //$NON-NLS-1$ + public static final String SIRIUS_COMPONENTS_TREES_ROOT_PACKAGE = "org.eclipse.sirius.components.trees.."; // @formatter:off public static final JavaClasses CLASSES = new ClassFileImporter() diff --git a/packages/validation/backend/sirius-components-collaborative-validation/src/main/java/org/eclipse/sirius/components/collaborative/validation/ValidationEventProcessor.java b/packages/validation/backend/sirius-components-collaborative-validation/src/main/java/org/eclipse/sirius/components/collaborative/validation/ValidationEventProcessor.java index eb80f95f0d..cc6346ca7c 100644 --- a/packages/validation/backend/sirius-components-collaborative-validation/src/main/java/org/eclipse/sirius/components/collaborative/validation/ValidationEventProcessor.java +++ b/packages/validation/backend/sirius-components-collaborative-validation/src/main/java/org/eclipse/sirius/components/collaborative/validation/ValidationEventProcessor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -89,7 +89,7 @@ public ValidationEventProcessor(IEditingContext editingContext, ValidationDescri // @formatter:off this.timer = Timer.builder(Monitoring.REPRESENTATION_EVENT_PROCESSOR_REFRESH) - .tag(Monitoring.NAME, "validation") //$NON-NLS-1$ + .tag(Monitoring.NAME, "validation") .register(meterRegistry); // @formatter:on @@ -116,7 +116,7 @@ public void handle(One payloadSink, Many changeDesc IValidationEventHandler validationEventHandler = optionalValidationEventHandler.get(); validationEventHandler.handle(payloadSink, changeDescriptionSink, this.validationContext.getValidation(), validationInput); } else { - this.logger.warn("No handler found for event: {}", validationInput); //$NON-NLS-1$ + this.logger.warn("No handler found for event: {}", validationInput); } } } @@ -132,7 +132,7 @@ public void refresh(ChangeDescription changeDescription) { if (this.sink.currentSubscriberCount() > 0) { EmitResult emitResult = this.sink.tryEmitNext(new ValidationRefreshedEventPayload(changeDescription.getInput().getId(), validation)); if (emitResult.isFailure()) { - String pattern = "An error has occurred while emitting a ValidationRefreshedEventPayload: {}"; //$NON-NLS-1$ + String pattern = "An error has occurred while emitting a ValidationRefreshedEventPayload: {}"; this.logger.warn(pattern, emitResult); } } @@ -166,7 +166,7 @@ private Validation refreshValidation() { ValidationComponentProps validationComponentProps = new ValidationComponentProps(variableManager, this.validationDescription, Optional.ofNullable(this.validationContext.getValidation())); Element element = new Element(ValidationComponent.class, validationComponentProps); Validation validation = new ValidationRenderer().render(element); - this.logger.trace("Validation refreshed: {}", this.editingContext.getId()); //$NON-NLS-1$ + this.logger.trace("Validation refreshed: {}", this.editingContext.getId()); return validation; } @@ -185,13 +185,13 @@ public Flux getOutputEvents(IInput input) { @Override public void dispose() { - this.logger.trace("Disposing the validation event processor {}", this.editingContext.getId()); //$NON-NLS-1$ + this.logger.trace("Disposing the validation event processor {}", this.editingContext.getId()); this.subscriptionManager.dispose(); EmitResult emitResult = this.sink.tryEmitComplete(); if (emitResult.isFailure()) { - String pattern = "An error has occurred while marking the publisher as complete: {}"; //$NON-NLS-1$ + String pattern = "An error has occurred while marking the publisher as complete: {}"; this.logger.warn(pattern, emitResult); } } diff --git a/packages/validation/backend/sirius-components-collaborative-validation/src/main/java/org/eclipse/sirius/components/collaborative/validation/api/ValidationConfiguration.java b/packages/validation/backend/sirius-components-collaborative-validation/src/main/java/org/eclipse/sirius/components/collaborative/validation/api/ValidationConfiguration.java index 0d4bc65af0..a8658c1e44 100644 --- a/packages/validation/backend/sirius-components-collaborative-validation/src/main/java/org/eclipse/sirius/components/collaborative/validation/api/ValidationConfiguration.java +++ b/packages/validation/backend/sirius-components-collaborative-validation/src/main/java/org/eclipse/sirius/components/collaborative/validation/api/ValidationConfiguration.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -26,7 +26,7 @@ public class ValidationConfiguration implements IRepresentationConfiguration { private final String validationId; public ValidationConfiguration(String editingContextId) { - String uniqueId = editingContextId + "validation"; //$NON-NLS-1$ + String uniqueId = editingContextId + "validation"; this.validationId = UUID.nameUUIDFromBytes(uniqueId.getBytes()).toString(); } diff --git a/packages/validation/backend/sirius-components-collaborative-validation/src/main/java/org/eclipse/sirius/components/collaborative/validation/dto/ValidationEventInput.java b/packages/validation/backend/sirius-components-collaborative-validation/src/main/java/org/eclipse/sirius/components/collaborative/validation/dto/ValidationEventInput.java index d44d9d60c2..2626cc6a9f 100644 --- a/packages/validation/backend/sirius-components-collaborative-validation/src/main/java/org/eclipse/sirius/components/collaborative/validation/dto/ValidationEventInput.java +++ b/packages/validation/backend/sirius-components-collaborative-validation/src/main/java/org/eclipse/sirius/components/collaborative/validation/dto/ValidationEventInput.java @@ -43,7 +43,7 @@ public String getEditingContextId() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, editingContextId: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, editingContextId: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.editingContextId); } diff --git a/packages/validation/backend/sirius-components-collaborative-validation/src/main/java/org/eclipse/sirius/components/collaborative/validation/dto/ValidationRefreshedEventPayload.java b/packages/validation/backend/sirius-components-collaborative-validation/src/main/java/org/eclipse/sirius/components/collaborative/validation/dto/ValidationRefreshedEventPayload.java index 70c5835a72..59b671886a 100644 --- a/packages/validation/backend/sirius-components-collaborative-validation/src/main/java/org/eclipse/sirius/components/collaborative/validation/dto/ValidationRefreshedEventPayload.java +++ b/packages/validation/backend/sirius-components-collaborative-validation/src/main/java/org/eclipse/sirius/components/collaborative/validation/dto/ValidationRefreshedEventPayload.java @@ -45,7 +45,7 @@ public Validation getValidation() { @Override public String toString() { - String pattern = "{0} '{'id: {1}, form: '{'id: {2}'}''}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, form: '{'id: {2}'}''}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.validation.getId()); } } diff --git a/packages/validation/backend/sirius-components-collaborative-validation/src/test/java/org/eclipse/sirius/components/collaborative/validation/architecture/ArchitectureConstants.java b/packages/validation/backend/sirius-components-collaborative-validation/src/test/java/org/eclipse/sirius/components/collaborative/validation/architecture/ArchitectureConstants.java index fddc050a37..04d9e5c930 100644 --- a/packages/validation/backend/sirius-components-collaborative-validation/src/test/java/org/eclipse/sirius/components/collaborative/validation/architecture/ArchitectureConstants.java +++ b/packages/validation/backend/sirius-components-collaborative-validation/src/test/java/org/eclipse/sirius/components/collaborative/validation/architecture/ArchitectureConstants.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -22,7 +22,7 @@ * @author gcoutable */ public final class ArchitectureConstants { - public static final String SIRIUS_COMPONENTS_COLLABORATIVE_VALIDATION_ROOT_PACKAGE = "org.eclipse.sirius.components.collaborative.validation.."; //$NON-NLS-1$ + public static final String SIRIUS_COMPONENTS_COLLABORATIVE_VALIDATION_ROOT_PACKAGE = "org.eclipse.sirius.components.collaborative.validation.."; // @formatter:off public static final JavaClasses CLASSES = new ClassFileImporter() diff --git a/packages/validation/backend/sirius-components-validation-graphql/src/main/java/org/eclipse/sirius/components/validation/graphql/datafetchers/subscription/SubscriptionValidationEventDataFetcher.java b/packages/validation/backend/sirius-components-validation-graphql/src/main/java/org/eclipse/sirius/components/validation/graphql/datafetchers/subscription/SubscriptionValidationEventDataFetcher.java index af1f0308ca..e8224ef31c 100644 --- a/packages/validation/backend/sirius-components-validation-graphql/src/main/java/org/eclipse/sirius/components/validation/graphql/datafetchers/subscription/SubscriptionValidationEventDataFetcher.java +++ b/packages/validation/backend/sirius-components-validation-graphql/src/main/java/org/eclipse/sirius/components/validation/graphql/datafetchers/subscription/SubscriptionValidationEventDataFetcher.java @@ -36,7 +36,7 @@ @SubscriptionDataFetcher(type = "Subscription", field = "validationEvent") public class SubscriptionValidationEventDataFetcher implements IDataFetcherWithFieldCoordinates> { - private static final String INPUT_ARGUMENT = "input"; //$NON-NLS-1$ + private static final String INPUT_ARGUMENT = "input"; private final ObjectMapper objectMapper; diff --git a/packages/validation/backend/sirius-components-validation-graphql/src/test/java/org/eclipse/sirius/components/validation/graphql/architecture/ArchitectureConstants.java b/packages/validation/backend/sirius-components-validation-graphql/src/test/java/org/eclipse/sirius/components/validation/graphql/architecture/ArchitectureConstants.java index 8d0d0788e0..295aa387ef 100644 --- a/packages/validation/backend/sirius-components-validation-graphql/src/test/java/org/eclipse/sirius/components/validation/graphql/architecture/ArchitectureConstants.java +++ b/packages/validation/backend/sirius-components-validation-graphql/src/test/java/org/eclipse/sirius/components/validation/graphql/architecture/ArchitectureConstants.java @@ -22,7 +22,7 @@ * @author gcoutable */ public final class ArchitectureConstants { - public static final String SIRIUS_COMPONENTS_VALIDATION_GRAPHQL_ROOT_PACKAGE = "org.eclipse.sirius.components.validation.graphql.."; //$NON-NLS-1$ + public static final String SIRIUS_COMPONENTS_VALIDATION_GRAPHQL_ROOT_PACKAGE = "org.eclipse.sirius.components.validation.graphql.."; // @formatter:off public static final JavaClasses CLASSES = new ClassFileImporter() diff --git a/packages/validation/backend/sirius-components-validation/src/main/java/org/eclipse/sirius/components/validation/Validation.java b/packages/validation/backend/sirius-components-validation/src/main/java/org/eclipse/sirius/components/validation/Validation.java index 9bee4fe1e3..56319040a8 100644 --- a/packages/validation/backend/sirius-components-validation/src/main/java/org/eclipse/sirius/components/validation/Validation.java +++ b/packages/validation/backend/sirius-components-validation/src/main/java/org/eclipse/sirius/components/validation/Validation.java @@ -26,7 +26,7 @@ */ @Immutable public final class Validation implements IRepresentation { - public static final String KIND = IRepresentation.KIND_PREFIX + "?type=Validation"; //$NON-NLS-1$ + public static final String KIND = IRepresentation.KIND_PREFIX + "?type=Validation"; private String id; @@ -72,7 +72,7 @@ public static Builder newValidation(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}, descriptionId: {3} diagnosticCount: {4}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}, descriptionId: {3} diagnosticCount: {4}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label, this.descriptionId, this.diagnostics.size()); } diff --git a/packages/validation/backend/sirius-components-validation/src/main/java/org/eclipse/sirius/components/validation/components/ValidationComponent.java b/packages/validation/backend/sirius-components-validation/src/main/java/org/eclipse/sirius/components/validation/components/ValidationComponent.java index 5938a35238..6678712bdf 100644 --- a/packages/validation/backend/sirius-components-validation/src/main/java/org/eclipse/sirius/components/validation/components/ValidationComponent.java +++ b/packages/validation/backend/sirius-components-validation/src/main/java/org/eclipse/sirius/components/validation/components/ValidationComponent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -42,7 +42,7 @@ public Element render() { ValidationDescription validationDescription = this.props.getValidationDescription(); Optional optionalPreviousValidation = this.props.getPreviousValidation(); - String id = optionalPreviousValidation.map(Validation::getId).orElseGet(() -> "validation"); //$NON-NLS-1$ + String id = optionalPreviousValidation.map(Validation::getId).orElseGet(() -> "validation"); String label = validationDescription.getLabel(); List diagnostics = validationDescription.getDiagnosticsProvider().apply(variableManager); diff --git a/packages/validation/backend/sirius-components-validation/src/main/java/org/eclipse/sirius/components/validation/description/ValidationDescription.java b/packages/validation/backend/sirius-components-validation/src/main/java/org/eclipse/sirius/components/validation/description/ValidationDescription.java index d7139982fc..0a5070e2c7 100644 --- a/packages/validation/backend/sirius-components-validation/src/main/java/org/eclipse/sirius/components/validation/description/ValidationDescription.java +++ b/packages/validation/backend/sirius-components-validation/src/main/java/org/eclipse/sirius/components/validation/description/ValidationDescription.java @@ -80,7 +80,7 @@ public static Builder newValidationDescription(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label); } diff --git a/packages/validation/backend/sirius-components-validation/src/main/java/org/eclipse/sirius/components/validation/elements/DiagnosticElementProps.java b/packages/validation/backend/sirius-components-validation/src/main/java/org/eclipse/sirius/components/validation/elements/DiagnosticElementProps.java index c838045ccf..1235d76a9b 100644 --- a/packages/validation/backend/sirius-components-validation/src/main/java/org/eclipse/sirius/components/validation/elements/DiagnosticElementProps.java +++ b/packages/validation/backend/sirius-components-validation/src/main/java/org/eclipse/sirius/components/validation/elements/DiagnosticElementProps.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -26,7 +26,7 @@ */ @Immutable public final class DiagnosticElementProps implements IProps { - public static final String TYPE = "Diagnostic"; //$NON-NLS-1$ + public static final String TYPE = "Diagnostic"; private UUID id; @@ -56,7 +56,7 @@ public static Builder newDiagnosticElementProps(UUID id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, kind: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, kind: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.kind); } diff --git a/packages/validation/backend/sirius-components-validation/src/main/java/org/eclipse/sirius/components/validation/elements/ValidationElementProps.java b/packages/validation/backend/sirius-components-validation/src/main/java/org/eclipse/sirius/components/validation/elements/ValidationElementProps.java index a5d1c2a769..00205ce951 100644 --- a/packages/validation/backend/sirius-components-validation/src/main/java/org/eclipse/sirius/components/validation/elements/ValidationElementProps.java +++ b/packages/validation/backend/sirius-components-validation/src/main/java/org/eclipse/sirius/components/validation/elements/ValidationElementProps.java @@ -27,7 +27,7 @@ */ @Immutable public final class ValidationElementProps implements IProps { - public static final String TYPE = "Validation"; //$NON-NLS-1$ + public static final String TYPE = "Validation"; private String id; @@ -64,7 +64,7 @@ public static Builder newValidationElementProps(String id) { @Override public String toString() { - String pattern = "{0} '{'id: {1}, label: {2}'}'"; //$NON-NLS-1$ + String pattern = "{0} '{'id: {1}, label: {2}'}'"; return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.label); } diff --git a/packages/validation/backend/sirius-components-validation/src/test/java/org/eclipse/sirius/components/validation/architecture/ArchitectureConstants.java b/packages/validation/backend/sirius-components-validation/src/test/java/org/eclipse/sirius/components/validation/architecture/ArchitectureConstants.java index aaff12b42f..f1bc7d15bf 100644 --- a/packages/validation/backend/sirius-components-validation/src/test/java/org/eclipse/sirius/components/validation/architecture/ArchitectureConstants.java +++ b/packages/validation/backend/sirius-components-validation/src/test/java/org/eclipse/sirius/components/validation/architecture/ArchitectureConstants.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -22,7 +22,7 @@ * @author gcoutable */ public final class ArchitectureConstants { - public static final String SIRIUS_COMPONENTS_VALIDATION_ROOT_PACKAGE = "org.eclipse.sirius.components.validation.."; //$NON-NLS-1$ + public static final String SIRIUS_COMPONENTS_VALIDATION_ROOT_PACKAGE = "org.eclipse.sirius.components.validation.."; // @formatter:off public static final JavaClasses CLASSES = new ClassFileImporter() diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/BarChartDescriptionItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/BarChartDescriptionItemProvider.java index 4571e136cc..dd81665a82 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/BarChartDescriptionItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/BarChartDescriptionItemProvider.java @@ -68,8 +68,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addValuesExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_BarChartDescription_valuesExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_BarChartDescription_valuesExpression_feature", "_UI_BarChartDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_BarChartDescription_valuesExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_BarChartDescription_valuesExpression_feature", "_UI_BarChartDescription_type"), ViewPackage.Literals.BAR_CHART_DESCRIPTION__VALUES_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -80,8 +80,8 @@ protected void addValuesExpressionPropertyDescriptor(Object object) { */ protected void addKeysExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_BarChartDescription_keysExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_BarChartDescription_keysExpression_feature", "_UI_BarChartDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_BarChartDescription_keysExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_BarChartDescription_keysExpression_feature", "_UI_BarChartDescription_type"), ViewPackage.Literals.BAR_CHART_DESCRIPTION__KEYS_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -93,8 +93,8 @@ protected void addKeysExpressionPropertyDescriptor(Object object) { */ protected void addYAxisLabelExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_BarChartDescription_yAxisLabelExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_BarChartDescription_yAxisLabelExpression_feature", "_UI_BarChartDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_BarChartDescription_yAxisLabelExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_BarChartDescription_yAxisLabelExpression_feature", "_UI_BarChartDescription_type"), ViewPackage.Literals.BAR_CHART_DESCRIPTION__YAXIS_LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -105,8 +105,8 @@ protected void addYAxisLabelExpressionPropertyDescriptor(Object object) { */ protected void addWidthPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_BarChartDescription_width_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_BarChartDescription_width_feature", "_UI_BarChartDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_BarChartDescription_width_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_BarChartDescription_width_feature", "_UI_BarChartDescription_type"), ViewPackage.Literals.BAR_CHART_DESCRIPTION__WIDTH, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } @@ -117,8 +117,8 @@ protected void addWidthPropertyDescriptor(Object object) { */ protected void addHeightPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_BarChartDescription_height_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_BarChartDescription_height_feature", "_UI_BarChartDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_BarChartDescription_height_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_BarChartDescription_height_feature", "_UI_BarChartDescription_type"), ViewPackage.Literals.BAR_CHART_DESCRIPTION__HEIGHT, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } @@ -160,7 +160,7 @@ protected EStructuralFeature getChildFeature(Object object, Object child) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/BarChartDescription.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/BarChartDescription.svg")); } /** @@ -181,8 +181,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((BarChartDescription) object).getName(); - return label == null || label.length() == 0 ? this.getString("_UI_BarChartDescription_type") : //$NON-NLS-1$ - this.getString("_UI_BarChartDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_BarChartDescription_type") : + this.getString("_UI_BarChartDescription_type") + " " + label; } /** @@ -241,7 +241,7 @@ public String getCreateChildText(Object owner, Object feature, Object child, Col boolean qualify = childFeature == ViewPackage.Literals.BAR_CHART_DESCRIPTION__STYLE || childFeature == ViewPackage.Literals.BAR_CHART_DESCRIPTION__CONDITIONAL_STYLES; if (qualify) { - return this.getString("_UI_CreateChild_text2", //$NON-NLS-1$ + return this.getString("_UI_CreateChild_text2", new Object[] { this.getTypeText(childObject), this.getFeatureText(childFeature), this.getTypeText(owner) }); } return super.getCreateChildText(owner, feature, child, selection); diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/BarChartDescriptionStyleItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/BarChartDescriptionStyleItemProvider.java index 28518dc11a..3632ba6156 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/BarChartDescriptionStyleItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/BarChartDescriptionStyleItemProvider.java @@ -67,8 +67,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addFontSizePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_fontSize_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_fontSize_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } @@ -79,8 +79,8 @@ protected void addFontSizePropertyDescriptor(Object object) { */ protected void addItalicPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__ITALIC, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -91,8 +91,8 @@ protected void addItalicPropertyDescriptor(Object object) { */ protected void addBoldPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__BOLD, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -103,8 +103,8 @@ protected void addBoldPropertyDescriptor(Object object) { */ protected void addUnderlinePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_underline_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_underline_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__UNDERLINE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -115,8 +115,8 @@ protected void addUnderlinePropertyDescriptor(Object object) { */ protected void addStrikeThroughPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_strikeThrough_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_strikeThrough_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__STRIKE_THROUGH, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -127,8 +127,8 @@ protected void addStrikeThroughPropertyDescriptor(Object object) { */ protected void addBarsColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_BarChartDescriptionStyle_barsColor_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_BarChartDescriptionStyle_barsColor_feature", "_UI_BarChartDescriptionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_BarChartDescriptionStyle_barsColor_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_BarChartDescriptionStyle_barsColor_feature", "_UI_BarChartDescriptionStyle_type"), ViewPackage.Literals.BAR_CHART_DESCRIPTION_STYLE__BARS_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -139,7 +139,7 @@ protected void addBarsColorPropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Style.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Style.svg")); } /** @@ -160,7 +160,7 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { BarChartDescriptionStyle barChartDescriptionStyle = (BarChartDescriptionStyle) object; - return this.getString("_UI_BarChartDescriptionStyle_type") + " " + barChartDescriptionStyle.getFontSize(); //$NON-NLS-1$ //$NON-NLS-2$ + return this.getString("_UI_BarChartDescriptionStyle_type") + " " + barChartDescriptionStyle.getFontSize(); } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ButtonDescriptionItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ButtonDescriptionItemProvider.java index 4c4a773a57..d2626d7dab 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ButtonDescriptionItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ButtonDescriptionItemProvider.java @@ -66,8 +66,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addButtonLabelExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_ButtonDescription_buttonLabelExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_ButtonDescription_buttonLabelExpression_feature", "_UI_ButtonDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_ButtonDescription_buttonLabelExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_ButtonDescription_buttonLabelExpression_feature", "_UI_ButtonDescription_type"), ViewPackage.Literals.BUTTON_DESCRIPTION__BUTTON_LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -78,8 +78,8 @@ protected void addButtonLabelExpressionPropertyDescriptor(Object object) { */ protected void addImageExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_ButtonDescription_imageExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_ButtonDescription_imageExpression_feature", "_UI_ButtonDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_ButtonDescription_imageExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_ButtonDescription_imageExpression_feature", "_UI_ButtonDescription_type"), ViewPackage.Literals.BUTTON_DESCRIPTION__IMAGE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -122,7 +122,7 @@ protected EStructuralFeature getChildFeature(Object object, Object child) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ButtonDescription.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ButtonDescription.svg")); } /** @@ -143,8 +143,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((ButtonDescription) object).getName(); - return label == null || label.length() == 0 ? this.getString("_UI_ButtonDescription_type") : //$NON-NLS-1$ - this.getString("_UI_ButtonDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_ButtonDescription_type") : + this.getString("_UI_ButtonDescription_type") + " " + label; } /** @@ -215,7 +215,7 @@ public String getCreateChildText(Object owner, Object feature, Object child, Col boolean qualify = childFeature == ViewPackage.Literals.BUTTON_DESCRIPTION__STYLE || childFeature == ViewPackage.Literals.BUTTON_DESCRIPTION__CONDITIONAL_STYLES; if (qualify) { - return this.getString("_UI_CreateChild_text2", //$NON-NLS-1$ + return this.getString("_UI_CreateChild_text2", new Object[] { this.getTypeText(childObject), this.getFeatureText(childFeature), this.getTypeText(owner) }); } return super.getCreateChildText(owner, feature, child, selection); diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ButtonDescriptionStyleItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ButtonDescriptionStyleItemProvider.java index c83aa55cb7..30c8bb5a7e 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ButtonDescriptionStyleItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ButtonDescriptionStyleItemProvider.java @@ -68,8 +68,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addFontSizePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_fontSize_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_fontSize_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } @@ -80,8 +80,8 @@ protected void addFontSizePropertyDescriptor(Object object) { */ protected void addItalicPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__ITALIC, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -92,8 +92,8 @@ protected void addItalicPropertyDescriptor(Object object) { */ protected void addBoldPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__BOLD, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -104,8 +104,8 @@ protected void addBoldPropertyDescriptor(Object object) { */ protected void addUnderlinePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_underline_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_underline_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__UNDERLINE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -116,8 +116,8 @@ protected void addUnderlinePropertyDescriptor(Object object) { */ protected void addStrikeThroughPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_strikeThrough_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_strikeThrough_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__STRIKE_THROUGH, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -128,8 +128,8 @@ protected void addStrikeThroughPropertyDescriptor(Object object) { */ protected void addBackgroundColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_ButtonDescriptionStyle_backgroundColor_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_ButtonDescriptionStyle_backgroundColor_feature", "_UI_ButtonDescriptionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_ButtonDescriptionStyle_backgroundColor_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_ButtonDescriptionStyle_backgroundColor_feature", "_UI_ButtonDescriptionStyle_type"), ViewPackage.Literals.BUTTON_DESCRIPTION_STYLE__BACKGROUND_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -140,8 +140,8 @@ protected void addBackgroundColorPropertyDescriptor(Object object) { */ protected void addForegroundColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_ButtonDescriptionStyle_foregroundColor_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_ButtonDescriptionStyle_foregroundColor_feature", "_UI_ButtonDescriptionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_ButtonDescriptionStyle_foregroundColor_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_ButtonDescriptionStyle_foregroundColor_feature", "_UI_ButtonDescriptionStyle_type"), ViewPackage.Literals.BUTTON_DESCRIPTION_STYLE__FOREGROUND_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -152,7 +152,7 @@ protected void addForegroundColorPropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Style.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Style.svg")); } /** @@ -173,7 +173,7 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { ButtonDescriptionStyle buttonDescriptionStyle = (ButtonDescriptionStyle) object; - return this.getString("_UI_ButtonDescriptionStyle_type") + " " + buttonDescriptionStyle.getFontSize(); //$NON-NLS-1$ //$NON-NLS-2$ + return this.getString("_UI_ButtonDescriptionStyle_type") + " " + buttonDescriptionStyle.getFontSize(); } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ChangeContextItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ChangeContextItemProvider.java index 136821c2c3..7f99c0110b 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ChangeContextItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ChangeContextItemProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -62,8 +62,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_ChangeContext_expression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_ChangeContext_expression_feature", "_UI_ChangeContext_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_ChangeContext_expression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_ChangeContext_expression_feature", "_UI_ChangeContext_type"), ViewPackage.Literals.CHANGE_CONTEXT__EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -74,7 +74,7 @@ protected void addExpressionPropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ChangeContext.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ChangeContext.svg")); } /** @@ -95,8 +95,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((ChangeContext) object).getExpression(); - return label == null || label.length() == 0 ? this.getString("_UI_ChangeContext_type") : //$NON-NLS-1$ - this.getString("_UI_ChangeContext_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_ChangeContext_type") : + this.getString("_UI_ChangeContext_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/CheckboxDescriptionItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/CheckboxDescriptionItemProvider.java index 017d697aec..9a174eb6ab 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/CheckboxDescriptionItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/CheckboxDescriptionItemProvider.java @@ -64,8 +64,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addValueExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_CheckboxDescription_valueExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_CheckboxDescription_valueExpression_feature", "_UI_CheckboxDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_CheckboxDescription_valueExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_CheckboxDescription_valueExpression_feature", "_UI_CheckboxDescription_type"), ViewPackage.Literals.CHECKBOX_DESCRIPTION__VALUE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -108,7 +108,7 @@ protected EStructuralFeature getChildFeature(Object object, Object child) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/CheckboxDescription.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/CheckboxDescription.svg")); } /** @@ -129,8 +129,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((CheckboxDescription) object).getName(); - return label == null || label.length() == 0 ? this.getString("_UI_CheckboxDescription_type") : //$NON-NLS-1$ - this.getString("_UI_CheckboxDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_CheckboxDescription_type") : + this.getString("_UI_CheckboxDescription_type") + " " + label; } /** @@ -200,7 +200,7 @@ public String getCreateChildText(Object owner, Object feature, Object child, Col boolean qualify = childFeature == ViewPackage.Literals.CHECKBOX_DESCRIPTION__STYLE || childFeature == ViewPackage.Literals.CHECKBOX_DESCRIPTION__CONDITIONAL_STYLES; if (qualify) { - return this.getString("_UI_CreateChild_text2", //$NON-NLS-1$ + return this.getString("_UI_CreateChild_text2", new Object[] { this.getTypeText(childObject), this.getFeatureText(childFeature), this.getTypeText(owner) }); } return super.getCreateChildText(owner, feature, child, selection); diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/CheckboxDescriptionStyleItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/CheckboxDescriptionStyleItemProvider.java index f82d7c1c84..bdc55abf70 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/CheckboxDescriptionStyleItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/CheckboxDescriptionStyleItemProvider.java @@ -62,8 +62,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_CheckboxDescriptionStyle_color_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_CheckboxDescriptionStyle_color_feature", "_UI_CheckboxDescriptionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_CheckboxDescriptionStyle_color_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_CheckboxDescriptionStyle_color_feature", "_UI_CheckboxDescriptionStyle_type"), ViewPackage.Literals.CHECKBOX_DESCRIPTION_STYLE__COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -74,7 +74,7 @@ protected void addColorPropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Style.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Style.svg")); } /** @@ -95,8 +95,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((CheckboxDescriptionStyle) object).getColor(); - return label == null || label.length() == 0 ? this.getString("_UI_CheckboxDescriptionStyle_type") : //$NON-NLS-1$ - this.getString("_UI_CheckboxDescriptionStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_CheckboxDescriptionStyle_type") : + this.getString("_UI_CheckboxDescriptionStyle_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalBarChartDescriptionStyleItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalBarChartDescriptionStyleItemProvider.java index d7d4c5abe7..e92098db7d 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalBarChartDescriptionStyleItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalBarChartDescriptionStyleItemProvider.java @@ -68,8 +68,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addFontSizePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_fontSize_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_fontSize_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } @@ -80,8 +80,8 @@ protected void addFontSizePropertyDescriptor(Object object) { */ protected void addItalicPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__ITALIC, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -92,8 +92,8 @@ protected void addItalicPropertyDescriptor(Object object) { */ protected void addBoldPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__BOLD, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -104,8 +104,8 @@ protected void addBoldPropertyDescriptor(Object object) { */ protected void addUnderlinePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_underline_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_underline_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__UNDERLINE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -116,8 +116,8 @@ protected void addUnderlinePropertyDescriptor(Object object) { */ protected void addStrikeThroughPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_strikeThrough_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_strikeThrough_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__STRIKE_THROUGH, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -128,8 +128,8 @@ protected void addStrikeThroughPropertyDescriptor(Object object) { */ protected void addBarsColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_BarChartDescriptionStyle_barsColor_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_BarChartDescriptionStyle_barsColor_feature", "_UI_BarChartDescriptionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_BarChartDescriptionStyle_barsColor_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_BarChartDescriptionStyle_barsColor_feature", "_UI_BarChartDescriptionStyle_type"), ViewPackage.Literals.BAR_CHART_DESCRIPTION_STYLE__BARS_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -140,7 +140,7 @@ protected void addBarsColorPropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ConditionalStyle.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ConditionalStyle.svg")); } /** @@ -161,8 +161,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((ConditionalBarChartDescriptionStyle) object).getCondition(); - return label == null || label.length() == 0 ? this.getString("_UI_ConditionalBarChartDescriptionStyle_type") : //$NON-NLS-1$ - this.getString("_UI_ConditionalBarChartDescriptionStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_ConditionalBarChartDescriptionStyle_type") : + this.getString("_UI_ConditionalBarChartDescriptionStyle_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalButtonDescriptionStyleItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalButtonDescriptionStyleItemProvider.java index 4f41990da0..5eb9118cdd 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalButtonDescriptionStyleItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalButtonDescriptionStyleItemProvider.java @@ -68,8 +68,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addFontSizePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_fontSize_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_fontSize_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } @@ -80,8 +80,8 @@ protected void addFontSizePropertyDescriptor(Object object) { */ protected void addItalicPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__ITALIC, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -92,8 +92,8 @@ protected void addItalicPropertyDescriptor(Object object) { */ protected void addBoldPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__BOLD, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -104,8 +104,8 @@ protected void addBoldPropertyDescriptor(Object object) { */ protected void addUnderlinePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_underline_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_underline_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__UNDERLINE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -116,8 +116,8 @@ protected void addUnderlinePropertyDescriptor(Object object) { */ protected void addStrikeThroughPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_strikeThrough_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_strikeThrough_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__STRIKE_THROUGH, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -128,8 +128,8 @@ protected void addStrikeThroughPropertyDescriptor(Object object) { */ protected void addBackgroundColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_ButtonDescriptionStyle_backgroundColor_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_ButtonDescriptionStyle_backgroundColor_feature", "_UI_ButtonDescriptionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_ButtonDescriptionStyle_backgroundColor_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_ButtonDescriptionStyle_backgroundColor_feature", "_UI_ButtonDescriptionStyle_type"), ViewPackage.Literals.BUTTON_DESCRIPTION_STYLE__BACKGROUND_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -140,8 +140,8 @@ protected void addBackgroundColorPropertyDescriptor(Object object) { */ protected void addForegroundColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_ButtonDescriptionStyle_foregroundColor_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_ButtonDescriptionStyle_foregroundColor_feature", "_UI_ButtonDescriptionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_ButtonDescriptionStyle_foregroundColor_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_ButtonDescriptionStyle_foregroundColor_feature", "_UI_ButtonDescriptionStyle_type"), ViewPackage.Literals.BUTTON_DESCRIPTION_STYLE__FOREGROUND_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -152,7 +152,7 @@ protected void addForegroundColorPropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ConditionalStyle.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ConditionalStyle.svg")); } /** @@ -173,8 +173,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((ConditionalButtonDescriptionStyle) object).getCondition(); - return label == null || label.length() == 0 ? this.getString("_UI_ConditionalButtonDescriptionStyle_type") : //$NON-NLS-1$ - this.getString("_UI_ConditionalButtonDescriptionStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_ConditionalButtonDescriptionStyle_type") : + this.getString("_UI_ConditionalButtonDescriptionStyle_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalCheckboxDescriptionStyleItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalCheckboxDescriptionStyleItemProvider.java index 6886982605..b72f36bf2a 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalCheckboxDescriptionStyleItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalCheckboxDescriptionStyleItemProvider.java @@ -63,8 +63,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_CheckboxDescriptionStyle_color_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_CheckboxDescriptionStyle_color_feature", "_UI_CheckboxDescriptionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_CheckboxDescriptionStyle_color_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_CheckboxDescriptionStyle_color_feature", "_UI_CheckboxDescriptionStyle_type"), ViewPackage.Literals.CHECKBOX_DESCRIPTION_STYLE__COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -75,7 +75,7 @@ protected void addColorPropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ConditionalStyle.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ConditionalStyle.svg")); } /** @@ -96,8 +96,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((ConditionalCheckboxDescriptionStyle) object).getCondition(); - return label == null || label.length() == 0 ? this.getString("_UI_ConditionalCheckboxDescriptionStyle_type") : //$NON-NLS-1$ - this.getString("_UI_ConditionalCheckboxDescriptionStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_ConditionalCheckboxDescriptionStyle_type") : + this.getString("_UI_ConditionalCheckboxDescriptionStyle_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalEdgeStyleItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalEdgeStyleItemProvider.java index fe9d7c9dec..d5c16f27cb 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalEdgeStyleItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalEdgeStyleItemProvider.java @@ -72,8 +72,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors - .add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_Style_color_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_Style_color_feature", "_UI_Style_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + .add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_Style_color_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_Style_color_feature", "_UI_Style_type"), ViewPackage.Literals.STYLE__COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -84,8 +84,8 @@ protected void addColorPropertyDescriptor(Object object) { */ protected void addFontSizePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_fontSize_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_fontSize_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } @@ -96,8 +96,8 @@ protected void addFontSizePropertyDescriptor(Object object) { */ protected void addItalicPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__ITALIC, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -108,8 +108,8 @@ protected void addItalicPropertyDescriptor(Object object) { */ protected void addBoldPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__BOLD, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -120,8 +120,8 @@ protected void addBoldPropertyDescriptor(Object object) { */ protected void addUnderlinePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_underline_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_underline_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__UNDERLINE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -132,8 +132,8 @@ protected void addUnderlinePropertyDescriptor(Object object) { */ protected void addStrikeThroughPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_strikeThrough_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_strikeThrough_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__STRIKE_THROUGH, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -144,8 +144,8 @@ protected void addStrikeThroughPropertyDescriptor(Object object) { */ protected void addLineStylePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_EdgeStyle_lineStyle_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyle_lineStyle_feature", "_UI_EdgeStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_EdgeStyle_lineStyle_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyle_lineStyle_feature", "_UI_EdgeStyle_type"), ViewPackage.Literals.EDGE_STYLE__LINE_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -156,8 +156,8 @@ protected void addLineStylePropertyDescriptor(Object object) { */ protected void addSourceArrowStylePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_EdgeStyle_sourceArrowStyle_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyle_sourceArrowStyle_feature", "_UI_EdgeStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_EdgeStyle_sourceArrowStyle_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyle_sourceArrowStyle_feature", "_UI_EdgeStyle_type"), ViewPackage.Literals.EDGE_STYLE__SOURCE_ARROW_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -168,8 +168,8 @@ protected void addSourceArrowStylePropertyDescriptor(Object object) { */ protected void addTargetArrowStylePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_EdgeStyle_targetArrowStyle_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyle_targetArrowStyle_feature", "_UI_EdgeStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_EdgeStyle_targetArrowStyle_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyle_targetArrowStyle_feature", "_UI_EdgeStyle_type"), ViewPackage.Literals.EDGE_STYLE__TARGET_ARROW_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -180,8 +180,8 @@ protected void addTargetArrowStylePropertyDescriptor(Object object) { */ protected void addEdgeWidthPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_EdgeStyle_edgeWidth_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyle_edgeWidth_feature", "_UI_EdgeStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_EdgeStyle_edgeWidth_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyle_edgeWidth_feature", "_UI_EdgeStyle_type"), ViewPackage.Literals.EDGE_STYLE__EDGE_WIDTH, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } @@ -192,8 +192,8 @@ protected void addEdgeWidthPropertyDescriptor(Object object) { */ protected void addShowIconPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_EdgeStyle_showIcon_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyle_showIcon_feature", "_UI_EdgeStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_EdgeStyle_showIcon_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyle_showIcon_feature", "_UI_EdgeStyle_type"), ViewPackage.Literals.EDGE_STYLE__SHOW_ICON, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -204,7 +204,7 @@ protected void addShowIconPropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ConditionalStyle.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ConditionalStyle.svg")); } /** @@ -225,8 +225,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((ConditionalEdgeStyle) object).getCondition(); - return label == null || label.length() == 0 ? this.getString("_UI_ConditionalEdgeStyle_type") : //$NON-NLS-1$ - this.getString("_UI_ConditionalEdgeStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_ConditionalEdgeStyle_type") : + this.getString("_UI_ConditionalEdgeStyle_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalItemProvider.java index a5f39675b7..ff223d8c22 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalItemProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -70,8 +70,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addConditionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_Conditional_condition_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_Conditional_condition_feature", "_UI_Conditional_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_Conditional_condition_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_Conditional_condition_feature", "_UI_Conditional_type"), ViewPackage.Literals.CONDITIONAL__CONDITION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -82,7 +82,7 @@ protected void addConditionPropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Conditional")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Conditional")); } /** @@ -103,8 +103,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((Conditional) object).getCondition(); - return label == null || label.length() == 0 ? this.getString("_UI_Conditional_type") : //$NON-NLS-1$ - this.getString("_UI_Conditional_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_Conditional_type") : + this.getString("_UI_Conditional_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalLabelDescriptionStyleItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalLabelDescriptionStyleItemProvider.java index f825cd927c..f07f093d7b 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalLabelDescriptionStyleItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalLabelDescriptionStyleItemProvider.java @@ -67,8 +67,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addFontSizePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_fontSize_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_fontSize_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } @@ -79,8 +79,8 @@ protected void addFontSizePropertyDescriptor(Object object) { */ protected void addItalicPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__ITALIC, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -91,8 +91,8 @@ protected void addItalicPropertyDescriptor(Object object) { */ protected void addBoldPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__BOLD, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -103,8 +103,8 @@ protected void addBoldPropertyDescriptor(Object object) { */ protected void addUnderlinePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_underline_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_underline_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__UNDERLINE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -115,8 +115,8 @@ protected void addUnderlinePropertyDescriptor(Object object) { */ protected void addStrikeThroughPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_strikeThrough_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_strikeThrough_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__STRIKE_THROUGH, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -127,8 +127,8 @@ protected void addStrikeThroughPropertyDescriptor(Object object) { */ protected void addColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelDescriptionStyle_color_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelDescriptionStyle_color_feature", "_UI_LabelDescriptionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelDescriptionStyle_color_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelDescriptionStyle_color_feature", "_UI_LabelDescriptionStyle_type"), ViewPackage.Literals.LABEL_DESCRIPTION_STYLE__COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -139,7 +139,7 @@ protected void addColorPropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ConditionalStyle.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ConditionalStyle.svg")); } /** @@ -160,8 +160,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((ConditionalLabelDescriptionStyle) object).getCondition(); - return label == null || label.length() == 0 ? this.getString("_UI_ConditionalLabelDescriptionStyle_type") : //$NON-NLS-1$ - this.getString("_UI_ConditionalLabelDescriptionStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_ConditionalLabelDescriptionStyle_type") : + this.getString("_UI_ConditionalLabelDescriptionStyle_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalLinkDescriptionStyleItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalLinkDescriptionStyleItemProvider.java index 9a3c72b452..be18913b5d 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalLinkDescriptionStyleItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalLinkDescriptionStyleItemProvider.java @@ -67,8 +67,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addFontSizePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_fontSize_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_fontSize_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } @@ -79,8 +79,8 @@ protected void addFontSizePropertyDescriptor(Object object) { */ protected void addItalicPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__ITALIC, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -91,8 +91,8 @@ protected void addItalicPropertyDescriptor(Object object) { */ protected void addBoldPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__BOLD, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -103,8 +103,8 @@ protected void addBoldPropertyDescriptor(Object object) { */ protected void addUnderlinePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_underline_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_underline_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__UNDERLINE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -115,8 +115,8 @@ protected void addUnderlinePropertyDescriptor(Object object) { */ protected void addStrikeThroughPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_strikeThrough_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_strikeThrough_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__STRIKE_THROUGH, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -127,8 +127,8 @@ protected void addStrikeThroughPropertyDescriptor(Object object) { */ protected void addColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LinkDescriptionStyle_color_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LinkDescriptionStyle_color_feature", "_UI_LinkDescriptionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LinkDescriptionStyle_color_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LinkDescriptionStyle_color_feature", "_UI_LinkDescriptionStyle_type"), ViewPackage.Literals.LINK_DESCRIPTION_STYLE__COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -139,7 +139,7 @@ protected void addColorPropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ConditionalStyle.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ConditionalStyle.svg")); } /** @@ -160,8 +160,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((ConditionalLinkDescriptionStyle) object).getCondition(); - return label == null || label.length() == 0 ? this.getString("_UI_ConditionalLinkDescriptionStyle_type") : //$NON-NLS-1$ - this.getString("_UI_ConditionalLinkDescriptionStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_ConditionalLinkDescriptionStyle_type") : + this.getString("_UI_ConditionalLinkDescriptionStyle_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalListDescriptionStyleItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalListDescriptionStyleItemProvider.java index 17df790447..e4ab7dd6ca 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalListDescriptionStyleItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalListDescriptionStyleItemProvider.java @@ -67,8 +67,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addFontSizePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_fontSize_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_fontSize_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } @@ -79,8 +79,8 @@ protected void addFontSizePropertyDescriptor(Object object) { */ protected void addItalicPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__ITALIC, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -91,8 +91,8 @@ protected void addItalicPropertyDescriptor(Object object) { */ protected void addBoldPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__BOLD, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -103,8 +103,8 @@ protected void addBoldPropertyDescriptor(Object object) { */ protected void addUnderlinePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_underline_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_underline_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__UNDERLINE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -115,8 +115,8 @@ protected void addUnderlinePropertyDescriptor(Object object) { */ protected void addStrikeThroughPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_strikeThrough_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_strikeThrough_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__STRIKE_THROUGH, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -127,8 +127,8 @@ protected void addStrikeThroughPropertyDescriptor(Object object) { */ protected void addColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_ListDescriptionStyle_color_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_ListDescriptionStyle_color_feature", "_UI_ListDescriptionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_ListDescriptionStyle_color_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_ListDescriptionStyle_color_feature", "_UI_ListDescriptionStyle_type"), ViewPackage.Literals.LIST_DESCRIPTION_STYLE__COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -139,7 +139,7 @@ protected void addColorPropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ConditionalStyle.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ConditionalStyle.svg")); } /** @@ -160,8 +160,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((ConditionalListDescriptionStyle) object).getCondition(); - return label == null || label.length() == 0 ? this.getString("_UI_ConditionalListDescriptionStyle_type") : //$NON-NLS-1$ - this.getString("_UI_ConditionalListDescriptionStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_ConditionalListDescriptionStyle_type") : + this.getString("_UI_ConditionalListDescriptionStyle_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalMultiSelectDescriptionStyleItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalMultiSelectDescriptionStyleItemProvider.java index 10a88a08f1..0656b9058b 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalMultiSelectDescriptionStyleItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalMultiSelectDescriptionStyleItemProvider.java @@ -69,8 +69,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addFontSizePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_fontSize_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_fontSize_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } @@ -81,8 +81,8 @@ protected void addFontSizePropertyDescriptor(Object object) { */ protected void addItalicPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__ITALIC, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -93,8 +93,8 @@ protected void addItalicPropertyDescriptor(Object object) { */ protected void addBoldPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__BOLD, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -105,8 +105,8 @@ protected void addBoldPropertyDescriptor(Object object) { */ protected void addUnderlinePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_underline_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_underline_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__UNDERLINE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -117,8 +117,8 @@ protected void addUnderlinePropertyDescriptor(Object object) { */ protected void addStrikeThroughPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_strikeThrough_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_strikeThrough_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__STRIKE_THROUGH, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -129,8 +129,8 @@ protected void addStrikeThroughPropertyDescriptor(Object object) { */ protected void addBackgroundColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_MultiSelectDescriptionStyle_backgroundColor_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_MultiSelectDescriptionStyle_backgroundColor_feature", "_UI_MultiSelectDescriptionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_MultiSelectDescriptionStyle_backgroundColor_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_MultiSelectDescriptionStyle_backgroundColor_feature", "_UI_MultiSelectDescriptionStyle_type"), ViewPackage.Literals.MULTI_SELECT_DESCRIPTION_STYLE__BACKGROUND_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -141,8 +141,8 @@ protected void addBackgroundColorPropertyDescriptor(Object object) { */ protected void addForegroundColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_MultiSelectDescriptionStyle_foregroundColor_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_MultiSelectDescriptionStyle_foregroundColor_feature", "_UI_MultiSelectDescriptionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_MultiSelectDescriptionStyle_foregroundColor_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_MultiSelectDescriptionStyle_foregroundColor_feature", "_UI_MultiSelectDescriptionStyle_type"), ViewPackage.Literals.MULTI_SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -153,7 +153,7 @@ protected void addForegroundColorPropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ConditionalStyle.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ConditionalStyle.svg")); } /** @@ -174,8 +174,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((ConditionalMultiSelectDescriptionStyle) object).getCondition(); - return label == null || label.length() == 0 ? this.getString("_UI_ConditionalMultiSelectDescriptionStyle_type") : //$NON-NLS-1$ - this.getString("_UI_ConditionalMultiSelectDescriptionStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_ConditionalMultiSelectDescriptionStyle_type") : + this.getString("_UI_ConditionalMultiSelectDescriptionStyle_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalNodeStyleItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalNodeStyleItemProvider.java index 79b024cb39..e9a413c9cc 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalNodeStyleItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalNodeStyleItemProvider.java @@ -91,7 +91,7 @@ protected EStructuralFeature getChildFeature(Object object, Object child) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ConditionalNodeStyle.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ConditionalNodeStyle.svg")); } /** @@ -112,8 +112,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((ConditionalNodeStyle) object).getCondition(); - return label == null || label.length() == 0 ? this.getString("_UI_ConditionalNodeStyle_type") : //$NON-NLS-1$ - this.getString("_UI_ConditionalNodeStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_ConditionalNodeStyle_type") : + this.getString("_UI_ConditionalNodeStyle_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalPieChartDescriptionStyleItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalPieChartDescriptionStyleItemProvider.java index 471ea36ded..c0006670e0 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalPieChartDescriptionStyleItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalPieChartDescriptionStyleItemProvider.java @@ -70,8 +70,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addFontSizePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_fontSize_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_fontSize_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } @@ -82,8 +82,8 @@ protected void addFontSizePropertyDescriptor(Object object) { */ protected void addItalicPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__ITALIC, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -94,8 +94,8 @@ protected void addItalicPropertyDescriptor(Object object) { */ protected void addBoldPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__BOLD, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -106,8 +106,8 @@ protected void addBoldPropertyDescriptor(Object object) { */ protected void addUnderlinePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_underline_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_underline_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__UNDERLINE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -118,8 +118,8 @@ protected void addUnderlinePropertyDescriptor(Object object) { */ protected void addStrikeThroughPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_strikeThrough_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_strikeThrough_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__STRIKE_THROUGH, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -130,8 +130,8 @@ protected void addStrikeThroughPropertyDescriptor(Object object) { */ protected void addColorsPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_PieChartDescriptionStyle_colors_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_PieChartDescriptionStyle_colors_feature", "_UI_PieChartDescriptionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_PieChartDescriptionStyle_colors_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_PieChartDescriptionStyle_colors_feature", "_UI_PieChartDescriptionStyle_type"), ViewPackage.Literals.PIE_CHART_DESCRIPTION_STYLE__COLORS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -142,8 +142,8 @@ protected void addColorsPropertyDescriptor(Object object) { */ protected void addStrokeWidthPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_PieChartDescriptionStyle_strokeWidth_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_PieChartDescriptionStyle_strokeWidth_feature", "_UI_PieChartDescriptionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_PieChartDescriptionStyle_strokeWidth_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_PieChartDescriptionStyle_strokeWidth_feature", "_UI_PieChartDescriptionStyle_type"), ViewPackage.Literals.PIE_CHART_DESCRIPTION_STYLE__STROKE_WIDTH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -154,8 +154,8 @@ protected void addStrokeWidthPropertyDescriptor(Object object) { */ protected void addStrokeColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_PieChartDescriptionStyle_strokeColor_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_PieChartDescriptionStyle_strokeColor_feature", "_UI_PieChartDescriptionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_PieChartDescriptionStyle_strokeColor_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_PieChartDescriptionStyle_strokeColor_feature", "_UI_PieChartDescriptionStyle_type"), ViewPackage.Literals.PIE_CHART_DESCRIPTION_STYLE__STROKE_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -166,7 +166,7 @@ protected void addStrokeColorPropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ConditionalStyle.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ConditionalStyle.svg")); } /** @@ -187,8 +187,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((ConditionalPieChartDescriptionStyle) object).getCondition(); - return label == null || label.length() == 0 ? this.getString("_UI_ConditionalPieChartDescriptionStyle_type") : //$NON-NLS-1$ - this.getString("_UI_ConditionalPieChartDescriptionStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_ConditionalPieChartDescriptionStyle_type") : + this.getString("_UI_ConditionalPieChartDescriptionStyle_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalRadioDescriptionStyleItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalRadioDescriptionStyleItemProvider.java index 3fd699df24..2116926228 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalRadioDescriptionStyleItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalRadioDescriptionStyleItemProvider.java @@ -67,8 +67,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addFontSizePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_fontSize_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_fontSize_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } @@ -79,8 +79,8 @@ protected void addFontSizePropertyDescriptor(Object object) { */ protected void addItalicPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__ITALIC, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -91,8 +91,8 @@ protected void addItalicPropertyDescriptor(Object object) { */ protected void addBoldPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__BOLD, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -103,8 +103,8 @@ protected void addBoldPropertyDescriptor(Object object) { */ protected void addUnderlinePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_underline_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_underline_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__UNDERLINE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -115,8 +115,8 @@ protected void addUnderlinePropertyDescriptor(Object object) { */ protected void addStrikeThroughPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_strikeThrough_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_strikeThrough_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__STRIKE_THROUGH, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -127,8 +127,8 @@ protected void addStrikeThroughPropertyDescriptor(Object object) { */ protected void addColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_RadioDescriptionStyle_color_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_RadioDescriptionStyle_color_feature", "_UI_RadioDescriptionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_RadioDescriptionStyle_color_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_RadioDescriptionStyle_color_feature", "_UI_RadioDescriptionStyle_type"), ViewPackage.Literals.RADIO_DESCRIPTION_STYLE__COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -139,7 +139,7 @@ protected void addColorPropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ConditionalStyle.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ConditionalStyle.svg")); } /** @@ -160,8 +160,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((ConditionalRadioDescriptionStyle) object).getCondition(); - return label == null || label.length() == 0 ? this.getString("_UI_ConditionalRadioDescriptionStyle_type") : //$NON-NLS-1$ - this.getString("_UI_ConditionalRadioDescriptionStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_ConditionalRadioDescriptionStyle_type") : + this.getString("_UI_ConditionalRadioDescriptionStyle_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalSelectDescriptionStyleItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalSelectDescriptionStyleItemProvider.java index 686874f22e..0ab8c64e72 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalSelectDescriptionStyleItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalSelectDescriptionStyleItemProvider.java @@ -68,8 +68,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addFontSizePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_fontSize_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_fontSize_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } @@ -80,8 +80,8 @@ protected void addFontSizePropertyDescriptor(Object object) { */ protected void addItalicPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__ITALIC, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -92,8 +92,8 @@ protected void addItalicPropertyDescriptor(Object object) { */ protected void addBoldPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__BOLD, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -104,8 +104,8 @@ protected void addBoldPropertyDescriptor(Object object) { */ protected void addUnderlinePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_underline_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_underline_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__UNDERLINE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -116,8 +116,8 @@ protected void addUnderlinePropertyDescriptor(Object object) { */ protected void addStrikeThroughPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_strikeThrough_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_strikeThrough_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__STRIKE_THROUGH, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -128,8 +128,8 @@ protected void addStrikeThroughPropertyDescriptor(Object object) { */ protected void addBackgroundColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_SelectDescriptionStyle_backgroundColor_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_SelectDescriptionStyle_backgroundColor_feature", "_UI_SelectDescriptionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_SelectDescriptionStyle_backgroundColor_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_SelectDescriptionStyle_backgroundColor_feature", "_UI_SelectDescriptionStyle_type"), ViewPackage.Literals.SELECT_DESCRIPTION_STYLE__BACKGROUND_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -140,8 +140,8 @@ protected void addBackgroundColorPropertyDescriptor(Object object) { */ protected void addForegroundColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_SelectDescriptionStyle_foregroundColor_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_SelectDescriptionStyle_foregroundColor_feature", "_UI_SelectDescriptionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_SelectDescriptionStyle_foregroundColor_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_SelectDescriptionStyle_foregroundColor_feature", "_UI_SelectDescriptionStyle_type"), ViewPackage.Literals.SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -152,7 +152,7 @@ protected void addForegroundColorPropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ConditionalStyle.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ConditionalStyle.svg")); } /** @@ -173,8 +173,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((ConditionalSelectDescriptionStyle) object).getCondition(); - return label == null || label.length() == 0 ? this.getString("_UI_ConditionalSelectDescriptionStyle_type") : //$NON-NLS-1$ - this.getString("_UI_ConditionalSelectDescriptionStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_ConditionalSelectDescriptionStyle_type") : + this.getString("_UI_ConditionalSelectDescriptionStyle_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalTextareaDescriptionStyleItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalTextareaDescriptionStyleItemProvider.java index 9c6127b276..0d1b609cae 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalTextareaDescriptionStyleItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalTextareaDescriptionStyleItemProvider.java @@ -69,8 +69,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addFontSizePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_fontSize_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_fontSize_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } @@ -81,8 +81,8 @@ protected void addFontSizePropertyDescriptor(Object object) { */ protected void addItalicPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__ITALIC, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -93,8 +93,8 @@ protected void addItalicPropertyDescriptor(Object object) { */ protected void addBoldPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__BOLD, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -105,8 +105,8 @@ protected void addBoldPropertyDescriptor(Object object) { */ protected void addUnderlinePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_underline_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_underline_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__UNDERLINE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -117,8 +117,8 @@ protected void addUnderlinePropertyDescriptor(Object object) { */ protected void addStrikeThroughPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_strikeThrough_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_strikeThrough_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__STRIKE_THROUGH, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -129,8 +129,8 @@ protected void addStrikeThroughPropertyDescriptor(Object object) { */ protected void addBackgroundColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_TextareaDescriptionStyle_backgroundColor_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_TextareaDescriptionStyle_backgroundColor_feature", "_UI_TextareaDescriptionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_TextareaDescriptionStyle_backgroundColor_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_TextareaDescriptionStyle_backgroundColor_feature", "_UI_TextareaDescriptionStyle_type"), ViewPackage.Literals.TEXTAREA_DESCRIPTION_STYLE__BACKGROUND_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -141,8 +141,8 @@ protected void addBackgroundColorPropertyDescriptor(Object object) { */ protected void addForegroundColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_TextareaDescriptionStyle_foregroundColor_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_TextareaDescriptionStyle_foregroundColor_feature", "_UI_TextareaDescriptionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_TextareaDescriptionStyle_foregroundColor_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_TextareaDescriptionStyle_foregroundColor_feature", "_UI_TextareaDescriptionStyle_type"), ViewPackage.Literals.TEXTAREA_DESCRIPTION_STYLE__FOREGROUND_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -153,7 +153,7 @@ protected void addForegroundColorPropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ConditionalStyle.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ConditionalStyle.svg")); } /** @@ -174,8 +174,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((ConditionalTextareaDescriptionStyle) object).getCondition(); - return label == null || label.length() == 0 ? this.getString("_UI_ConditionalTextareaDescriptionStyle_type") : //$NON-NLS-1$ - this.getString("_UI_ConditionalTextareaDescriptionStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_ConditionalTextareaDescriptionStyle_type") : + this.getString("_UI_ConditionalTextareaDescriptionStyle_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalTextfieldDescriptionStyleItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalTextfieldDescriptionStyleItemProvider.java index 3d8fb26860..52f4d08417 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalTextfieldDescriptionStyleItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ConditionalTextfieldDescriptionStyleItemProvider.java @@ -69,8 +69,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addFontSizePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_fontSize_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_fontSize_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } @@ -81,8 +81,8 @@ protected void addFontSizePropertyDescriptor(Object object) { */ protected void addItalicPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__ITALIC, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -93,8 +93,8 @@ protected void addItalicPropertyDescriptor(Object object) { */ protected void addBoldPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__BOLD, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -105,8 +105,8 @@ protected void addBoldPropertyDescriptor(Object object) { */ protected void addUnderlinePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_underline_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_underline_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__UNDERLINE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -117,8 +117,8 @@ protected void addUnderlinePropertyDescriptor(Object object) { */ protected void addStrikeThroughPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_strikeThrough_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_strikeThrough_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__STRIKE_THROUGH, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -129,8 +129,8 @@ protected void addStrikeThroughPropertyDescriptor(Object object) { */ protected void addBackgroundColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_TextfieldDescriptionStyle_backgroundColor_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_TextfieldDescriptionStyle_backgroundColor_feature", "_UI_TextfieldDescriptionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_TextfieldDescriptionStyle_backgroundColor_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_TextfieldDescriptionStyle_backgroundColor_feature", "_UI_TextfieldDescriptionStyle_type"), ViewPackage.Literals.TEXTFIELD_DESCRIPTION_STYLE__BACKGROUND_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -141,8 +141,8 @@ protected void addBackgroundColorPropertyDescriptor(Object object) { */ protected void addForegroundColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_TextfieldDescriptionStyle_foregroundColor_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_TextfieldDescriptionStyle_foregroundColor_feature", "_UI_TextfieldDescriptionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_TextfieldDescriptionStyle_foregroundColor_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_TextfieldDescriptionStyle_foregroundColor_feature", "_UI_TextfieldDescriptionStyle_type"), ViewPackage.Literals.TEXTFIELD_DESCRIPTION_STYLE__FOREGROUND_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -153,7 +153,7 @@ protected void addForegroundColorPropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ConditionalStyle.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ConditionalStyle.svg")); } /** @@ -174,8 +174,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((ConditionalTextfieldDescriptionStyle) object).getCondition(); - return label == null || label.length() == 0 ? this.getString("_UI_ConditionalTextfieldDescriptionStyle_type") : //$NON-NLS-1$ - this.getString("_UI_ConditionalTextfieldDescriptionStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_ConditionalTextfieldDescriptionStyle_type") : + this.getString("_UI_ConditionalTextfieldDescriptionStyle_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/CreateInstanceItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/CreateInstanceItemProvider.java index 558a88063b..f1baaf2622 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/CreateInstanceItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/CreateInstanceItemProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -64,8 +64,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addTypeNamePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_CreateInstance_typeName_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_CreateInstance_typeName_feature", "_UI_CreateInstance_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_CreateInstance_typeName_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_CreateInstance_typeName_feature", "_UI_CreateInstance_type"), ViewPackage.Literals.CREATE_INSTANCE__TYPE_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -76,8 +76,8 @@ protected void addTypeNamePropertyDescriptor(Object object) { */ protected void addReferenceNamePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_CreateInstance_referenceName_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_CreateInstance_referenceName_feature", "_UI_CreateInstance_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_CreateInstance_referenceName_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_CreateInstance_referenceName_feature", "_UI_CreateInstance_type"), ViewPackage.Literals.CREATE_INSTANCE__REFERENCE_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -88,8 +88,8 @@ protected void addReferenceNamePropertyDescriptor(Object object) { */ protected void addVariableNamePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_CreateInstance_variableName_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_CreateInstance_variableName_feature", "_UI_CreateInstance_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_CreateInstance_variableName_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_CreateInstance_variableName_feature", "_UI_CreateInstance_type"), ViewPackage.Literals.CREATE_INSTANCE__VARIABLE_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -100,7 +100,7 @@ protected void addVariableNamePropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/CreateInstance.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/CreateInstance.svg")); } /** @@ -121,8 +121,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((CreateInstance) object).getTypeName(); - return label == null || label.length() == 0 ? this.getString("_UI_CreateInstance_type") : //$NON-NLS-1$ - this.getString("_UI_CreateInstance_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_CreateInstance_type") : + this.getString("_UI_CreateInstance_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/CreateViewItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/CreateViewItemProvider.java index 0b4ea6c61e..e7d8f6007c 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/CreateViewItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/CreateViewItemProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -66,8 +66,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addParentViewExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_CreateView_parentViewExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_CreateView_parentViewExpression_feature", "_UI_CreateView_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_CreateView_parentViewExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_CreateView_parentViewExpression_feature", "_UI_CreateView_type"), ViewPackage.Literals.CREATE_VIEW__PARENT_VIEW_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -79,8 +79,8 @@ protected void addParentViewExpressionPropertyDescriptor(Object object) { */ protected void addElementDescriptionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_CreateView_elementDescription_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_CreateView_elementDescription_feature", "_UI_CreateView_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_CreateView_elementDescription_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_CreateView_elementDescription_feature", "_UI_CreateView_type"), ViewPackage.Literals.CREATE_VIEW__ELEMENT_DESCRIPTION, true, false, true, null, null, null)); } @@ -92,8 +92,8 @@ protected void addElementDescriptionPropertyDescriptor(Object object) { */ protected void addSemanticElementExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_CreateView_semanticElementExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_CreateView_semanticElementExpression_feature", "_UI_CreateView_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_CreateView_semanticElementExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_CreateView_semanticElementExpression_feature", "_UI_CreateView_type"), ViewPackage.Literals.CREATE_VIEW__SEMANTIC_ELEMENT_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -104,8 +104,8 @@ protected void addSemanticElementExpressionPropertyDescriptor(Object object) { */ protected void addVariableNamePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_CreateView_variableName_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_CreateView_variableName_feature", "_UI_CreateView_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_CreateView_variableName_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_CreateView_variableName_feature", "_UI_CreateView_type"), ViewPackage.Literals.CREATE_VIEW__VARIABLE_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -116,7 +116,7 @@ protected void addVariableNamePropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/CreateView.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/CreateView.svg")); } /** @@ -137,8 +137,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((CreateView) object).getVariableName(); - return label == null || label.length() == 0 ? this.getString("_UI_CreateView_type") : //$NON-NLS-1$ - this.getString("_UI_CreateView_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_CreateView_type") : + this.getString("_UI_CreateView_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/DeleteElementItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/DeleteElementItemProvider.java index 589b5ebc59..552a386c1e 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/DeleteElementItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/DeleteElementItemProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -56,7 +56,7 @@ public List getPropertyDescriptors(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/DeleteElement.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/DeleteElement.svg")); } /** @@ -76,7 +76,7 @@ protected boolean shouldComposeCreationImage() { */ @Override public String getText(Object object) { - return this.getString("_UI_DeleteElement_type"); //$NON-NLS-1$ + return this.getString("_UI_DeleteElement_type"); } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/DeleteToolItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/DeleteToolItemProvider.java index df3f8c1afa..6ef781ae75 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/DeleteToolItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/DeleteToolItemProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -57,7 +57,7 @@ public List getPropertyDescriptors(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/DeleteTool.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/DeleteTool.svg")); } /** @@ -78,8 +78,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((DeleteTool) object).getName(); - return label == null || label.length() == 0 ? this.getString("_UI_DeleteTool_type") : //$NON-NLS-1$ - this.getString("_UI_DeleteTool_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_DeleteTool_type") : + this.getString("_UI_DeleteTool_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/DeleteViewItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/DeleteViewItemProvider.java index 7bd05f9824..f9f58cf2fc 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/DeleteViewItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/DeleteViewItemProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -62,8 +62,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addViewExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_DeleteView_viewExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_DeleteView_viewExpression_feature", "_UI_DeleteView_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_DeleteView_viewExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_DeleteView_viewExpression_feature", "_UI_DeleteView_type"), ViewPackage.Literals.DELETE_VIEW__VIEW_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -74,7 +74,7 @@ protected void addViewExpressionPropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/DeleteView.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/DeleteView.svg")); } /** @@ -95,8 +95,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((DeleteView) object).getViewExpression(); - return label == null || label.length() == 0 ? this.getString("_UI_DeleteView_type") : //$NON-NLS-1$ - this.getString("_UI_DeleteView_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_DeleteView_type") : + this.getString("_UI_DeleteView_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/DiagramDescriptionItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/DiagramDescriptionItemProvider.java index 5eb8e67283..4788a96f4c 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/DiagramDescriptionItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/DiagramDescriptionItemProvider.java @@ -69,8 +69,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addAutoLayoutPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_DiagramDescription_autoLayout_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_autoLayout_feature", "_UI_DiagramDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_DiagramDescription_autoLayout_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_autoLayout_feature", "_UI_DiagramDescription_type"), ViewPackage.Literals.DIAGRAM_DESCRIPTION__AUTO_LAYOUT, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -81,8 +81,8 @@ protected void addAutoLayoutPropertyDescriptor(Object object) { */ protected void addOnDropPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_DiagramDescription_onDrop_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_onDrop_feature", "_UI_DiagramDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_DiagramDescription_onDrop_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_onDrop_feature", "_UI_DiagramDescription_type"), ViewPackage.Literals.DIAGRAM_DESCRIPTION__ON_DROP, true, false, true, null, null, null)); } @@ -124,7 +124,7 @@ protected EStructuralFeature getChildFeature(Object object, Object child) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/DiagramDescription.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/DiagramDescription.svg")); } /** @@ -145,8 +145,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((DiagramDescription) object).getName(); - return label == null || label.length() == 0 ? this.getString("_UI_DiagramDescription_type") : //$NON-NLS-1$ - this.getString("_UI_DiagramDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_DiagramDescription_type") : + this.getString("_UI_DiagramDescription_type") + " " + label; } /** @@ -183,20 +183,20 @@ protected void collectNewChildDescriptors(Collection newChildDescriptors super.collectNewChildDescriptors(newChildDescriptors, object); NodeDescription nodeChild = ViewFactory.eINSTANCE.createNodeDescription(); - nodeChild.setName("Node"); //$NON-NLS-1$ + nodeChild.setName("Node"); nodeChild.setStyle(ViewFactory.eINSTANCE.createRectangularNodeStyleDescription()); nodeChild.setChildrenLayoutStrategy(ViewFactory.eINSTANCE.createFreeFormLayoutStrategyDescription()); newChildDescriptors.add(this.createChildParameter(ViewPackage.Literals.DIAGRAM_DESCRIPTION__NODE_DESCRIPTIONS, nodeChild)); EdgeDescription edgeChild = ViewFactory.eINSTANCE.createEdgeDescription(); - edgeChild.setName("Edge"); //$NON-NLS-1$ + edgeChild.setName("Edge"); EdgeStyle newEdgeStyle = ViewFactory.eINSTANCE.createEdgeStyle(); - newEdgeStyle.setColor("#002639"); //$NON-NLS-1$ + newEdgeStyle.setColor("#002639"); edgeChild.setStyle(newEdgeStyle); newChildDescriptors.add(this.createChildParameter(ViewPackage.Literals.DIAGRAM_DESCRIPTION__EDGE_DESCRIPTIONS, edgeChild)); DropTool dropTool = ViewFactory.eINSTANCE.createDropTool(); - dropTool.setName("On Drop"); //$NON-NLS-1$ + dropTool.setName("On Drop"); newChildDescriptors.add(this.createChildParameter(ViewPackage.Literals.DIAGRAM_DESCRIPTION__ON_DROP, dropTool)); } diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/DiagramElementDescriptionItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/DiagramElementDescriptionItemProvider.java index 4e3c7482bd..a74b67a60c 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/DiagramElementDescriptionItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/DiagramElementDescriptionItemProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -78,8 +78,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addNamePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_DiagramElementDescription_name_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_DiagramElementDescription_name_feature", "_UI_DiagramElementDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_DiagramElementDescription_name_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_DiagramElementDescription_name_feature", "_UI_DiagramElementDescription_type"), ViewPackage.Literals.DIAGRAM_ELEMENT_DESCRIPTION__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -90,8 +90,8 @@ protected void addNamePropertyDescriptor(Object object) { */ protected void addDomainTypePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_DiagramElementDescription_domainType_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_DiagramElementDescription_domainType_feature", "_UI_DiagramElementDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_DiagramElementDescription_domainType_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_DiagramElementDescription_domainType_feature", "_UI_DiagramElementDescription_type"), ViewPackage.Literals.DIAGRAM_ELEMENT_DESCRIPTION__DOMAIN_TYPE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -103,8 +103,8 @@ protected void addDomainTypePropertyDescriptor(Object object) { */ protected void addSemanticCandidatesExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_DiagramElementDescription_semanticCandidatesExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_DiagramElementDescription_semanticCandidatesExpression_feature", "_UI_DiagramElementDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_DiagramElementDescription_semanticCandidatesExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_DiagramElementDescription_semanticCandidatesExpression_feature", "_UI_DiagramElementDescription_type"), ViewPackage.Literals.DIAGRAM_ELEMENT_DESCRIPTION__SEMANTIC_CANDIDATES_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -115,8 +115,8 @@ protected void addSemanticCandidatesExpressionPropertyDescriptor(Object object) */ protected void addLabelExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_DiagramElementDescription_labelExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_DiagramElementDescription_labelExpression_feature", "_UI_DiagramElementDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_DiagramElementDescription_labelExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_DiagramElementDescription_labelExpression_feature", "_UI_DiagramElementDescription_type"), ViewPackage.Literals.DIAGRAM_ELEMENT_DESCRIPTION__LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -128,8 +128,8 @@ protected void addLabelExpressionPropertyDescriptor(Object object) { */ protected void addSynchronizationPolicyPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_DiagramElementDescription_synchronizationPolicy_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_DiagramElementDescription_synchronizationPolicy_feature", "_UI_DiagramElementDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_DiagramElementDescription_synchronizationPolicy_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_DiagramElementDescription_synchronizationPolicy_feature", "_UI_DiagramElementDescription_type"), ViewPackage.Literals.DIAGRAM_ELEMENT_DESCRIPTION__SYNCHRONIZATION_POLICY, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -171,7 +171,7 @@ protected EStructuralFeature getChildFeature(Object object, Object child) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/DiagramElementDescription")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/DiagramElementDescription")); } /** @@ -192,8 +192,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((DiagramElementDescription) object).getName(); - return label == null || label.length() == 0 ? this.getString("_UI_DiagramElementDescription_type") : //$NON-NLS-1$ - this.getString("_UI_DiagramElementDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_DiagramElementDescription_type") : + this.getString("_UI_DiagramElementDescription_type") + " " + label; } /** @@ -234,12 +234,12 @@ protected void collectNewChildDescriptors(Collection newChildDescriptors super.collectNewChildDescriptors(newChildDescriptors, object); LabelEditTool newLabelEditTool = ViewFactory.eINSTANCE.createLabelEditTool(); - newLabelEditTool.setName("Edit Label"); //$NON-NLS-1$ + newLabelEditTool.setName("Edit Label"); newLabelEditTool.getBody().add(ViewFactory.eINSTANCE.createChangeContext()); newChildDescriptors.add(this.createChildParameter(ViewPackage.Literals.DIAGRAM_ELEMENT_DESCRIPTION__LABEL_EDIT_TOOL, newLabelEditTool)); DeleteTool newDeleteTool = ViewFactory.eINSTANCE.createDeleteTool(); - newDeleteTool.setName("Delete"); //$NON-NLS-1$ + newDeleteTool.setName("Delete"); newDeleteTool.getBody().add(ViewFactory.eINSTANCE.createChangeContext()); newChildDescriptors.add(this.createChildParameter(ViewPackage.Literals.DIAGRAM_ELEMENT_DESCRIPTION__DELETE_TOOL, newDeleteTool)); } diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/DropToolItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/DropToolItemProvider.java index c11d6bcfbf..073dd2a645 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/DropToolItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/DropToolItemProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -57,7 +57,7 @@ public List getPropertyDescriptors(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/DropTool.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/DropTool.svg")); } /** @@ -78,8 +78,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((DropTool) object).getName(); - return label == null || label.length() == 0 ? this.getString("_UI_DropTool_type") : //$NON-NLS-1$ - this.getString("_UI_DropTool_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_DropTool_type") : + this.getString("_UI_DropTool_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/EdgeDescriptionItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/EdgeDescriptionItemProvider.java index c5b8411c97..63c0cab207 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/EdgeDescriptionItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/EdgeDescriptionItemProvider.java @@ -78,8 +78,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addBeginLabelExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_EdgeDescription_beginLabelExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_EdgeDescription_beginLabelExpression_feature", "_UI_EdgeDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_EdgeDescription_beginLabelExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_EdgeDescription_beginLabelExpression_feature", "_UI_EdgeDescription_type"), ViewPackage.Literals.EDGE_DESCRIPTION__BEGIN_LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -91,8 +91,8 @@ protected void addBeginLabelExpressionPropertyDescriptor(Object object) { */ protected void addEndLabelExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_EdgeDescription_endLabelExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_EdgeDescription_endLabelExpression_feature", "_UI_EdgeDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_EdgeDescription_endLabelExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_EdgeDescription_endLabelExpression_feature", "_UI_EdgeDescription_type"), ViewPackage.Literals.EDGE_DESCRIPTION__END_LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -104,8 +104,8 @@ protected void addEndLabelExpressionPropertyDescriptor(Object object) { */ protected void addIsDomainBasedEdgePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_EdgeDescription_isDomainBasedEdge_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_EdgeDescription_isDomainBasedEdge_feature", "_UI_EdgeDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_EdgeDescription_isDomainBasedEdge_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_EdgeDescription_isDomainBasedEdge_feature", "_UI_EdgeDescription_type"), ViewPackage.Literals.EDGE_DESCRIPTION__IS_DOMAIN_BASED_EDGE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -117,8 +117,8 @@ protected void addIsDomainBasedEdgePropertyDescriptor(Object object) { */ protected void addSourceNodeDescriptionsPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_EdgeDescription_sourceNodeDescriptions_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_EdgeDescription_sourceNodeDescriptions_feature", "_UI_EdgeDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_EdgeDescription_sourceNodeDescriptions_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_EdgeDescription_sourceNodeDescriptions_feature", "_UI_EdgeDescription_type"), ViewPackage.Literals.EDGE_DESCRIPTION__SOURCE_NODE_DESCRIPTIONS, true, false, true, null, null, null)); } @@ -130,8 +130,8 @@ protected void addSourceNodeDescriptionsPropertyDescriptor(Object object) { */ protected void addTargetNodeDescriptionsPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_EdgeDescription_targetNodeDescriptions_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_EdgeDescription_targetNodeDescriptions_feature", "_UI_EdgeDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_EdgeDescription_targetNodeDescriptions_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_EdgeDescription_targetNodeDescriptions_feature", "_UI_EdgeDescription_type"), ViewPackage.Literals.EDGE_DESCRIPTION__TARGET_NODE_DESCRIPTIONS, true, false, true, null, null, null)); } @@ -143,8 +143,8 @@ protected void addTargetNodeDescriptionsPropertyDescriptor(Object object) { */ protected void addSourceNodesExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_EdgeDescription_sourceNodesExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_EdgeDescription_sourceNodesExpression_feature", "_UI_EdgeDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_EdgeDescription_sourceNodesExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_EdgeDescription_sourceNodesExpression_feature", "_UI_EdgeDescription_type"), ViewPackage.Literals.EDGE_DESCRIPTION__SOURCE_NODES_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -156,8 +156,8 @@ protected void addSourceNodesExpressionPropertyDescriptor(Object object) { */ protected void addTargetNodesExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_EdgeDescription_targetNodesExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_EdgeDescription_targetNodesExpression_feature", "_UI_EdgeDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_EdgeDescription_targetNodesExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_EdgeDescription_targetNodesExpression_feature", "_UI_EdgeDescription_type"), ViewPackage.Literals.EDGE_DESCRIPTION__TARGET_NODES_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -201,7 +201,7 @@ protected EStructuralFeature getChildFeature(Object object, Object child) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/EdgeDescription.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/EdgeDescription.svg")); } /** @@ -222,8 +222,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((EdgeDescription) object).getName(); - return label == null || label.length() == 0 ? this.getString("_UI_EdgeDescription_type") : //$NON-NLS-1$ - this.getString("_UI_EdgeDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_EdgeDescription_type") : + this.getString("_UI_EdgeDescription_type") + " " + label; } /** @@ -266,36 +266,36 @@ protected void collectNewChildDescriptors(Collection newChildDescriptors super.collectNewChildDescriptors(newChildDescriptors, object); EdgeTool newEdgeTool = ViewFactory.eINSTANCE.createEdgeTool(); - newEdgeTool.setName("Create Edge"); //$NON-NLS-1$ + newEdgeTool.setName("Create Edge"); ChangeContext initialOperation = ViewFactory.eINSTANCE.createChangeContext(); - initialOperation.setExpression("aql:semanticEdgeSource"); //$NON-NLS-1$ + initialOperation.setExpression("aql:semanticEdgeSource"); newEdgeTool.getBody().add(initialOperation); newChildDescriptors.add(this.createChildParameter(ViewPackage.Literals.EDGE_DESCRIPTION__EDGE_TOOLS, newEdgeTool)); SourceEdgeEndReconnectionTool sourceReconnectionTool = ViewFactory.eINSTANCE.createSourceEdgeEndReconnectionTool(); - sourceReconnectionTool.setName("Reconnect Edge Source"); //$NON-NLS-1$ + sourceReconnectionTool.setName("Reconnect Edge Source"); ChangeContext reconnectSourceInitialOperation = ViewFactory.eINSTANCE.createChangeContext(); - reconnectSourceInitialOperation.setExpression("aql:edgeSemanticElement"); //$NON-NLS-1$ + reconnectSourceInitialOperation.setExpression("aql:edgeSemanticElement"); SetValue reconnectSourceSetValue = ViewFactory.eINSTANCE.createSetValue(); reconnectSourceInitialOperation.getChildren().add(reconnectSourceSetValue); sourceReconnectionTool.getBody().add(reconnectSourceInitialOperation); newChildDescriptors.add(this.createChildParameter(ViewPackage.Literals.EDGE_DESCRIPTION__RECONNECT_EDGE_TOOLS, sourceReconnectionTool)); TargetEdgeEndReconnectionTool targetReconnectionTool = ViewFactory.eINSTANCE.createTargetEdgeEndReconnectionTool(); - targetReconnectionTool.setName("Reconnect Edge Target"); //$NON-NLS-1$ + targetReconnectionTool.setName("Reconnect Edge Target"); ChangeContext reconnectTargetInitialOperation = ViewFactory.eINSTANCE.createChangeContext(); - reconnectTargetInitialOperation.setExpression("aql:edgeSemanticElement"); //$NON-NLS-1$ + reconnectTargetInitialOperation.setExpression("aql:edgeSemanticElement"); SetValue reconnectTargetSetValue = ViewFactory.eINSTANCE.createSetValue(); reconnectTargetInitialOperation.getChildren().add(reconnectTargetSetValue); targetReconnectionTool.getBody().add(reconnectTargetInitialOperation); newChildDescriptors.add(this.createChildParameter(ViewPackage.Literals.EDGE_DESCRIPTION__RECONNECT_EDGE_TOOLS, targetReconnectionTool)); EdgeStyle newEdgeStyle = ViewFactory.eINSTANCE.createEdgeStyle(); - newEdgeStyle.setColor("#002639"); //$NON-NLS-1$ + newEdgeStyle.setColor("#002639"); newChildDescriptors.add(this.createChildParameter(ViewPackage.Literals.EDGE_DESCRIPTION__STYLE, newEdgeStyle)); ConditionalEdgeStyle conditionalEdgeStyle = ViewFactory.eINSTANCE.createConditionalEdgeStyle(); - conditionalEdgeStyle.setColor("#002639"); //$NON-NLS-1$ + conditionalEdgeStyle.setColor("#002639"); newChildDescriptors.add(this.createChildParameter(ViewPackage.Literals.EDGE_DESCRIPTION__CONDITIONAL_STYLES, conditionalEdgeStyle)); } @@ -313,7 +313,7 @@ public String getCreateChildText(Object owner, Object feature, Object child, Col boolean qualify = childFeature == ViewPackage.Literals.EDGE_DESCRIPTION__STYLE || childFeature == ViewPackage.Literals.EDGE_DESCRIPTION__CONDITIONAL_STYLES; if (qualify) { - return this.getString("_UI_CreateChild_text2", //$NON-NLS-1$ + return this.getString("_UI_CreateChild_text2", new Object[] { this.getTypeText(childObject), this.getFeatureText(childFeature), this.getTypeText(owner) }); } return super.getCreateChildText(owner, feature, child, selection); diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/EdgeReconnectionToolItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/EdgeReconnectionToolItemProvider.java index d75b1e5dd2..0401705971 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/EdgeReconnectionToolItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/EdgeReconnectionToolItemProvider.java @@ -68,8 +68,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((EdgeReconnectionTool) object).getName(); - return label == null || label.length() == 0 ? this.getString("_UI_EdgeReconnectionTool_type") : //$NON-NLS-1$ - this.getString("_UI_EdgeReconnectionTool_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_EdgeReconnectionTool_type") : + this.getString("_UI_EdgeReconnectionTool_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/EdgeStyleItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/EdgeStyleItemProvider.java index 9672f99b97..87506bd723 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/EdgeStyleItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/EdgeStyleItemProvider.java @@ -71,8 +71,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addFontSizePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_fontSize_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_fontSize_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } @@ -83,8 +83,8 @@ protected void addFontSizePropertyDescriptor(Object object) { */ protected void addItalicPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__ITALIC, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -95,8 +95,8 @@ protected void addItalicPropertyDescriptor(Object object) { */ protected void addBoldPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__BOLD, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -107,8 +107,8 @@ protected void addBoldPropertyDescriptor(Object object) { */ protected void addUnderlinePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_underline_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_underline_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__UNDERLINE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -119,8 +119,8 @@ protected void addUnderlinePropertyDescriptor(Object object) { */ protected void addStrikeThroughPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_strikeThrough_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_strikeThrough_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__STRIKE_THROUGH, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -131,8 +131,8 @@ protected void addStrikeThroughPropertyDescriptor(Object object) { */ protected void addLineStylePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_EdgeStyle_lineStyle_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyle_lineStyle_feature", "_UI_EdgeStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_EdgeStyle_lineStyle_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyle_lineStyle_feature", "_UI_EdgeStyle_type"), ViewPackage.Literals.EDGE_STYLE__LINE_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -143,8 +143,8 @@ protected void addLineStylePropertyDescriptor(Object object) { */ protected void addSourceArrowStylePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_EdgeStyle_sourceArrowStyle_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyle_sourceArrowStyle_feature", "_UI_EdgeStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_EdgeStyle_sourceArrowStyle_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyle_sourceArrowStyle_feature", "_UI_EdgeStyle_type"), ViewPackage.Literals.EDGE_STYLE__SOURCE_ARROW_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -155,8 +155,8 @@ protected void addSourceArrowStylePropertyDescriptor(Object object) { */ protected void addTargetArrowStylePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_EdgeStyle_targetArrowStyle_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyle_targetArrowStyle_feature", "_UI_EdgeStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_EdgeStyle_targetArrowStyle_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyle_targetArrowStyle_feature", "_UI_EdgeStyle_type"), ViewPackage.Literals.EDGE_STYLE__TARGET_ARROW_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -167,8 +167,8 @@ protected void addTargetArrowStylePropertyDescriptor(Object object) { */ protected void addEdgeWidthPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_EdgeStyle_edgeWidth_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyle_edgeWidth_feature", "_UI_EdgeStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_EdgeStyle_edgeWidth_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyle_edgeWidth_feature", "_UI_EdgeStyle_type"), ViewPackage.Literals.EDGE_STYLE__EDGE_WIDTH, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } @@ -179,8 +179,8 @@ protected void addEdgeWidthPropertyDescriptor(Object object) { */ protected void addShowIconPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_EdgeStyle_showIcon_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyle_showIcon_feature", "_UI_EdgeStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_EdgeStyle_showIcon_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_EdgeStyle_showIcon_feature", "_UI_EdgeStyle_type"), ViewPackage.Literals.EDGE_STYLE__SHOW_ICON, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -191,7 +191,7 @@ protected void addShowIconPropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Style.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Style.svg")); } /** @@ -212,8 +212,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((EdgeStyle) object).getColor(); - return label == null || label.length() == 0 ? this.getString("_UI_EdgeStyle_type") : //$NON-NLS-1$ - this.getString("_UI_EdgeStyle_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_EdgeStyle_type") : + this.getString("_UI_EdgeStyle_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/EdgeToolItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/EdgeToolItemProvider.java index 49e8f66b2f..f8c32ddd7e 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/EdgeToolItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/EdgeToolItemProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -57,7 +57,7 @@ public List getPropertyDescriptors(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Tool.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Tool.svg")); } /** @@ -78,8 +78,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((EdgeTool) object).getName(); - return label == null || label.length() == 0 ? this.getString("_UI_EdgeTool_type") : //$NON-NLS-1$ - this.getString("_UI_EdgeTool_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_EdgeTool_type") : + this.getString("_UI_EdgeTool_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/FlexboxContainerDescriptionItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/FlexboxContainerDescriptionItemProvider.java index be9cd92db3..83bb9723e3 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/FlexboxContainerDescriptionItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/FlexboxContainerDescriptionItemProvider.java @@ -79,8 +79,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addFlexDirectionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_FlexboxContainerDescription_flexDirection_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_FlexboxContainerDescription_flexDirection_feature", "_UI_FlexboxContainerDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_FlexboxContainerDescription_flexDirection_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_FlexboxContainerDescription_flexDirection_feature", "_UI_FlexboxContainerDescription_type"), ViewPackage.Literals.FLEXBOX_CONTAINER_DESCRIPTION__FLEX_DIRECTION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -122,9 +122,9 @@ protected EStructuralFeature getChildFeature(Object object, Object child) { @Override public Object getImage(Object object) { if (object instanceof FlexboxContainerDescription && FlexDirection.ROW.equals(((FlexboxContainerDescription) object).getFlexDirection())) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/FlexboxContainerDescription_Row.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/FlexboxContainerDescription_Row.svg")); } - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/FlexboxContainerDescription_Column.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/FlexboxContainerDescription_Column.svg")); } /** @@ -145,8 +145,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((FlexboxContainerDescription) object).getName(); - return label == null || label.length() == 0 ? this.getString("_UI_FlexboxContainerDescription_type") : //$NON-NLS-1$ - this.getString("_UI_FlexboxContainerDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_FlexboxContainerDescription_type") : + this.getString("_UI_FlexboxContainerDescription_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/FormDescriptionItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/FormDescriptionItemProvider.java index cd67e1168a..13e9fcb93a 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/FormDescriptionItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/FormDescriptionItemProvider.java @@ -91,7 +91,7 @@ protected EStructuralFeature getChildFeature(Object object, Object child) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/FormDescription.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/FormDescription.svg")); } /** @@ -112,8 +112,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((FormDescription) object).getName(); - return label == null || label.length() == 0 ? this.getString("_UI_FormDescription_type") : //$NON-NLS-1$ - this.getString("_UI_FormDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_FormDescription_type") : + this.getString("_UI_FormDescription_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/FreeFormLayoutStrategyDescriptionItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/FreeFormLayoutStrategyDescriptionItemProvider.java index de14c9cbdc..aa039df962 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/FreeFormLayoutStrategyDescriptionItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/FreeFormLayoutStrategyDescriptionItemProvider.java @@ -64,7 +64,7 @@ public List getPropertyDescriptors(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/FreeFormLayoutStrategyDescription.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/FreeFormLayoutStrategyDescription.svg")); } /** @@ -84,7 +84,7 @@ protected boolean shouldComposeCreationImage() { */ @Override public String getText(Object object) { - return this.getString("_UI_FreeFormLayoutStrategyDescription_type"); //$NON-NLS-1$ + return this.getString("_UI_FreeFormLayoutStrategyDescription_type"); } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/GroupDescriptionItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/GroupDescriptionItemProvider.java index 4119fb41ae..3c1360c9d2 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/GroupDescriptionItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/GroupDescriptionItemProvider.java @@ -90,8 +90,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addNamePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_GroupDescription_name_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_GroupDescription_name_feature", "_UI_GroupDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_GroupDescription_name_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_GroupDescription_name_feature", "_UI_GroupDescription_type"), ViewPackage.Literals.GROUP_DESCRIPTION__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -102,8 +102,8 @@ protected void addNamePropertyDescriptor(Object object) { */ protected void addLabelExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_GroupDescription_labelExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_GroupDescription_labelExpression_feature", "_UI_GroupDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_GroupDescription_labelExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_GroupDescription_labelExpression_feature", "_UI_GroupDescription_type"), ViewPackage.Literals.GROUP_DESCRIPTION__LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -114,8 +114,8 @@ protected void addLabelExpressionPropertyDescriptor(Object object) { */ protected void addDisplayModePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_GroupDescription_displayMode_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_GroupDescription_displayMode_feature", "_UI_GroupDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_GroupDescription_displayMode_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_GroupDescription_displayMode_feature", "_UI_GroupDescription_type"), ViewPackage.Literals.GROUP_DESCRIPTION__DISPLAY_MODE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -127,8 +127,8 @@ protected void addDisplayModePropertyDescriptor(Object object) { */ protected void addSemanticCandidatesExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_GroupDescription_semanticCandidatesExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_GroupDescription_semanticCandidatesExpression_feature", "_UI_GroupDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_GroupDescription_semanticCandidatesExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_GroupDescription_semanticCandidatesExpression_feature", "_UI_GroupDescription_type"), ViewPackage.Literals.GROUP_DESCRIPTION__SEMANTIC_CANDIDATES_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -170,7 +170,7 @@ protected EStructuralFeature getChildFeature(Object object, Object child) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/GroupDescription.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/GroupDescription.svg")); } /** @@ -191,8 +191,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((GroupDescription) object).getName(); - return label == null || label.length() == 0 ? this.getString("_UI_GroupDescription_type") : //$NON-NLS-1$ - this.getString("_UI_GroupDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_GroupDescription_type") : + this.getString("_UI_GroupDescription_type") + " " + label; } /** @@ -290,7 +290,7 @@ protected void collectNewChildDescriptors(Collection newChildDescriptors ButtonDescription toolbarActionDescription = ViewFactory.eINSTANCE.createButtonDescription(); toolbarActionDescription.setStyle(ViewFactory.eINSTANCE.createButtonDescriptionStyle()); - toolbarActionDescription.setName("ToolbarAction"); //$NON-NLS-1$ + toolbarActionDescription.setName("ToolbarAction"); toolbarActionDescription.setStyle(ViewFactory.eINSTANCE.createButtonDescriptionStyle()); newChildDescriptors.add(this.createChildParameter(ViewPackage.Literals.GROUP_DESCRIPTION__TOOLBAR_ACTIONS, toolbarActionDescription)); @@ -310,7 +310,7 @@ public String getCreateChildText(Object owner, Object feature, Object child, Col boolean qualify = childFeature == ViewPackage.Literals.GROUP_DESCRIPTION__TOOLBAR_ACTIONS || childFeature == ViewPackage.Literals.GROUP_DESCRIPTION__WIDGETS; if (qualify) { - return this.getString("_UI_CreateChild_text2", //$NON-NLS-1$ + return this.getString("_UI_CreateChild_text2", new Object[] { this.getTypeText(childObject), this.getFeatureText(childFeature), this.getTypeText(owner) }); } return super.getCreateChildText(owner, feature, child, selection); diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/IconLabelNodeStyleDescriptionItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/IconLabelNodeStyleDescriptionItemProvider.java index 1e5669c3ee..23c02098d1 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/IconLabelNodeStyleDescriptionItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/IconLabelNodeStyleDescriptionItemProvider.java @@ -73,8 +73,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addFontSizePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_fontSize_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_fontSize_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } @@ -85,8 +85,8 @@ protected void addFontSizePropertyDescriptor(Object object) { */ protected void addItalicPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__ITALIC, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -97,8 +97,8 @@ protected void addItalicPropertyDescriptor(Object object) { */ protected void addBoldPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__BOLD, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -109,8 +109,8 @@ protected void addBoldPropertyDescriptor(Object object) { */ protected void addUnderlinePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_underline_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_underline_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__UNDERLINE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -121,8 +121,8 @@ protected void addUnderlinePropertyDescriptor(Object object) { */ protected void addStrikeThroughPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_strikeThrough_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_strikeThrough_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__STRIKE_THROUGH, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -133,8 +133,8 @@ protected void addStrikeThroughPropertyDescriptor(Object object) { */ protected void addBorderColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_BorderStyle_borderColor_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_BorderStyle_borderColor_feature", "_UI_BorderStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_BorderStyle_borderColor_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_BorderStyle_borderColor_feature", "_UI_BorderStyle_type"), ViewPackage.Literals.BORDER_STYLE__BORDER_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -145,8 +145,8 @@ protected void addBorderColorPropertyDescriptor(Object object) { */ protected void addBorderRadiusPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_BorderStyle_borderRadius_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_BorderStyle_borderRadius_feature", "_UI_BorderStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_BorderStyle_borderRadius_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_BorderStyle_borderRadius_feature", "_UI_BorderStyle_type"), ViewPackage.Literals.BORDER_STYLE__BORDER_RADIUS, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } @@ -157,8 +157,8 @@ protected void addBorderRadiusPropertyDescriptor(Object object) { */ protected void addBorderSizePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_BorderStyle_borderSize_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_BorderStyle_borderSize_feature", "_UI_BorderStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_BorderStyle_borderSize_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_BorderStyle_borderSize_feature", "_UI_BorderStyle_type"), ViewPackage.Literals.BORDER_STYLE__BORDER_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } @@ -169,8 +169,8 @@ protected void addBorderSizePropertyDescriptor(Object object) { */ protected void addBorderLineStylePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_BorderStyle_borderLineStyle_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_BorderStyle_borderLineStyle_feature", "_UI_BorderStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_BorderStyle_borderLineStyle_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_BorderStyle_borderLineStyle_feature", "_UI_BorderStyle_type"), ViewPackage.Literals.BORDER_STYLE__BORDER_LINE_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -181,8 +181,8 @@ protected void addBorderLineStylePropertyDescriptor(Object object) { */ protected void addLabelColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_NodeStyleDescription_labelColor_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_NodeStyleDescription_labelColor_feature", "_UI_NodeStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_NodeStyleDescription_labelColor_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_NodeStyleDescription_labelColor_feature", "_UI_NodeStyleDescription_type"), ViewPackage.Literals.NODE_STYLE_DESCRIPTION__LABEL_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -194,8 +194,8 @@ protected void addLabelColorPropertyDescriptor(Object object) { */ protected void addSizeComputationExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_NodeStyleDescription_sizeComputationExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_NodeStyleDescription_sizeComputationExpression_feature", "_UI_NodeStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_NodeStyleDescription_sizeComputationExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_NodeStyleDescription_sizeComputationExpression_feature", "_UI_NodeStyleDescription_type"), ViewPackage.Literals.NODE_STYLE_DESCRIPTION__SIZE_COMPUTATION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -206,8 +206,8 @@ protected void addSizeComputationExpressionPropertyDescriptor(Object object) { */ protected void addShowIconPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_NodeStyleDescription_showIcon_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_NodeStyleDescription_showIcon_feature", "_UI_NodeStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_NodeStyleDescription_showIcon_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_NodeStyleDescription_showIcon_feature", "_UI_NodeStyleDescription_type"), ViewPackage.Literals.NODE_STYLE_DESCRIPTION__SHOW_ICON, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -218,7 +218,7 @@ protected void addShowIconPropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Style.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Style.svg")); } /** @@ -239,8 +239,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((IconLabelNodeStyleDescription) object).getColor(); - return label == null || label.length() == 0 ? this.getString("_UI_IconLabelNodeStyleDescription_type") : //$NON-NLS-1$ - this.getString("_UI_IconLabelNodeStyleDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_IconLabelNodeStyleDescription_type") : + this.getString("_UI_IconLabelNodeStyleDescription_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ImageDescriptionItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ImageDescriptionItemProvider.java index 5e32361012..893d8583eb 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ImageDescriptionItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ImageDescriptionItemProvider.java @@ -63,8 +63,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addUrlExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_ImageDescription_urlExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_ImageDescription_urlExpression_feature", "_UI_ImageDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_ImageDescription_urlExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_ImageDescription_urlExpression_feature", "_UI_ImageDescription_type"), ViewPackage.Literals.IMAGE_DESCRIPTION__URL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -76,8 +76,8 @@ protected void addUrlExpressionPropertyDescriptor(Object object) { */ protected void addMaxWidthExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_ImageDescription_maxWidthExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_ImageDescription_maxWidthExpression_feature", "_UI_ImageDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_ImageDescription_maxWidthExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_ImageDescription_maxWidthExpression_feature", "_UI_ImageDescription_type"), ViewPackage.Literals.IMAGE_DESCRIPTION__MAX_WIDTH_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -88,7 +88,7 @@ protected void addMaxWidthExpressionPropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ImageDescription.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ImageDescription.svg")); } /** @@ -109,8 +109,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((ImageDescription) object).getName(); - return label == null || label.length() == 0 ? this.getString("_UI_ImageDescription_type") : //$NON-NLS-1$ - this.getString("_UI_ImageDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_ImageDescription_type") : + this.getString("_UI_ImageDescription_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ImageNodeStyleDescriptionItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ImageNodeStyleDescriptionItemProvider.java index 8b4ffe3f42..ae9b62330c 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ImageNodeStyleDescriptionItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ImageNodeStyleDescriptionItemProvider.java @@ -74,8 +74,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addFontSizePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_fontSize_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_fontSize_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } @@ -86,8 +86,8 @@ protected void addFontSizePropertyDescriptor(Object object) { */ protected void addItalicPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__ITALIC, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -98,8 +98,8 @@ protected void addItalicPropertyDescriptor(Object object) { */ protected void addBoldPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__BOLD, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -110,8 +110,8 @@ protected void addBoldPropertyDescriptor(Object object) { */ protected void addUnderlinePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_underline_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_underline_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__UNDERLINE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -122,8 +122,8 @@ protected void addUnderlinePropertyDescriptor(Object object) { */ protected void addStrikeThroughPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_strikeThrough_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_strikeThrough_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__STRIKE_THROUGH, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -134,8 +134,8 @@ protected void addStrikeThroughPropertyDescriptor(Object object) { */ protected void addBorderColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_BorderStyle_borderColor_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_BorderStyle_borderColor_feature", "_UI_BorderStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_BorderStyle_borderColor_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_BorderStyle_borderColor_feature", "_UI_BorderStyle_type"), ViewPackage.Literals.BORDER_STYLE__BORDER_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -146,8 +146,8 @@ protected void addBorderColorPropertyDescriptor(Object object) { */ protected void addBorderRadiusPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_BorderStyle_borderRadius_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_BorderStyle_borderRadius_feature", "_UI_BorderStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_BorderStyle_borderRadius_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_BorderStyle_borderRadius_feature", "_UI_BorderStyle_type"), ViewPackage.Literals.BORDER_STYLE__BORDER_RADIUS, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } @@ -158,8 +158,8 @@ protected void addBorderRadiusPropertyDescriptor(Object object) { */ protected void addBorderSizePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_BorderStyle_borderSize_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_BorderStyle_borderSize_feature", "_UI_BorderStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_BorderStyle_borderSize_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_BorderStyle_borderSize_feature", "_UI_BorderStyle_type"), ViewPackage.Literals.BORDER_STYLE__BORDER_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } @@ -170,8 +170,8 @@ protected void addBorderSizePropertyDescriptor(Object object) { */ protected void addBorderLineStylePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_BorderStyle_borderLineStyle_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_BorderStyle_borderLineStyle_feature", "_UI_BorderStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_BorderStyle_borderLineStyle_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_BorderStyle_borderLineStyle_feature", "_UI_BorderStyle_type"), ViewPackage.Literals.BORDER_STYLE__BORDER_LINE_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -182,8 +182,8 @@ protected void addBorderLineStylePropertyDescriptor(Object object) { */ protected void addLabelColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_NodeStyleDescription_labelColor_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_NodeStyleDescription_labelColor_feature", "_UI_NodeStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_NodeStyleDescription_labelColor_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_NodeStyleDescription_labelColor_feature", "_UI_NodeStyleDescription_type"), ViewPackage.Literals.NODE_STYLE_DESCRIPTION__LABEL_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -195,8 +195,8 @@ protected void addLabelColorPropertyDescriptor(Object object) { */ protected void addSizeComputationExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_NodeStyleDescription_sizeComputationExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_NodeStyleDescription_sizeComputationExpression_feature", "_UI_NodeStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_NodeStyleDescription_sizeComputationExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_NodeStyleDescription_sizeComputationExpression_feature", "_UI_NodeStyleDescription_type"), ViewPackage.Literals.NODE_STYLE_DESCRIPTION__SIZE_COMPUTATION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -207,8 +207,8 @@ protected void addSizeComputationExpressionPropertyDescriptor(Object object) { */ protected void addShowIconPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_NodeStyleDescription_showIcon_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_NodeStyleDescription_showIcon_feature", "_UI_NodeStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_NodeStyleDescription_showIcon_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_NodeStyleDescription_showIcon_feature", "_UI_NodeStyleDescription_type"), ViewPackage.Literals.NODE_STYLE_DESCRIPTION__SHOW_ICON, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -219,8 +219,8 @@ protected void addShowIconPropertyDescriptor(Object object) { */ protected void addShapePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_ImageNodeStyleDescription_shape_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_ImageNodeStyleDescription_shape_feature", "_UI_ImageNodeStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_ImageNodeStyleDescription_shape_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_ImageNodeStyleDescription_shape_feature", "_UI_ImageNodeStyleDescription_type"), ViewPackage.Literals.IMAGE_NODE_STYLE_DESCRIPTION__SHAPE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -231,7 +231,7 @@ protected void addShapePropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ImageNodeStyle.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ImageNodeStyle.svg")); } /** @@ -252,8 +252,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((ImageNodeStyleDescription) object).getShape(); - return label == null || label.length() == 0 ? this.getString("_UI_ImageNodeStyleDescription_type") : //$NON-NLS-1$ - this.getString("_UI_ImageNodeStyleDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_ImageNodeStyleDescription_type") : + this.getString("_UI_ImageNodeStyleDescription_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/LabelDescriptionItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/LabelDescriptionItemProvider.java index 8d91b92da1..3eee56fa8d 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/LabelDescriptionItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/LabelDescriptionItemProvider.java @@ -64,8 +64,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addValueExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelDescription_valueExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelDescription_valueExpression_feature", "_UI_LabelDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelDescription_valueExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelDescription_valueExpression_feature", "_UI_LabelDescription_type"), ViewPackage.Literals.LABEL_DESCRIPTION__VALUE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -107,7 +107,7 @@ protected EStructuralFeature getChildFeature(Object object, Object child) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/LabelDescription.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/LabelDescription.svg")); } /** @@ -128,8 +128,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((LabelDescription) object).getName(); - return label == null || label.length() == 0 ? this.getString("_UI_LabelDescription_type") : //$NON-NLS-1$ - this.getString("_UI_LabelDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_LabelDescription_type") : + this.getString("_UI_LabelDescription_type") + " " + label; } /** @@ -184,7 +184,7 @@ public String getCreateChildText(Object owner, Object feature, Object child, Col boolean qualify = childFeature == ViewPackage.Literals.LABEL_DESCRIPTION__STYLE || childFeature == ViewPackage.Literals.LABEL_DESCRIPTION__CONDITIONAL_STYLES; if (qualify) { - return this.getString("_UI_CreateChild_text2", //$NON-NLS-1$ + return this.getString("_UI_CreateChild_text2", new Object[] { this.getTypeText(childObject), this.getFeatureText(childFeature), this.getTypeText(owner) }); } return super.getCreateChildText(owner, feature, child, selection); diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/LabelDescriptionStyleItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/LabelDescriptionStyleItemProvider.java index dee331d9c9..47c796d4c7 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/LabelDescriptionStyleItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/LabelDescriptionStyleItemProvider.java @@ -67,8 +67,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addFontSizePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_fontSize_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_fontSize_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } @@ -79,8 +79,8 @@ protected void addFontSizePropertyDescriptor(Object object) { */ protected void addItalicPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__ITALIC, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -91,8 +91,8 @@ protected void addItalicPropertyDescriptor(Object object) { */ protected void addBoldPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__BOLD, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -103,8 +103,8 @@ protected void addBoldPropertyDescriptor(Object object) { */ protected void addUnderlinePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_underline_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_underline_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__UNDERLINE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -115,8 +115,8 @@ protected void addUnderlinePropertyDescriptor(Object object) { */ protected void addStrikeThroughPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_strikeThrough_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_strikeThrough_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__STRIKE_THROUGH, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -127,8 +127,8 @@ protected void addStrikeThroughPropertyDescriptor(Object object) { */ protected void addColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelDescriptionStyle_color_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelDescriptionStyle_color_feature", "_UI_LabelDescriptionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelDescriptionStyle_color_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelDescriptionStyle_color_feature", "_UI_LabelDescriptionStyle_type"), ViewPackage.Literals.LABEL_DESCRIPTION_STYLE__COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -139,7 +139,7 @@ protected void addColorPropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Style.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Style.svg")); } /** @@ -160,7 +160,7 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { LabelDescriptionStyle labelDescriptionStyle = (LabelDescriptionStyle) object; - return this.getString("_UI_LabelDescriptionStyle_type") + " " + labelDescriptionStyle.getFontSize(); //$NON-NLS-1$ //$NON-NLS-2$ + return this.getString("_UI_LabelDescriptionStyle_type") + " " + labelDescriptionStyle.getFontSize(); } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/LabelEditToolItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/LabelEditToolItemProvider.java index 58d75d0aab..43ab600a76 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/LabelEditToolItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/LabelEditToolItemProvider.java @@ -63,8 +63,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addInitialDirectEditLabelExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelEditTool_initialDirectEditLabelExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelEditTool_initialDirectEditLabelExpression_feature", "_UI_LabelEditTool_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelEditTool_initialDirectEditLabelExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelEditTool_initialDirectEditLabelExpression_feature", "_UI_LabelEditTool_type"), ViewPackage.Literals.LABEL_EDIT_TOOL__INITIAL_DIRECT_EDIT_LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -75,7 +75,7 @@ protected void addInitialDirectEditLabelExpressionPropertyDescriptor(Object obje */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/LabelEditTool.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/LabelEditTool.svg")); } /** @@ -96,8 +96,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((LabelEditTool) object).getName(); - return label == null || label.length() == 0 ? this.getString("_UI_LabelEditTool_type") : //$NON-NLS-1$ - this.getString("_UI_LabelEditTool_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_LabelEditTool_type") : + this.getString("_UI_LabelEditTool_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/LabelStyleItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/LabelStyleItemProvider.java index 282619b152..ba8ec1bbc0 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/LabelStyleItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/LabelStyleItemProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -74,8 +74,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addFontSizePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_fontSize_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_fontSize_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } @@ -86,8 +86,8 @@ protected void addFontSizePropertyDescriptor(Object object) { */ protected void addItalicPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__ITALIC, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -98,8 +98,8 @@ protected void addItalicPropertyDescriptor(Object object) { */ protected void addBoldPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__BOLD, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -110,8 +110,8 @@ protected void addBoldPropertyDescriptor(Object object) { */ protected void addUnderlinePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_underline_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_underline_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__UNDERLINE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -122,8 +122,8 @@ protected void addUnderlinePropertyDescriptor(Object object) { */ protected void addStrikeThroughPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_strikeThrough_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_strikeThrough_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__STRIKE_THROUGH, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -134,7 +134,7 @@ protected void addStrikeThroughPropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/LabelStyle")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/LabelStyle")); } /** @@ -155,7 +155,7 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { LabelStyle labelStyle = (LabelStyle) object; - return this.getString("_UI_LabelStyle_type") + " " + labelStyle.getFontSize(); //$NON-NLS-1$ //$NON-NLS-2$ + return this.getString("_UI_LabelStyle_type") + " " + labelStyle.getFontSize(); } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/LinkDescriptionItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/LinkDescriptionItemProvider.java index 65c418a28b..b9fea89de0 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/LinkDescriptionItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/LinkDescriptionItemProvider.java @@ -64,8 +64,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addValueExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LinkDescription_valueExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LinkDescription_valueExpression_feature", "_UI_LinkDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LinkDescription_valueExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LinkDescription_valueExpression_feature", "_UI_LinkDescription_type"), ViewPackage.Literals.LINK_DESCRIPTION__VALUE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -107,7 +107,7 @@ protected EStructuralFeature getChildFeature(Object object, Object child) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/LinkDescription.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/LinkDescription.svg")); } /** @@ -128,8 +128,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((LinkDescription) object).getName(); - return label == null || label.length() == 0 ? this.getString("_UI_LinkDescription_type") : //$NON-NLS-1$ - this.getString("_UI_LinkDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_LinkDescription_type") : + this.getString("_UI_LinkDescription_type") + " " + label; } /** @@ -184,7 +184,7 @@ public String getCreateChildText(Object owner, Object feature, Object child, Col boolean qualify = childFeature == ViewPackage.Literals.LINK_DESCRIPTION__STYLE || childFeature == ViewPackage.Literals.LINK_DESCRIPTION__CONDITIONAL_STYLES; if (qualify) { - return this.getString("_UI_CreateChild_text2", //$NON-NLS-1$ + return this.getString("_UI_CreateChild_text2", new Object[] { this.getTypeText(childObject), this.getFeatureText(childFeature), this.getTypeText(owner) }); } return super.getCreateChildText(owner, feature, child, selection); diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/LinkDescriptionStyleItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/LinkDescriptionStyleItemProvider.java index 98df553547..495fcd32ed 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/LinkDescriptionStyleItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/LinkDescriptionStyleItemProvider.java @@ -67,8 +67,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addFontSizePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_fontSize_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_fontSize_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } @@ -79,8 +79,8 @@ protected void addFontSizePropertyDescriptor(Object object) { */ protected void addItalicPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__ITALIC, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -91,8 +91,8 @@ protected void addItalicPropertyDescriptor(Object object) { */ protected void addBoldPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__BOLD, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -103,8 +103,8 @@ protected void addBoldPropertyDescriptor(Object object) { */ protected void addUnderlinePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_underline_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_underline_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__UNDERLINE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -115,8 +115,8 @@ protected void addUnderlinePropertyDescriptor(Object object) { */ protected void addStrikeThroughPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_strikeThrough_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_strikeThrough_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__STRIKE_THROUGH, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -127,8 +127,8 @@ protected void addStrikeThroughPropertyDescriptor(Object object) { */ protected void addColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LinkDescriptionStyle_color_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LinkDescriptionStyle_color_feature", "_UI_LinkDescriptionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LinkDescriptionStyle_color_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LinkDescriptionStyle_color_feature", "_UI_LinkDescriptionStyle_type"), ViewPackage.Literals.LINK_DESCRIPTION_STYLE__COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -139,7 +139,7 @@ protected void addColorPropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Style.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Style.svg")); } /** @@ -160,7 +160,7 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { LinkDescriptionStyle linkDescriptionStyle = (LinkDescriptionStyle) object; - return this.getString("_UI_LinkDescriptionStyle_type") + " " + linkDescriptionStyle.getFontSize(); //$NON-NLS-1$ //$NON-NLS-2$ + return this.getString("_UI_LinkDescriptionStyle_type") + " " + linkDescriptionStyle.getFontSize(); } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ListDescriptionItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ListDescriptionItemProvider.java index 14db7eee3b..9637c32a52 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ListDescriptionItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ListDescriptionItemProvider.java @@ -66,8 +66,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addValueExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_ListDescription_valueExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_ListDescription_valueExpression_feature", "_UI_ListDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_ListDescription_valueExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_ListDescription_valueExpression_feature", "_UI_ListDescription_type"), ViewPackage.Literals.LIST_DESCRIPTION__VALUE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -78,8 +78,8 @@ protected void addValueExpressionPropertyDescriptor(Object object) { */ protected void addDisplayExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_ListDescription_displayExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_ListDescription_displayExpression_feature", "_UI_ListDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_ListDescription_displayExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_ListDescription_displayExpression_feature", "_UI_ListDescription_type"), ViewPackage.Literals.LIST_DESCRIPTION__DISPLAY_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -91,8 +91,8 @@ protected void addDisplayExpressionPropertyDescriptor(Object object) { */ protected void addIsDeletableExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_ListDescription_isDeletableExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_ListDescription_isDeletableExpression_feature", "_UI_ListDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_ListDescription_isDeletableExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_ListDescription_isDeletableExpression_feature", "_UI_ListDescription_type"), ViewPackage.Literals.LIST_DESCRIPTION__IS_DELETABLE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -135,7 +135,7 @@ protected EStructuralFeature getChildFeature(Object object, Object child) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ListDescription.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ListDescription.svg")); } /** @@ -156,8 +156,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((ListDescription) object).getName(); - return label == null || label.length() == 0 ? this.getString("_UI_ListDescription_type") : //$NON-NLS-1$ - this.getString("_UI_ListDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_ListDescription_type") : + this.getString("_UI_ListDescription_type") + " " + label; } /** @@ -229,7 +229,7 @@ public String getCreateChildText(Object owner, Object feature, Object child, Col boolean qualify = childFeature == ViewPackage.Literals.LIST_DESCRIPTION__STYLE || childFeature == ViewPackage.Literals.LIST_DESCRIPTION__CONDITIONAL_STYLES; if (qualify) { - return this.getString("_UI_CreateChild_text2", //$NON-NLS-1$ + return this.getString("_UI_CreateChild_text2", new Object[] { this.getTypeText(childObject), this.getFeatureText(childFeature), this.getTypeText(owner) }); } return super.getCreateChildText(owner, feature, child, selection); diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ListDescriptionStyleItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ListDescriptionStyleItemProvider.java index 0523afd201..d2f72e7e0a 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ListDescriptionStyleItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ListDescriptionStyleItemProvider.java @@ -67,8 +67,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addFontSizePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_fontSize_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_fontSize_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } @@ -79,8 +79,8 @@ protected void addFontSizePropertyDescriptor(Object object) { */ protected void addItalicPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__ITALIC, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -91,8 +91,8 @@ protected void addItalicPropertyDescriptor(Object object) { */ protected void addBoldPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__BOLD, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -103,8 +103,8 @@ protected void addBoldPropertyDescriptor(Object object) { */ protected void addUnderlinePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_underline_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_underline_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__UNDERLINE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -115,8 +115,8 @@ protected void addUnderlinePropertyDescriptor(Object object) { */ protected void addStrikeThroughPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_strikeThrough_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_strikeThrough_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__STRIKE_THROUGH, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -127,8 +127,8 @@ protected void addStrikeThroughPropertyDescriptor(Object object) { */ protected void addColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_ListDescriptionStyle_color_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_ListDescriptionStyle_color_feature", "_UI_ListDescriptionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_ListDescriptionStyle_color_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_ListDescriptionStyle_color_feature", "_UI_ListDescriptionStyle_type"), ViewPackage.Literals.LIST_DESCRIPTION_STYLE__COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -139,7 +139,7 @@ protected void addColorPropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Style.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Style.svg")); } /** @@ -160,7 +160,7 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { ListDescriptionStyle listDescriptionStyle = (ListDescriptionStyle) object; - return this.getString("_UI_ListDescriptionStyle_type") + " " + listDescriptionStyle.getFontSize(); //$NON-NLS-1$ //$NON-NLS-2$ + return this.getString("_UI_ListDescriptionStyle_type") + " " + listDescriptionStyle.getFontSize(); } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ListLayoutStrategyDescriptionItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ListLayoutStrategyDescriptionItemProvider.java index 3f102d4051..5ab402de52 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ListLayoutStrategyDescriptionItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ListLayoutStrategyDescriptionItemProvider.java @@ -64,7 +64,7 @@ public List getPropertyDescriptors(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ListLayoutStrategyDescription.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/ListLayoutStrategyDescription.svg")); } /** @@ -84,7 +84,7 @@ protected boolean shouldComposeCreationImage() { */ @Override public String getText(Object object) { - return this.getString("_UI_ListLayoutStrategyDescription_type"); //$NON-NLS-1$ + return this.getString("_UI_ListLayoutStrategyDescription_type"); } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/MultiSelectDescriptionItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/MultiSelectDescriptionItemProvider.java index cfc9b50dc2..1d5ab4ee07 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/MultiSelectDescriptionItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/MultiSelectDescriptionItemProvider.java @@ -66,8 +66,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addValueExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_MultiSelectDescription_valueExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_MultiSelectDescription_valueExpression_feature", "_UI_MultiSelectDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_MultiSelectDescription_valueExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_MultiSelectDescription_valueExpression_feature", "_UI_MultiSelectDescription_type"), ViewPackage.Literals.MULTI_SELECT_DESCRIPTION__VALUE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -79,8 +79,8 @@ protected void addValueExpressionPropertyDescriptor(Object object) { */ protected void addCandidatesExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_MultiSelectDescription_candidatesExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_MultiSelectDescription_candidatesExpression_feature", "_UI_MultiSelectDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_MultiSelectDescription_candidatesExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_MultiSelectDescription_candidatesExpression_feature", "_UI_MultiSelectDescription_type"), ViewPackage.Literals.MULTI_SELECT_DESCRIPTION__CANDIDATES_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -92,8 +92,8 @@ protected void addCandidatesExpressionPropertyDescriptor(Object object) { */ protected void addCandidateLabelExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_MultiSelectDescription_candidateLabelExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_MultiSelectDescription_candidateLabelExpression_feature", "_UI_MultiSelectDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_MultiSelectDescription_candidateLabelExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_MultiSelectDescription_candidateLabelExpression_feature", "_UI_MultiSelectDescription_type"), ViewPackage.Literals.MULTI_SELECT_DESCRIPTION__CANDIDATE_LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -136,7 +136,7 @@ protected EStructuralFeature getChildFeature(Object object, Object child) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/MultiSelectDescription.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/MultiSelectDescription.svg")); } /** @@ -157,8 +157,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((MultiSelectDescription) object).getName(); - return label == null || label.length() == 0 ? this.getString("_UI_MultiSelectDescription_type") : //$NON-NLS-1$ - this.getString("_UI_MultiSelectDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_MultiSelectDescription_type") : + this.getString("_UI_MultiSelectDescription_type") + " " + label; } /** @@ -230,7 +230,7 @@ public String getCreateChildText(Object owner, Object feature, Object child, Col boolean qualify = childFeature == ViewPackage.Literals.MULTI_SELECT_DESCRIPTION__STYLE || childFeature == ViewPackage.Literals.MULTI_SELECT_DESCRIPTION__CONDITIONAL_STYLES; if (qualify) { - return this.getString("_UI_CreateChild_text2", //$NON-NLS-1$ + return this.getString("_UI_CreateChild_text2", new Object[] { this.getTypeText(childObject), this.getFeatureText(childFeature), this.getTypeText(owner) }); } return super.getCreateChildText(owner, feature, child, selection); diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/MultiSelectDescriptionStyleItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/MultiSelectDescriptionStyleItemProvider.java index 42abad8b72..2335f1640b 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/MultiSelectDescriptionStyleItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/MultiSelectDescriptionStyleItemProvider.java @@ -68,8 +68,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addFontSizePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_fontSize_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_fontSize_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } @@ -80,8 +80,8 @@ protected void addFontSizePropertyDescriptor(Object object) { */ protected void addItalicPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__ITALIC, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -92,8 +92,8 @@ protected void addItalicPropertyDescriptor(Object object) { */ protected void addBoldPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__BOLD, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -104,8 +104,8 @@ protected void addBoldPropertyDescriptor(Object object) { */ protected void addUnderlinePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_underline_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_underline_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__UNDERLINE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -116,8 +116,8 @@ protected void addUnderlinePropertyDescriptor(Object object) { */ protected void addStrikeThroughPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_strikeThrough_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_strikeThrough_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__STRIKE_THROUGH, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -128,8 +128,8 @@ protected void addStrikeThroughPropertyDescriptor(Object object) { */ protected void addBackgroundColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_MultiSelectDescriptionStyle_backgroundColor_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_MultiSelectDescriptionStyle_backgroundColor_feature", "_UI_MultiSelectDescriptionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_MultiSelectDescriptionStyle_backgroundColor_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_MultiSelectDescriptionStyle_backgroundColor_feature", "_UI_MultiSelectDescriptionStyle_type"), ViewPackage.Literals.MULTI_SELECT_DESCRIPTION_STYLE__BACKGROUND_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -140,8 +140,8 @@ protected void addBackgroundColorPropertyDescriptor(Object object) { */ protected void addForegroundColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_MultiSelectDescriptionStyle_foregroundColor_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_MultiSelectDescriptionStyle_foregroundColor_feature", "_UI_MultiSelectDescriptionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_MultiSelectDescriptionStyle_foregroundColor_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_MultiSelectDescriptionStyle_foregroundColor_feature", "_UI_MultiSelectDescriptionStyle_type"), ViewPackage.Literals.MULTI_SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -152,7 +152,7 @@ protected void addForegroundColorPropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Style.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Style.svg")); } /** @@ -173,7 +173,7 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { MultiSelectDescriptionStyle multiSelectDescriptionStyle = (MultiSelectDescriptionStyle) object; - return this.getString("_UI_MultiSelectDescriptionStyle_type") + " " + multiSelectDescriptionStyle.getFontSize(); //$NON-NLS-1$ //$NON-NLS-2$ + return this.getString("_UI_MultiSelectDescriptionStyle_type") + " " + multiSelectDescriptionStyle.getFontSize(); } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/NodeDescriptionItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/NodeDescriptionItemProvider.java index fc842b0455..4fb4c4594b 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/NodeDescriptionItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/NodeDescriptionItemProvider.java @@ -72,8 +72,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addReusedChildNodeDescriptionsPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_NodeDescription_reusedChildNodeDescriptions_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_NodeDescription_reusedChildNodeDescriptions_feature", "_UI_NodeDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_NodeDescription_reusedChildNodeDescriptions_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_NodeDescription_reusedChildNodeDescriptions_feature", "_UI_NodeDescription_type"), ViewPackage.Literals.NODE_DESCRIPTION__REUSED_CHILD_NODE_DESCRIPTIONS, true, false, true, null, null, null)); } @@ -85,8 +85,8 @@ protected void addReusedChildNodeDescriptionsPropertyDescriptor(Object object) { */ protected void addReusedBorderNodeDescriptionsPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_NodeDescription_reusedBorderNodeDescriptions_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_NodeDescription_reusedBorderNodeDescriptions_feature", "_UI_NodeDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_NodeDescription_reusedBorderNodeDescriptions_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_NodeDescription_reusedBorderNodeDescriptions_feature", "_UI_NodeDescription_type"), ViewPackage.Literals.NODE_DESCRIPTION__REUSED_BORDER_NODE_DESCRIPTIONS, true, false, true, null, null, null)); } @@ -98,8 +98,8 @@ protected void addReusedBorderNodeDescriptionsPropertyDescriptor(Object object) */ protected void addChildrenLayoutStrategyPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_NodeDescription_childrenLayoutStrategy_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_NodeDescription_childrenLayoutStrategy_feature", "_UI_NodeDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_NodeDescription_childrenLayoutStrategy_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_NodeDescription_childrenLayoutStrategy_feature", "_UI_NodeDescription_type"), ViewPackage.Literals.NODE_DESCRIPTION__CHILDREN_LAYOUT_STRATEGY, true, false, true, null, null, null)); } @@ -144,7 +144,7 @@ protected EStructuralFeature getChildFeature(Object object, Object child) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/NodeDescription.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/NodeDescription.svg")); } /** @@ -165,8 +165,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((NodeDescription) object).getName(); - return label == null || label.length() == 0 ? this.getString("_UI_NodeDescription_type") : //$NON-NLS-1$ - this.getString("_UI_NodeDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_NodeDescription_type") : + this.getString("_UI_NodeDescription_type") + " " + label; } /** @@ -203,18 +203,18 @@ protected void collectNewChildDescriptors(Collection newChildDescriptors super.collectNewChildDescriptors(newChildDescriptors, object); NodeTool newNodeTool = ViewFactory.eINSTANCE.createNodeTool(); - newNodeTool.setName("Create Node"); //$NON-NLS-1$ + newNodeTool.setName("Create Node"); newNodeTool.getBody().add(ViewFactory.eINSTANCE.createChangeContext()); newChildDescriptors.add(this.createChildParameter(ViewPackage.Literals.NODE_DESCRIPTION__NODE_TOOLS, newNodeTool)); NodeDescription nodeChild = ViewFactory.eINSTANCE.createNodeDescription(); - nodeChild.setName("Sub-node"); //$NON-NLS-1$ + nodeChild.setName("Sub-node"); nodeChild.setStyle(ViewFactory.eINSTANCE.createRectangularNodeStyleDescription()); nodeChild.setChildrenLayoutStrategy(ViewFactory.eINSTANCE.createFreeFormLayoutStrategyDescription()); newChildDescriptors.add(this.createChildParameter(ViewPackage.Literals.NODE_DESCRIPTION__CHILDREN_DESCRIPTIONS, nodeChild)); NodeDescription borderNodeChild = ViewFactory.eINSTANCE.createNodeDescription(); - borderNodeChild.setName("Border node"); //$NON-NLS-1$ + borderNodeChild.setName("Border node"); borderNodeChild.setStyle(ViewFactory.eINSTANCE.createRectangularNodeStyleDescription()); borderNodeChild.setChildrenLayoutStrategy(ViewFactory.eINSTANCE.createFreeFormLayoutStrategyDescription()); newChildDescriptors.add(this.createChildParameter(ViewPackage.Literals.NODE_DESCRIPTION__BORDER_NODES_DESCRIPTIONS, borderNodeChild)); @@ -237,21 +237,21 @@ protected void collectNewChildDescriptors(Collection newChildDescriptors */ @Override public String getCreateChildText(Object owner, Object feature, Object child, Collection selection) { - String text = ""; //$NON-NLS-1$ + String text = ""; if (feature == ViewPackage.Literals.NODE_DESCRIPTION__CHILDREN_DESCRIPTIONS) { - text = "Sub-node"; //$NON-NLS-1$ + text = "Sub-node"; } else if (feature == ViewPackage.Literals.NODE_DESCRIPTION__BORDER_NODES_DESCRIPTIONS) { - text = "Border node"; //$NON-NLS-1$ + text = "Border node"; } else if (child instanceof RectangularNodeStyleDescription) { - text = "Style Rectangular"; //$NON-NLS-1$ + text = "Style Rectangular"; } else if (child instanceof ImageNodeStyleDescription) { - text = "Style Image"; //$NON-NLS-1$ + text = "Style Image"; } else if (child instanceof IconLabelNodeStyleDescription) { - text = "Style Icon-Label"; //$NON-NLS-1$ + text = "Style Icon-Label"; } else if (child instanceof FreeFormLayoutStrategyDescription) { - text = "Layout Free Form"; //$NON-NLS-1$ + text = "Layout Free Form"; } else if (child instanceof ListLayoutStrategyDescription) { - text = "Layout List"; //$NON-NLS-1$ + text = "Layout List"; } else { text = super.getCreateChildText(owner, feature, child, selection); } diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/NodeToolItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/NodeToolItemProvider.java index c1a6bfb009..49f6fd1e6f 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/NodeToolItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/NodeToolItemProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -57,7 +57,7 @@ public List getPropertyDescriptors(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Tool.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Tool.svg")); } /** @@ -78,8 +78,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((NodeTool) object).getName(); - return label == null || label.length() == 0 ? this.getString("_UI_NodeTool_type") : //$NON-NLS-1$ - this.getString("_UI_NodeTool_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_NodeTool_type") : + this.getString("_UI_NodeTool_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/OperationItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/OperationItemProvider.java index d7ce8da051..214de3b383 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/OperationItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/OperationItemProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -109,7 +109,7 @@ protected boolean shouldComposeCreationImage() { */ @Override public String getText(Object object) { - return this.getString("_UI_Operation_type"); //$NON-NLS-1$ + return this.getString("_UI_Operation_type"); } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/PieChartDescriptionItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/PieChartDescriptionItemProvider.java index ef00b373c2..dc9de90674 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/PieChartDescriptionItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/PieChartDescriptionItemProvider.java @@ -65,8 +65,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addValuesExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_PieChartDescription_valuesExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_PieChartDescription_valuesExpression_feature", "_UI_PieChartDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_PieChartDescription_valuesExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_PieChartDescription_valuesExpression_feature", "_UI_PieChartDescription_type"), ViewPackage.Literals.PIE_CHART_DESCRIPTION__VALUES_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -77,8 +77,8 @@ protected void addValuesExpressionPropertyDescriptor(Object object) { */ protected void addKeysExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_PieChartDescription_keysExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_PieChartDescription_keysExpression_feature", "_UI_PieChartDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_PieChartDescription_keysExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_PieChartDescription_keysExpression_feature", "_UI_PieChartDescription_type"), ViewPackage.Literals.PIE_CHART_DESCRIPTION__KEYS_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -120,7 +120,7 @@ protected EStructuralFeature getChildFeature(Object object, Object child) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/PieChartDescription.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/PieChartDescription.svg")); } /** @@ -141,8 +141,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((PieChartDescription) object).getName(); - return label == null || label.length() == 0 ? this.getString("_UI_PieChartDescription_type") : //$NON-NLS-1$ - this.getString("_UI_PieChartDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_PieChartDescription_type") : + this.getString("_UI_PieChartDescription_type") + " " + label; } /** @@ -198,7 +198,7 @@ public String getCreateChildText(Object owner, Object feature, Object child, Col boolean qualify = childFeature == ViewPackage.Literals.PIE_CHART_DESCRIPTION__STYLE || childFeature == ViewPackage.Literals.PIE_CHART_DESCRIPTION__CONDITIONAL_STYLES; if (qualify) { - return this.getString("_UI_CreateChild_text2", //$NON-NLS-1$ + return this.getString("_UI_CreateChild_text2", new Object[] { this.getTypeText(childObject), this.getFeatureText(childFeature), this.getTypeText(owner) }); } return super.getCreateChildText(owner, feature, child, selection); diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/PieChartDescriptionStyleItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/PieChartDescriptionStyleItemProvider.java index d4c9770320..dd2fa310e8 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/PieChartDescriptionStyleItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/PieChartDescriptionStyleItemProvider.java @@ -69,8 +69,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addFontSizePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_fontSize_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_fontSize_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } @@ -81,8 +81,8 @@ protected void addFontSizePropertyDescriptor(Object object) { */ protected void addItalicPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__ITALIC, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -93,8 +93,8 @@ protected void addItalicPropertyDescriptor(Object object) { */ protected void addBoldPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__BOLD, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -105,8 +105,8 @@ protected void addBoldPropertyDescriptor(Object object) { */ protected void addUnderlinePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_underline_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_underline_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__UNDERLINE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -117,8 +117,8 @@ protected void addUnderlinePropertyDescriptor(Object object) { */ protected void addStrikeThroughPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_strikeThrough_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_strikeThrough_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__STRIKE_THROUGH, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -129,8 +129,8 @@ protected void addStrikeThroughPropertyDescriptor(Object object) { */ protected void addColorsPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_PieChartDescriptionStyle_colors_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_PieChartDescriptionStyle_colors_feature", "_UI_PieChartDescriptionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_PieChartDescriptionStyle_colors_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_PieChartDescriptionStyle_colors_feature", "_UI_PieChartDescriptionStyle_type"), ViewPackage.Literals.PIE_CHART_DESCRIPTION_STYLE__COLORS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -141,8 +141,8 @@ protected void addColorsPropertyDescriptor(Object object) { */ protected void addStrokeWidthPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_PieChartDescriptionStyle_strokeWidth_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_PieChartDescriptionStyle_strokeWidth_feature", "_UI_PieChartDescriptionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_PieChartDescriptionStyle_strokeWidth_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_PieChartDescriptionStyle_strokeWidth_feature", "_UI_PieChartDescriptionStyle_type"), ViewPackage.Literals.PIE_CHART_DESCRIPTION_STYLE__STROKE_WIDTH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -153,8 +153,8 @@ protected void addStrokeWidthPropertyDescriptor(Object object) { */ protected void addStrokeColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_PieChartDescriptionStyle_strokeColor_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_PieChartDescriptionStyle_strokeColor_feature", "_UI_PieChartDescriptionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_PieChartDescriptionStyle_strokeColor_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_PieChartDescriptionStyle_strokeColor_feature", "_UI_PieChartDescriptionStyle_type"), ViewPackage.Literals.PIE_CHART_DESCRIPTION_STYLE__STROKE_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -165,7 +165,7 @@ protected void addStrokeColorPropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Style.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Style.svg")); } /** @@ -186,7 +186,7 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { PieChartDescriptionStyle pieChartDescriptionStyle = (PieChartDescriptionStyle) object; - return this.getString("_UI_PieChartDescriptionStyle_type") + " " + pieChartDescriptionStyle.getFontSize(); //$NON-NLS-1$ //$NON-NLS-2$ + return this.getString("_UI_PieChartDescriptionStyle_type") + " " + pieChartDescriptionStyle.getFontSize(); } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/RadioDescriptionItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/RadioDescriptionItemProvider.java index 8d59bbbabc..fd49635232 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/RadioDescriptionItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/RadioDescriptionItemProvider.java @@ -66,8 +66,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addValueExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_RadioDescription_valueExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_RadioDescription_valueExpression_feature", "_UI_RadioDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_RadioDescription_valueExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_RadioDescription_valueExpression_feature", "_UI_RadioDescription_type"), ViewPackage.Literals.RADIO_DESCRIPTION__VALUE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -79,8 +79,8 @@ protected void addValueExpressionPropertyDescriptor(Object object) { */ protected void addCandidatesExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_RadioDescription_candidatesExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_RadioDescription_candidatesExpression_feature", "_UI_RadioDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_RadioDescription_candidatesExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_RadioDescription_candidatesExpression_feature", "_UI_RadioDescription_type"), ViewPackage.Literals.RADIO_DESCRIPTION__CANDIDATES_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -92,8 +92,8 @@ protected void addCandidatesExpressionPropertyDescriptor(Object object) { */ protected void addCandidateLabelExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_RadioDescription_candidateLabelExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_RadioDescription_candidateLabelExpression_feature", "_UI_RadioDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_RadioDescription_candidateLabelExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_RadioDescription_candidateLabelExpression_feature", "_UI_RadioDescription_type"), ViewPackage.Literals.RADIO_DESCRIPTION__CANDIDATE_LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -136,7 +136,7 @@ protected EStructuralFeature getChildFeature(Object object, Object child) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/RadioDescription.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/RadioDescription.svg")); } /** @@ -157,8 +157,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((RadioDescription) object).getName(); - return label == null || label.length() == 0 ? this.getString("_UI_RadioDescription_type") : //$NON-NLS-1$ - this.getString("_UI_RadioDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_RadioDescription_type") : + this.getString("_UI_RadioDescription_type") + " " + label; } /** @@ -230,7 +230,7 @@ public String getCreateChildText(Object owner, Object feature, Object child, Col boolean qualify = childFeature == ViewPackage.Literals.RADIO_DESCRIPTION__STYLE || childFeature == ViewPackage.Literals.RADIO_DESCRIPTION__CONDITIONAL_STYLES; if (qualify) { - return this.getString("_UI_CreateChild_text2", //$NON-NLS-1$ + return this.getString("_UI_CreateChild_text2", new Object[] { this.getTypeText(childObject), this.getFeatureText(childFeature), this.getTypeText(owner) }); } return super.getCreateChildText(owner, feature, child, selection); diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/RadioDescriptionStyleItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/RadioDescriptionStyleItemProvider.java index 0892d4f827..2c8e354601 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/RadioDescriptionStyleItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/RadioDescriptionStyleItemProvider.java @@ -67,8 +67,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addFontSizePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_fontSize_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_fontSize_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } @@ -79,8 +79,8 @@ protected void addFontSizePropertyDescriptor(Object object) { */ protected void addItalicPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__ITALIC, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -91,8 +91,8 @@ protected void addItalicPropertyDescriptor(Object object) { */ protected void addBoldPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__BOLD, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -103,8 +103,8 @@ protected void addBoldPropertyDescriptor(Object object) { */ protected void addUnderlinePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_underline_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_underline_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__UNDERLINE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -115,8 +115,8 @@ protected void addUnderlinePropertyDescriptor(Object object) { */ protected void addStrikeThroughPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_strikeThrough_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_strikeThrough_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__STRIKE_THROUGH, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -127,8 +127,8 @@ protected void addStrikeThroughPropertyDescriptor(Object object) { */ protected void addColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_RadioDescriptionStyle_color_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_RadioDescriptionStyle_color_feature", "_UI_RadioDescriptionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_RadioDescriptionStyle_color_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_RadioDescriptionStyle_color_feature", "_UI_RadioDescriptionStyle_type"), ViewPackage.Literals.RADIO_DESCRIPTION_STYLE__COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -139,7 +139,7 @@ protected void addColorPropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Style.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Style.svg")); } /** @@ -160,7 +160,7 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { RadioDescriptionStyle radioDescriptionStyle = (RadioDescriptionStyle) object; - return this.getString("_UI_RadioDescriptionStyle_type") + " " + radioDescriptionStyle.getFontSize(); //$NON-NLS-1$ //$NON-NLS-2$ + return this.getString("_UI_RadioDescriptionStyle_type") + " " + radioDescriptionStyle.getFontSize(); } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/RectangularNodeStyleDescriptionItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/RectangularNodeStyleDescriptionItemProvider.java index 5cb8ede522..30b535b3fd 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/RectangularNodeStyleDescriptionItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/RectangularNodeStyleDescriptionItemProvider.java @@ -74,8 +74,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addFontSizePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_fontSize_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_fontSize_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } @@ -86,8 +86,8 @@ protected void addFontSizePropertyDescriptor(Object object) { */ protected void addItalicPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__ITALIC, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -98,8 +98,8 @@ protected void addItalicPropertyDescriptor(Object object) { */ protected void addBoldPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__BOLD, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -110,8 +110,8 @@ protected void addBoldPropertyDescriptor(Object object) { */ protected void addUnderlinePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_underline_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_underline_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__UNDERLINE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -122,8 +122,8 @@ protected void addUnderlinePropertyDescriptor(Object object) { */ protected void addStrikeThroughPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_strikeThrough_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_strikeThrough_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__STRIKE_THROUGH, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -134,8 +134,8 @@ protected void addStrikeThroughPropertyDescriptor(Object object) { */ protected void addBorderColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_BorderStyle_borderColor_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_BorderStyle_borderColor_feature", "_UI_BorderStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_BorderStyle_borderColor_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_BorderStyle_borderColor_feature", "_UI_BorderStyle_type"), ViewPackage.Literals.BORDER_STYLE__BORDER_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -146,8 +146,8 @@ protected void addBorderColorPropertyDescriptor(Object object) { */ protected void addBorderRadiusPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_BorderStyle_borderRadius_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_BorderStyle_borderRadius_feature", "_UI_BorderStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_BorderStyle_borderRadius_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_BorderStyle_borderRadius_feature", "_UI_BorderStyle_type"), ViewPackage.Literals.BORDER_STYLE__BORDER_RADIUS, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } @@ -158,8 +158,8 @@ protected void addBorderRadiusPropertyDescriptor(Object object) { */ protected void addBorderSizePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_BorderStyle_borderSize_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_BorderStyle_borderSize_feature", "_UI_BorderStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_BorderStyle_borderSize_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_BorderStyle_borderSize_feature", "_UI_BorderStyle_type"), ViewPackage.Literals.BORDER_STYLE__BORDER_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } @@ -170,8 +170,8 @@ protected void addBorderSizePropertyDescriptor(Object object) { */ protected void addBorderLineStylePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_BorderStyle_borderLineStyle_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_BorderStyle_borderLineStyle_feature", "_UI_BorderStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_BorderStyle_borderLineStyle_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_BorderStyle_borderLineStyle_feature", "_UI_BorderStyle_type"), ViewPackage.Literals.BORDER_STYLE__BORDER_LINE_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -182,8 +182,8 @@ protected void addBorderLineStylePropertyDescriptor(Object object) { */ protected void addLabelColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_NodeStyleDescription_labelColor_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_NodeStyleDescription_labelColor_feature", "_UI_NodeStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_NodeStyleDescription_labelColor_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_NodeStyleDescription_labelColor_feature", "_UI_NodeStyleDescription_type"), ViewPackage.Literals.NODE_STYLE_DESCRIPTION__LABEL_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -195,8 +195,8 @@ protected void addLabelColorPropertyDescriptor(Object object) { */ protected void addSizeComputationExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_NodeStyleDescription_sizeComputationExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_NodeStyleDescription_sizeComputationExpression_feature", "_UI_NodeStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_NodeStyleDescription_sizeComputationExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_NodeStyleDescription_sizeComputationExpression_feature", "_UI_NodeStyleDescription_type"), ViewPackage.Literals.NODE_STYLE_DESCRIPTION__SIZE_COMPUTATION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -207,8 +207,8 @@ protected void addSizeComputationExpressionPropertyDescriptor(Object object) { */ protected void addShowIconPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_NodeStyleDescription_showIcon_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_NodeStyleDescription_showIcon_feature", "_UI_NodeStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_NodeStyleDescription_showIcon_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_NodeStyleDescription_showIcon_feature", "_UI_NodeStyleDescription_type"), ViewPackage.Literals.NODE_STYLE_DESCRIPTION__SHOW_ICON, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -219,8 +219,8 @@ protected void addShowIconPropertyDescriptor(Object object) { */ protected void addWithHeaderPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_RectangularNodeStyleDescription_withHeader_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_RectangularNodeStyleDescription_withHeader_feature", "_UI_RectangularNodeStyleDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_RectangularNodeStyleDescription_withHeader_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_RectangularNodeStyleDescription_withHeader_feature", "_UI_RectangularNodeStyleDescription_type"), ViewPackage.Literals.RECTANGULAR_NODE_STYLE_DESCRIPTION__WITH_HEADER, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -231,7 +231,7 @@ protected void addWithHeaderPropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Style.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Style.svg")); } /** @@ -252,8 +252,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((RectangularNodeStyleDescription) object).getColor(); - return label == null || label.length() == 0 ? this.getString("_UI_RectangularNodeStyleDescription_type") : //$NON-NLS-1$ - this.getString("_UI_RectangularNodeStyleDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_RectangularNodeStyleDescription_type") : + this.getString("_UI_RectangularNodeStyleDescription_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/RepresentationDescriptionItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/RepresentationDescriptionItemProvider.java index 521df2e131..c66ed4c23f 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/RepresentationDescriptionItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/RepresentationDescriptionItemProvider.java @@ -73,8 +73,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addNamePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_RepresentationDescription_name_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_RepresentationDescription_name_feature", "_UI_RepresentationDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_RepresentationDescription_name_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_RepresentationDescription_name_feature", "_UI_RepresentationDescription_type"), ViewPackage.Literals.REPRESENTATION_DESCRIPTION__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -85,8 +85,8 @@ protected void addNamePropertyDescriptor(Object object) { */ protected void addDomainTypePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_RepresentationDescription_domainType_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_RepresentationDescription_domainType_feature", "_UI_RepresentationDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_RepresentationDescription_domainType_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_RepresentationDescription_domainType_feature", "_UI_RepresentationDescription_type"), ViewPackage.Literals.REPRESENTATION_DESCRIPTION__DOMAIN_TYPE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -98,8 +98,8 @@ protected void addDomainTypePropertyDescriptor(Object object) { */ protected void addPreconditionExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_RepresentationDescription_preconditionExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_RepresentationDescription_preconditionExpression_feature", "_UI_RepresentationDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_RepresentationDescription_preconditionExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_RepresentationDescription_preconditionExpression_feature", "_UI_RepresentationDescription_type"), ViewPackage.Literals.REPRESENTATION_DESCRIPTION__PRECONDITION_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -110,8 +110,8 @@ protected void addPreconditionExpressionPropertyDescriptor(Object object) { */ protected void addTitleExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_RepresentationDescription_titleExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_RepresentationDescription_titleExpression_feature", "_UI_RepresentationDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_RepresentationDescription_titleExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_RepresentationDescription_titleExpression_feature", "_UI_RepresentationDescription_type"), ViewPackage.Literals.REPRESENTATION_DESCRIPTION__TITLE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -122,7 +122,7 @@ protected void addTitleExpressionPropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/RepresentationDescription.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/RepresentationDescription.svg")); } /** @@ -143,8 +143,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((RepresentationDescription) object).getName(); - return label == null || label.length() == 0 ? this.getString("_UI_RepresentationDescription_type") : //$NON-NLS-1$ - this.getString("_UI_RepresentationDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_RepresentationDescription_type") : + this.getString("_UI_RepresentationDescription_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/RichTextDescriptionItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/RichTextDescriptionItemProvider.java index db63ce279c..bd6de2446a 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/RichTextDescriptionItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/RichTextDescriptionItemProvider.java @@ -64,8 +64,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addValueExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_RichTextDescription_valueExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_RichTextDescription_valueExpression_feature", "_UI_RichTextDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_RichTextDescription_valueExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_RichTextDescription_valueExpression_feature", "_UI_RichTextDescription_type"), ViewPackage.Literals.RICH_TEXT_DESCRIPTION__VALUE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -106,7 +106,7 @@ protected EStructuralFeature getChildFeature(Object object, Object child) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/RichTextDescription.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/RichTextDescription.svg")); } /** @@ -127,8 +127,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((RichTextDescription) object).getName(); - return label == null || label.length() == 0 ? this.getString("_UI_RichTextDescription_type") : //$NON-NLS-1$ - this.getString("_UI_RichTextDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_RichTextDescription_type") : + this.getString("_UI_RichTextDescription_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/SelectDescriptionItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/SelectDescriptionItemProvider.java index 1a8168f50a..ff761fc28d 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/SelectDescriptionItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/SelectDescriptionItemProvider.java @@ -66,8 +66,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addValueExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_SelectDescription_valueExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_SelectDescription_valueExpression_feature", "_UI_SelectDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_SelectDescription_valueExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_SelectDescription_valueExpression_feature", "_UI_SelectDescription_type"), ViewPackage.Literals.SELECT_DESCRIPTION__VALUE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -79,8 +79,8 @@ protected void addValueExpressionPropertyDescriptor(Object object) { */ protected void addCandidatesExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_SelectDescription_candidatesExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_SelectDescription_candidatesExpression_feature", "_UI_SelectDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_SelectDescription_candidatesExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_SelectDescription_candidatesExpression_feature", "_UI_SelectDescription_type"), ViewPackage.Literals.SELECT_DESCRIPTION__CANDIDATES_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -92,8 +92,8 @@ protected void addCandidatesExpressionPropertyDescriptor(Object object) { */ protected void addCandidateLabelExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_SelectDescription_candidateLabelExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_SelectDescription_candidateLabelExpression_feature", "_UI_SelectDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_SelectDescription_candidateLabelExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_SelectDescription_candidateLabelExpression_feature", "_UI_SelectDescription_type"), ViewPackage.Literals.SELECT_DESCRIPTION__CANDIDATE_LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -136,7 +136,7 @@ protected EStructuralFeature getChildFeature(Object object, Object child) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/SelectDescription.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/SelectDescription.svg")); } /** @@ -157,8 +157,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((SelectDescription) object).getName(); - return label == null || label.length() == 0 ? this.getString("_UI_SelectDescription_type") : //$NON-NLS-1$ - this.getString("_UI_SelectDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_SelectDescription_type") : + this.getString("_UI_SelectDescription_type") + " " + label; } /** @@ -230,7 +230,7 @@ public String getCreateChildText(Object owner, Object feature, Object child, Col boolean qualify = childFeature == ViewPackage.Literals.SELECT_DESCRIPTION__STYLE || childFeature == ViewPackage.Literals.SELECT_DESCRIPTION__CONDITIONAL_STYLES; if (qualify) { - return this.getString("_UI_CreateChild_text2", //$NON-NLS-1$ + return this.getString("_UI_CreateChild_text2", new Object[] { this.getTypeText(childObject), this.getFeatureText(childFeature), this.getTypeText(owner) }); } return super.getCreateChildText(owner, feature, child, selection); diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/SelectDescriptionStyleItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/SelectDescriptionStyleItemProvider.java index 55e3ad3e43..a4ee5b4518 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/SelectDescriptionStyleItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/SelectDescriptionStyleItemProvider.java @@ -68,8 +68,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addFontSizePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_fontSize_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_fontSize_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } @@ -80,8 +80,8 @@ protected void addFontSizePropertyDescriptor(Object object) { */ protected void addItalicPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__ITALIC, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -92,8 +92,8 @@ protected void addItalicPropertyDescriptor(Object object) { */ protected void addBoldPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__BOLD, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -104,8 +104,8 @@ protected void addBoldPropertyDescriptor(Object object) { */ protected void addUnderlinePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_underline_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_underline_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__UNDERLINE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -116,8 +116,8 @@ protected void addUnderlinePropertyDescriptor(Object object) { */ protected void addStrikeThroughPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_strikeThrough_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_strikeThrough_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__STRIKE_THROUGH, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -128,8 +128,8 @@ protected void addStrikeThroughPropertyDescriptor(Object object) { */ protected void addBackgroundColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_SelectDescriptionStyle_backgroundColor_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_SelectDescriptionStyle_backgroundColor_feature", "_UI_SelectDescriptionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_SelectDescriptionStyle_backgroundColor_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_SelectDescriptionStyle_backgroundColor_feature", "_UI_SelectDescriptionStyle_type"), ViewPackage.Literals.SELECT_DESCRIPTION_STYLE__BACKGROUND_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -140,8 +140,8 @@ protected void addBackgroundColorPropertyDescriptor(Object object) { */ protected void addForegroundColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_SelectDescriptionStyle_foregroundColor_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_SelectDescriptionStyle_foregroundColor_feature", "_UI_SelectDescriptionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_SelectDescriptionStyle_foregroundColor_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_SelectDescriptionStyle_foregroundColor_feature", "_UI_SelectDescriptionStyle_type"), ViewPackage.Literals.SELECT_DESCRIPTION_STYLE__FOREGROUND_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -152,7 +152,7 @@ protected void addForegroundColorPropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Style.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Style.svg")); } /** @@ -173,7 +173,7 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { SelectDescriptionStyle selectDescriptionStyle = (SelectDescriptionStyle) object; - return this.getString("_UI_SelectDescriptionStyle_type") + " " + selectDescriptionStyle.getFontSize(); //$NON-NLS-1$ //$NON-NLS-2$ + return this.getString("_UI_SelectDescriptionStyle_type") + " " + selectDescriptionStyle.getFontSize(); } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/SetValueItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/SetValueItemProvider.java index f2faa56daa..19025be204 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/SetValueItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/SetValueItemProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -63,8 +63,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addFeatureNamePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_SetValue_featureName_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_SetValue_featureName_feature", "_UI_SetValue_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_SetValue_featureName_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_SetValue_featureName_feature", "_UI_SetValue_type"), ViewPackage.Literals.SET_VALUE__FEATURE_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -75,8 +75,8 @@ protected void addFeatureNamePropertyDescriptor(Object object) { */ protected void addValueExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_SetValue_valueExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_SetValue_valueExpression_feature", "_UI_SetValue_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_SetValue_valueExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_SetValue_valueExpression_feature", "_UI_SetValue_type"), ViewPackage.Literals.SET_VALUE__VALUE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -87,7 +87,7 @@ protected void addValueExpressionPropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/SetValue.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/SetValue.svg")); } /** @@ -108,8 +108,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((SetValue) object).getFeatureName(); - return label == null || label.length() == 0 ? this.getString("_UI_SetValue_type") : //$NON-NLS-1$ - this.getString("_UI_SetValue_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_SetValue_type") : + this.getString("_UI_SetValue_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/SourceEdgeEndReconnectionToolItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/SourceEdgeEndReconnectionToolItemProvider.java index 2fc51cc0d5..5bd5089028 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/SourceEdgeEndReconnectionToolItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/SourceEdgeEndReconnectionToolItemProvider.java @@ -57,7 +57,7 @@ public List getPropertyDescriptors(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/SourceEdgeEndReconnectionTool")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/SourceEdgeEndReconnectionTool")); } /** @@ -78,8 +78,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((SourceEdgeEndReconnectionTool) object).getName(); - return label == null || label.length() == 0 ? this.getString("_UI_SourceEdgeEndReconnectionTool_type") : //$NON-NLS-1$ - this.getString("_UI_SourceEdgeEndReconnectionTool_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_SourceEdgeEndReconnectionTool_type") : + this.getString("_UI_SourceEdgeEndReconnectionTool_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/StyleItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/StyleItemProvider.java index 5df5b31573..723d8212a7 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/StyleItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/StyleItemProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -69,8 +69,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors - .add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_Style_color_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_Style_color_feature", "_UI_Style_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + .add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_Style_color_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_Style_color_feature", "_UI_Style_type"), ViewPackage.Literals.STYLE__COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -81,7 +81,7 @@ protected void addColorPropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Style")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Style")); } /** @@ -102,8 +102,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((Style) object).getColor(); - return label == null || label.length() == 0 ? this.getString("_UI_Style_type") : //$NON-NLS-1$ - this.getString("_UI_Style_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_Style_type") : + this.getString("_UI_Style_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/TargetEdgeEndReconnectionToolItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/TargetEdgeEndReconnectionToolItemProvider.java index e5d106288a..13a23bc843 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/TargetEdgeEndReconnectionToolItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/TargetEdgeEndReconnectionToolItemProvider.java @@ -57,7 +57,7 @@ public List getPropertyDescriptors(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/TargetEdgeEndReconnectionTool")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/TargetEdgeEndReconnectionTool")); } /** @@ -78,8 +78,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((TargetEdgeEndReconnectionTool) object).getName(); - return label == null || label.length() == 0 ? this.getString("_UI_TargetEdgeEndReconnectionTool_type") : //$NON-NLS-1$ - this.getString("_UI_TargetEdgeEndReconnectionTool_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_TargetEdgeEndReconnectionTool_type") : + this.getString("_UI_TargetEdgeEndReconnectionTool_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/TextAreaDescriptionItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/TextAreaDescriptionItemProvider.java index 953ce84657..6b99ba623d 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/TextAreaDescriptionItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/TextAreaDescriptionItemProvider.java @@ -64,8 +64,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addValueExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_TextAreaDescription_valueExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_TextAreaDescription_valueExpression_feature", "_UI_TextAreaDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_TextAreaDescription_valueExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_TextAreaDescription_valueExpression_feature", "_UI_TextAreaDescription_type"), ViewPackage.Literals.TEXT_AREA_DESCRIPTION__VALUE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -108,7 +108,7 @@ protected EStructuralFeature getChildFeature(Object object, Object child) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/TextareaDescription.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/TextareaDescription.svg")); } /** @@ -129,8 +129,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((TextAreaDescription) object).getName(); - return label == null || label.length() == 0 ? this.getString("_UI_TextAreaDescription_type") : //$NON-NLS-1$ - this.getString("_UI_TextAreaDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_TextAreaDescription_type") : + this.getString("_UI_TextAreaDescription_type") + " " + label; } /** @@ -200,7 +200,7 @@ public String getCreateChildText(Object owner, Object feature, Object child, Col boolean qualify = childFeature == ViewPackage.Literals.TEXT_AREA_DESCRIPTION__STYLE || childFeature == ViewPackage.Literals.TEXT_AREA_DESCRIPTION__CONDITIONAL_STYLES; if (qualify) { - return this.getString("_UI_CreateChild_text2", //$NON-NLS-1$ + return this.getString("_UI_CreateChild_text2", new Object[] { this.getTypeText(childObject), this.getFeatureText(childFeature), this.getTypeText(owner) }); } return super.getCreateChildText(owner, feature, child, selection); diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/TextareaDescriptionStyleItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/TextareaDescriptionStyleItemProvider.java index 0be9d8fda4..90727a4f51 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/TextareaDescriptionStyleItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/TextareaDescriptionStyleItemProvider.java @@ -68,8 +68,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addFontSizePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_fontSize_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_fontSize_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } @@ -80,8 +80,8 @@ protected void addFontSizePropertyDescriptor(Object object) { */ protected void addItalicPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__ITALIC, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -92,8 +92,8 @@ protected void addItalicPropertyDescriptor(Object object) { */ protected void addBoldPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__BOLD, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -104,8 +104,8 @@ protected void addBoldPropertyDescriptor(Object object) { */ protected void addUnderlinePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_underline_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_underline_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__UNDERLINE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -116,8 +116,8 @@ protected void addUnderlinePropertyDescriptor(Object object) { */ protected void addStrikeThroughPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_strikeThrough_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_strikeThrough_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__STRIKE_THROUGH, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -128,8 +128,8 @@ protected void addStrikeThroughPropertyDescriptor(Object object) { */ protected void addBackgroundColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_TextareaDescriptionStyle_backgroundColor_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_TextareaDescriptionStyle_backgroundColor_feature", "_UI_TextareaDescriptionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_TextareaDescriptionStyle_backgroundColor_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_TextareaDescriptionStyle_backgroundColor_feature", "_UI_TextareaDescriptionStyle_type"), ViewPackage.Literals.TEXTAREA_DESCRIPTION_STYLE__BACKGROUND_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -140,8 +140,8 @@ protected void addBackgroundColorPropertyDescriptor(Object object) { */ protected void addForegroundColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_TextareaDescriptionStyle_foregroundColor_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_TextareaDescriptionStyle_foregroundColor_feature", "_UI_TextareaDescriptionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_TextareaDescriptionStyle_foregroundColor_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_TextareaDescriptionStyle_foregroundColor_feature", "_UI_TextareaDescriptionStyle_type"), ViewPackage.Literals.TEXTAREA_DESCRIPTION_STYLE__FOREGROUND_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -152,7 +152,7 @@ protected void addForegroundColorPropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Style.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Style.svg")); } /** @@ -173,7 +173,7 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { TextareaDescriptionStyle textareaDescriptionStyle = (TextareaDescriptionStyle) object; - return this.getString("_UI_TextareaDescriptionStyle_type") + " " + textareaDescriptionStyle.getFontSize(); //$NON-NLS-1$ //$NON-NLS-2$ + return this.getString("_UI_TextareaDescriptionStyle_type") + " " + textareaDescriptionStyle.getFontSize(); } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/TextfieldDescriptionItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/TextfieldDescriptionItemProvider.java index 8eb5e9d79e..fd953beb75 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/TextfieldDescriptionItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/TextfieldDescriptionItemProvider.java @@ -64,8 +64,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addValueExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_TextfieldDescription_valueExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_TextfieldDescription_valueExpression_feature", "_UI_TextfieldDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_TextfieldDescription_valueExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_TextfieldDescription_valueExpression_feature", "_UI_TextfieldDescription_type"), ViewPackage.Literals.TEXTFIELD_DESCRIPTION__VALUE_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -108,7 +108,7 @@ protected EStructuralFeature getChildFeature(Object object, Object child) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/TextfieldDescription.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/TextfieldDescription.svg")); } /** @@ -129,8 +129,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((TextfieldDescription) object).getName(); - return label == null || label.length() == 0 ? this.getString("_UI_TextfieldDescription_type") : //$NON-NLS-1$ - this.getString("_UI_TextfieldDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_TextfieldDescription_type") : + this.getString("_UI_TextfieldDescription_type") + " " + label; } /** @@ -200,7 +200,7 @@ public String getCreateChildText(Object owner, Object feature, Object child, Col boolean qualify = childFeature == ViewPackage.Literals.TEXTFIELD_DESCRIPTION__STYLE || childFeature == ViewPackage.Literals.TEXTFIELD_DESCRIPTION__CONDITIONAL_STYLES; if (qualify) { - return this.getString("_UI_CreateChild_text2", //$NON-NLS-1$ + return this.getString("_UI_CreateChild_text2", new Object[] { this.getTypeText(childObject), this.getFeatureText(childFeature), this.getTypeText(owner) }); } return super.getCreateChildText(owner, feature, child, selection); diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/TextfieldDescriptionStyleItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/TextfieldDescriptionStyleItemProvider.java index fd11c597dc..7e308d7d75 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/TextfieldDescriptionStyleItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/TextfieldDescriptionStyleItemProvider.java @@ -68,8 +68,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addFontSizePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_fontSize_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_fontSize_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_fontSize_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } @@ -80,8 +80,8 @@ protected void addFontSizePropertyDescriptor(Object object) { */ protected void addItalicPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_italic_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_italic_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__ITALIC, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -92,8 +92,8 @@ protected void addItalicPropertyDescriptor(Object object) { */ protected void addBoldPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add( - this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_LabelStyle_bold_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_bold_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__BOLD, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -104,8 +104,8 @@ protected void addBoldPropertyDescriptor(Object object) { */ protected void addUnderlinePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_underline_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_underline_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_underline_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__UNDERLINE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -116,8 +116,8 @@ protected void addUnderlinePropertyDescriptor(Object object) { */ protected void addStrikeThroughPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_LabelStyle_strikeThrough_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_LabelStyle_strikeThrough_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_LabelStyle_strikeThrough_feature", "_UI_LabelStyle_type"), ViewPackage.Literals.LABEL_STYLE__STRIKE_THROUGH, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } @@ -128,8 +128,8 @@ protected void addStrikeThroughPropertyDescriptor(Object object) { */ protected void addBackgroundColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_TextfieldDescriptionStyle_backgroundColor_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_TextfieldDescriptionStyle_backgroundColor_feature", "_UI_TextfieldDescriptionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_TextfieldDescriptionStyle_backgroundColor_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_TextfieldDescriptionStyle_backgroundColor_feature", "_UI_TextfieldDescriptionStyle_type"), ViewPackage.Literals.TEXTFIELD_DESCRIPTION_STYLE__BACKGROUND_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -140,8 +140,8 @@ protected void addBackgroundColorPropertyDescriptor(Object object) { */ protected void addForegroundColorPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_TextfieldDescriptionStyle_foregroundColor_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_TextfieldDescriptionStyle_foregroundColor_feature", "_UI_TextfieldDescriptionStyle_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_TextfieldDescriptionStyle_foregroundColor_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_TextfieldDescriptionStyle_foregroundColor_feature", "_UI_TextfieldDescriptionStyle_type"), ViewPackage.Literals.TEXTFIELD_DESCRIPTION_STYLE__FOREGROUND_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -152,7 +152,7 @@ protected void addForegroundColorPropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Style.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/Style.svg")); } /** @@ -173,7 +173,7 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { TextfieldDescriptionStyle textfieldDescriptionStyle = (TextfieldDescriptionStyle) object; - return this.getString("_UI_TextfieldDescriptionStyle_type") + " " + textfieldDescriptionStyle.getFontSize(); //$NON-NLS-1$ //$NON-NLS-2$ + return this.getString("_UI_TextfieldDescriptionStyle_type") + " " + textfieldDescriptionStyle.getFontSize(); } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ToolItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ToolItemProvider.java index 62f8227670..511bab1451 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ToolItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ToolItemProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -71,8 +71,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addNamePropertyDescriptor(Object object) { this.itemPropertyDescriptors - .add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_Tool_name_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_Tool_name_feature", "_UI_Tool_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + .add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), this.getString("_UI_Tool_name_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_Tool_name_feature", "_UI_Tool_type"), ViewPackage.Literals.TOOL__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -124,8 +124,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((Tool) object).getName(); - return label == null || label.length() == 0 ? this.getString("_UI_Tool_type") : //$NON-NLS-1$ - this.getString("_UI_Tool_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_Tool_type") : + this.getString("_UI_Tool_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/UnsetValueItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/UnsetValueItemProvider.java index dea6d796bc..52e4b82536 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/UnsetValueItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/UnsetValueItemProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -63,8 +63,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addFeatureNamePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_UnsetValue_featureName_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_UnsetValue_featureName_feature", "_UI_UnsetValue_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_UnsetValue_featureName_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_UnsetValue_featureName_feature", "_UI_UnsetValue_type"), ViewPackage.Literals.UNSET_VALUE__FEATURE_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -75,8 +75,8 @@ protected void addFeatureNamePropertyDescriptor(Object object) { */ protected void addElementExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_UnsetValue_elementExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_UnsetValue_elementExpression_feature", "_UI_UnsetValue_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_UnsetValue_elementExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_UnsetValue_elementExpression_feature", "_UI_UnsetValue_type"), ViewPackage.Literals.UNSET_VALUE__ELEMENT_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -87,7 +87,7 @@ protected void addElementExpressionPropertyDescriptor(Object object) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/UnsetValue.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/UnsetValue.svg")); } /** @@ -108,8 +108,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((UnsetValue) object).getFeatureName(); - return label == null || label.length() == 0 ? this.getString("_UI_UnsetValue_type") : //$NON-NLS-1$ - this.getString("_UI_UnsetValue_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_UnsetValue_type") : + this.getString("_UI_UnsetValue_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ViewEditPlugin.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ViewEditPlugin.java index 4a7e5944a5..9204c0483c 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ViewEditPlugin.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ViewEditPlugin.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -71,7 +71,7 @@ public static Implementation getPlugin() { @Override protected Object doGetImage(String key) throws IOException { - URL url = new URL(this.getBaseURL() + "icons/" + key + extensionFor(key)); //$NON-NLS-1$ + URL url = new URL(this.getBaseURL() + "icons/" + key + extensionFor(key)); InputStream inputStream = url.openStream(); inputStream.close(); return url; @@ -85,21 +85,21 @@ protected Object doGetImage(String key) throws IOException { * @return the file extension to be used with the key to specify an image resource. */ protected static String extensionFor(String key) { - String result = ".gif"; //$NON-NLS-1$ + String result = ".gif"; int index = key.lastIndexOf('.'); if (index != -1) { String extension = key.substring(index + 1); // @formatter:off - if ("png".equalsIgnoreCase(extension) || //$NON-NLS-1$ - "gif".equalsIgnoreCase(extension) || //$NON-NLS-1$ - "bmp".equalsIgnoreCase(extension) || //$NON-NLS-1$ - "ico".equalsIgnoreCase(extension) || //$NON-NLS-1$ - "jpg".equalsIgnoreCase(extension) || //$NON-NLS-1$ - "jpeg".equalsIgnoreCase(extension) || //$NON-NLS-1$ - "tif".equalsIgnoreCase(extension) || //$NON-NLS-1$ - "tiff".equalsIgnoreCase(extension) || //$NON-NLS-1$ - "svg".equalsIgnoreCase(extension)) { //$NON-NLS-1$ - result = ""; //$NON-NLS-1$ + if ("png".equalsIgnoreCase(extension) || + "gif".equalsIgnoreCase(extension) || + "bmp".equalsIgnoreCase(extension) || + "ico".equalsIgnoreCase(extension) || + "jpg".equalsIgnoreCase(extension) || + "jpeg".equalsIgnoreCase(extension) || + "tif".equalsIgnoreCase(extension) || + "tiff".equalsIgnoreCase(extension) || + "svg".equalsIgnoreCase(extension)) { + result = ""; } // @formatter:on } diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ViewItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ViewItemProvider.java index 442c4e61af..3892200c4b 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ViewItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/ViewItemProvider.java @@ -101,7 +101,7 @@ protected EStructuralFeature getChildFeature(Object object, Object child) { */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/View.svg")); //$NON-NLS-1$ + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/View.svg")); } /** @@ -121,7 +121,7 @@ protected boolean shouldComposeCreationImage() { */ @Override public String getText(Object object) { - return this.getString("_UI_View_type"); //$NON-NLS-1$ + return this.getString("_UI_View_type"); } /** @@ -154,11 +154,11 @@ protected void collectNewChildDescriptors(Collection newChildDescriptors super.collectNewChildDescriptors(newChildDescriptors, object); DiagramDescription newDiagramDescription = ViewFactory.eINSTANCE.createDiagramDescription(); - newDiagramDescription.setName("New Diagram Description"); //$NON-NLS-1$ + newDiagramDescription.setName("New Diagram Description"); newChildDescriptors.add(this.createChildParameter(ViewPackage.Literals.VIEW__DESCRIPTIONS, newDiagramDescription)); FormDescription newFormDescription = ViewFactory.eINSTANCE.createFormDescription(); - newFormDescription.setName("New Form Description"); //$NON-NLS-1$ + newFormDescription.setName("New Form Description"); GroupDescription groupDescription = ViewFactory.eINSTANCE.createGroupDescription(); newFormDescription.getGroups().add(groupDescription); newChildDescriptors.add(this.createChildParameter(ViewPackage.Literals.VIEW__DESCRIPTIONS, newFormDescription)); diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/WidgetDescriptionItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/WidgetDescriptionItemProvider.java index 91b72c9e5e..1752e03850 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/WidgetDescriptionItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/WidgetDescriptionItemProvider.java @@ -71,8 +71,8 @@ public List getPropertyDescriptors(Object object) { */ protected void addNamePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_WidgetDescription_name_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_WidgetDescription_name_feature", "_UI_WidgetDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_WidgetDescription_name_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_WidgetDescription_name_feature", "_UI_WidgetDescription_type"), ViewPackage.Literals.WIDGET_DESCRIPTION__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -83,8 +83,8 @@ protected void addNamePropertyDescriptor(Object object) { */ protected void addLabelExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_WidgetDescription_labelExpression_feature"), //$NON-NLS-1$ - this.getString("_UI_PropertyDescriptor_description", "_UI_WidgetDescription_labelExpression_feature", "_UI_WidgetDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + this.getString("_UI_WidgetDescription_labelExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_WidgetDescription_labelExpression_feature", "_UI_WidgetDescription_type"), ViewPackage.Literals.WIDGET_DESCRIPTION__LABEL_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } @@ -106,8 +106,8 @@ protected boolean shouldComposeCreationImage() { @Override public String getText(Object object) { String label = ((WidgetDescription) object).getName(); - return label == null || label.length() == 0 ? this.getString("_UI_WidgetDescription_type") : //$NON-NLS-1$ - this.getString("_UI_WidgetDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + return label == null || label.length() == 0 ? this.getString("_UI_WidgetDescription_type") : + this.getString("_UI_WidgetDescription_type") + " " + label; } /** diff --git a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/WidgetDescriptionStyleItemProvider.java b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/WidgetDescriptionStyleItemProvider.java index 91ddc5af9e..7dc8bdd97b 100644 --- a/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/WidgetDescriptionStyleItemProvider.java +++ b/packages/view/backend/sirius-components-view-edit/src/main/java/org/eclipse/sirius/components/view/provider/WidgetDescriptionStyleItemProvider.java @@ -74,7 +74,7 @@ protected boolean shouldComposeCreationImage() { */ @Override public String getText(Object object) { - return this.getString("_UI_WidgetDescriptionStyle_type"); //$NON-NLS-1$ + return this.getString("_UI_WidgetDescriptionStyle_type"); } /** diff --git a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/AQLTextfieldCustomizer.java b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/AQLTextfieldCustomizer.java index 08fbdd49c3..bd04a14f61 100644 --- a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/AQLTextfieldCustomizer.java +++ b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/AQLTextfieldCustomizer.java @@ -52,11 +52,11 @@ public class AQLTextfieldCustomizer implements ITextfieldCustomizer { /** * The background color used to visually distinguish AQL expressions. */ - private static final String BACKGROUND_COLOR = "#fff8e5"; //$NON-NLS-1$ + private static final String BACKGROUND_COLOR = "#fff8e5"; private static final TextareaStyle STYLE = TextareaStyle.newTextareaStyle().backgroundColor(BACKGROUND_COLOR).build(); - private static final String AQL_PREFIX = "aql:"; //$NON-NLS-1$ + private static final String AQL_PREFIX = "aql:"; private final ApplicationContext applicationContext; @@ -80,11 +80,11 @@ public Function getStyleProvider() { @Override public Function> getCompletionProposalsProvider() { return variableManager -> { - String currentText = variableManager.get(CompletionRequest.CURRENT_TEXT, String.class).orElse(""); //$NON-NLS-1$ + String currentText = variableManager.get(CompletionRequest.CURRENT_TEXT, String.class).orElse(""); int cursorPosition = variableManager.get(CompletionRequest.CURSOR_POSITION, Integer.class).orElse(0); if (cursorPosition < AQL_PREFIX.length() && currentText.startsWith(AQL_PREFIX.substring(0, cursorPosition))) { - return List.of(new CompletionProposal("AQL prefix", AQL_PREFIX, cursorPosition)); //$NON-NLS-1$ + return List.of(new CompletionProposal("AQL prefix", AQL_PREFIX, cursorPosition)); } List visibleEPackages = variableManager.get(IEditingContext.EDITING_CONTEXT, IEditingContext.class).map(this::getAccessibleEPackages).orElse(List.of()); @@ -144,7 +144,7 @@ private AQLInterpreter createInterpreter(View view, List visibleEPacka try { return beanFactory.createBean(serviceClass); } catch (BeansException beansException) { - //this.logger.warn("Error while trying to instantiate Java service class " + serviceClass.getName(), beansException); //$NON-NLS-1$ + //this.logger.warn("Error while trying to instantiate Java service class " + serviceClass.getName(), beansException); return null; } }) diff --git a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/CanonicalBehaviors.java b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/CanonicalBehaviors.java index 0417191cda..5cd82ed776 100644 --- a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/CanonicalBehaviors.java +++ b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/CanonicalBehaviors.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -120,7 +120,7 @@ private Optional self(VariableManager variableManager) { private Optional createSemanticInstance(EObject self, String domainType) { EPackage ePackage = self.eClass().getEPackage(); final String shortTypeName; - String[] segments = domainType.split("::"); //$NON-NLS-1$ + String[] segments = domainType.split("::"); if (segments.length == 2) { shortTypeName = segments[1]; } else { @@ -139,7 +139,7 @@ private Optional createSemanticInstance(EObject self, String domainType // @formatter:off // Assume the first stringly-typed attribute represents the object's name/label klass.getEAllAttributes().stream().filter(attr -> Objects.equals(String.class, attr.getEType().getInstanceClass())).findFirst().ifPresent(labelAttribute -> { - instance.eSet(labelAttribute, "New " + klass.getName()); //$NON-NLS-1$ + instance.eSet(labelAttribute, "New " + klass.getName()); }); // @formatter:on return Optional.of(instance); diff --git a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/CustomImageMetadata.java b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/CustomImageMetadata.java index 8467b0dcde..e7d61a2034 100644 --- a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/CustomImageMetadata.java +++ b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/CustomImageMetadata.java @@ -56,7 +56,7 @@ public String getContentType() { @Override public String toString() { - String pattern = "{0} '{' id: {1}, projectId: {2}, label: {3}, contentType: {4} '}'"; //$NON-NLS-1$ - return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.projectId.orElse("none"), this.label, this.contentType); //$NON-NLS-1$ + String pattern = "{0} '{' id: {1}, projectId: {2}, label: {3}, contentType: {4} '}'"; + return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.projectId.orElse("none"), this.label, this.contentType); } } diff --git a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/CustomizableEStringIfDescriptionProvider.java b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/CustomizableEStringIfDescriptionProvider.java index a51a386c71..ceedfd92fc 100644 --- a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/CustomizableEStringIfDescriptionProvider.java +++ b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/CustomizableEStringIfDescriptionProvider.java @@ -39,9 +39,9 @@ * @author sbegaudeau */ public class CustomizableEStringIfDescriptionProvider { - private static final String IF_DESCRIPTION_ID = "EString"; //$NON-NLS-1$ + private static final String IF_DESCRIPTION_ID = "EString"; - private static final String TEXTAREA_DESCRIPTION_ID = "Textarea"; //$NON-NLS-1$ + private static final String TEXTAREA_DESCRIPTION_ID = "Textarea"; private final ComposedAdapterFactory composedAdapterFactory; @@ -110,7 +110,7 @@ private Function getValueProvider() { } } - return ""; //$NON-NLS-1$ + return ""; }; } @@ -127,7 +127,7 @@ private BiFunction getNewValueHandler() { return new Success(); } - return new Failure(""); //$NON-NLS-1$ + return new Failure(""); }; } } diff --git a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/DomainTypeTextfieldCustomizer.java b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/DomainTypeTextfieldCustomizer.java index 83ccd12f1b..019ee85b5e 100644 --- a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/DomainTypeTextfieldCustomizer.java +++ b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/DomainTypeTextfieldCustomizer.java @@ -43,7 +43,7 @@ public class DomainTypeTextfieldCustomizer implements ITextfieldCustomizer { /** * The background color used to visually distinguish domain types. */ - private static final String BACKGROUND_COLOR = "#e6f4ee"; //$NON-NLS-1$ + private static final String BACKGROUND_COLOR = "#e6f4ee"; private static final TextareaStyle STYLE = TextareaStyle.newTextareaStyle().backgroundColor(BACKGROUND_COLOR).build(); @@ -60,7 +60,7 @@ public Function getStyleProvider() { @Override public Function> getCompletionProposalsProvider() { return (VariableManager variableManager) -> { - String currentText = variableManager.get(CompletionRequest.CURRENT_TEXT, String.class).orElse(""); //$NON-NLS-1$ + String currentText = variableManager.get(CompletionRequest.CURRENT_TEXT, String.class).orElse(""); int cursorPosition = variableManager.get(CompletionRequest.CURSOR_POSITION, Integer.class).orElse(0); List choices = List.of(); @@ -72,7 +72,7 @@ public Function> getCompletionProposal choices = ePackages.stream().flatMap(ePackage -> { return ePackage.getEClassifiers().stream() .filter(EClass.class::isInstance) - .map(eClassifier -> String.format("%s::%s", ePackage.getName(), eClassifier.getName())) //$NON-NLS-1$ + .map(eClassifier -> String.format("%s::%s", ePackage.getName(), eClassifier.getName())) .distinct(); }).distinct().sorted().collect(Collectors.toList()); // @formatter:on @@ -81,7 +81,7 @@ public Function> getCompletionProposal // @formatter:off return choices.stream() .filter(choice -> choice.startsWith(prefix)) - .map(choice -> new CompletionProposal("Choice " + choice, choice, prefix.length())) //$NON-NLS-1$ + .map(choice -> new CompletionProposal("Choice " + choice, choice, prefix.length())) .collect(Collectors.toList()); // @formatter:on }; diff --git a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/OperationInterpreterViewSwitch.java b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/OperationInterpreterViewSwitch.java index 63fe27a705..80e0f8ebeb 100644 --- a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/OperationInterpreterViewSwitch.java +++ b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/OperationInterpreterViewSwitch.java @@ -190,7 +190,7 @@ private Optional createSemanticInstance(EditingDomain editingDomain, St } private Optional resolveType(EditingDomain editingDomain, String domainType) { - String[] parts = domainType.split("(::?|\\.)"); //$NON-NLS-1$ + String[] parts = domainType.split("(::?|\\.)"); if (parts.length == 2) { // @formatter:off return editingDomain.getResourceSet().getPackageRegistry().values().stream() diff --git a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/ViewConverter.java b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/ViewConverter.java index c7b39b8935..cd0110712e 100644 --- a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/ViewConverter.java +++ b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/ViewConverter.java @@ -92,7 +92,7 @@ private AQLInterpreter createInterpreter(View view, List visibleEPacka try { return beanFactory.createBean(serviceClass); } catch (BeansException beansException) { - this.logger.warn("Error while trying to instantiate Java service class " + serviceClass.getName(), beansException); //$NON-NLS-1$ + this.logger.warn("Error while trying to instantiate Java service class " + serviceClass.getName(), beansException); return null; } }) diff --git a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/ViewPropertiesDescriptionRegistryConfigurer.java b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/ViewPropertiesDescriptionRegistryConfigurer.java index 96b5d6de9f..052d775e1f 100644 --- a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/ViewPropertiesDescriptionRegistryConfigurer.java +++ b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/ViewPropertiesDescriptionRegistryConfigurer.java @@ -68,7 +68,7 @@ @Service public class ViewPropertiesDescriptionRegistryConfigurer implements IPropertiesDescriptionRegistryConfigurer { - public static final String ESTRUCTURAL_FEATURE = "eStructuralFeature"; //$NON-NLS-1$ + public static final String ESTRUCTURAL_FEATURE = "eStructuralFeature"; /** * These types have even more specific properties definition, see {@link NodeStylePropertiesConfigurer}. @@ -115,7 +115,7 @@ private FormDescription getFormDescription() { pageDescriptions.add(firstPageDescription); // @formatter:off - Function labelProvider = variableManager -> "Properties"; //$NON-NLS-1$ + Function labelProvider = variableManager -> "Properties"; // @formatter:on // @formatter:off @@ -126,8 +126,8 @@ private FormDescription getFormDescription() { .map(this.objectService::getId) .orElse(null); - return FormDescription.newFormDescription(UUID.nameUUIDFromBytes("view_properties_description".getBytes()).toString()) //$NON-NLS-1$ - .label("View properties description") //$NON-NLS-1$ + return FormDescription.newFormDescription(UUID.nameUUIDFromBytes("view_properties_description".getBytes()).toString()) + .label("View properties description") .idProvider(new GetOrCreateRandomIdProvider()) .labelProvider(labelProvider) .targetObjectIdProvider(targetObjectIdProvider) @@ -158,7 +158,7 @@ private PageDescription getPageDescription(List groupDescripti }; // @formatter:off - return PageDescription.newPageDescription("firstPageId") //$NON-NLS-1$ + return PageDescription.newPageDescription("firstPageId") .idProvider(idProvider) .labelProvider(labelProvider) .semanticElementsProvider(variableManager -> Collections.singletonList(variableManager.getVariables().get(VariableManager.SELF))) @@ -250,7 +250,7 @@ public boolean handles(EAttribute eAttribute) { } // @formatter:off - ForDescription forDescription = ForDescription.newForDescription("forId") //$NON-NLS-1$ + ForDescription forDescription = ForDescription.newForDescription("forId") .iterator(ESTRUCTURAL_FEATURE) .iterableProvider(iterableProvider) .ifDescriptions(ifDescriptions) @@ -260,9 +260,9 @@ public boolean handles(EAttribute eAttribute) { controlDescriptions.add(forDescription); // @formatter:off - return GroupDescription.newGroupDescription("groupId") //$NON-NLS-1$ - .idProvider(variableManager -> "Core Properties") //$NON-NLS-1$ - .labelProvider(variableManager -> "Core Properties") //$NON-NLS-1$ + return GroupDescription.newGroupDescription("groupId") + .idProvider(variableManager -> "Core Properties") + .labelProvider(variableManager -> "Core Properties") .semanticElementsProvider(variableManager -> Collections.singletonList(variableManager.getVariables().get(VariableManager.SELF))) .controlDescriptions(controlDescriptions) .build(); diff --git a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/DiagramDescriptionValidator.java b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/DiagramDescriptionValidator.java index 0832b824e8..93b22b59b9 100644 --- a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/DiagramDescriptionValidator.java +++ b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/DiagramDescriptionValidator.java @@ -51,13 +51,13 @@ */ public class DiagramDescriptionValidator implements EValidator { - public static final String DIAGRAM_DESCRIPTION_INVALID_DOMAIN_TYPE_ERROR_MESSAGE = "The diagram description \"%1$s\" does not have a valid domain class"; //$NON-NLS-1$ + public static final String DIAGRAM_DESCRIPTION_INVALID_DOMAIN_TYPE_ERROR_MESSAGE = "The diagram description \"%1$s\" does not have a valid domain class"; - public static final String DIAGRAM_ELEMENT_DESCRIPTION_INVALID_DOMAIN_TYPE_ERROR_MESSAGE = "The element description \"%1$s\" does not have a valid domain class"; //$NON-NLS-1$ + public static final String DIAGRAM_ELEMENT_DESCRIPTION_INVALID_DOMAIN_TYPE_ERROR_MESSAGE = "The element description \"%1$s\" does not have a valid domain class"; - public static final String CREATE_INSTANCE_INVALID_DOMAIN_TYPE_ERROR_MESSAGE = "The create instance operation \"%1$s\" does not have a valid domain class"; //$NON-NLS-1$ + public static final String CREATE_INSTANCE_INVALID_DOMAIN_TYPE_ERROR_MESSAGE = "The create instance operation \"%1$s\" does not have a valid domain class"; - public static final String SIRIUS_COMPONENTS_EMF_PACKAGE = "org.eclipse.sirius.components.emf"; //$NON-NLS-1$ + public static final String SIRIUS_COMPONENTS_EMF_PACKAGE = "org.eclipse.sirius.components.emf"; @Override public boolean validate(EObject eObject, DiagnosticChain diagnostics, Map context) { @@ -107,7 +107,7 @@ private boolean conditionIsPresent(Conditional conditional, DiagnosticChain diag BasicDiagnostic basicDiagnostic = new BasicDiagnostic(Diagnostic.ERROR, SIRIUS_COMPONENTS_EMF_PACKAGE, 0, - "The condition should not be empty", //$NON-NLS-1$ + "The condition should not be empty", new Object [] { conditional, ViewPackage.Literals.CONDITIONAL__CONDITION, @@ -128,7 +128,7 @@ private boolean conditionalStyleIsPresent(ConditionalNodeStyle conditionalNodeSt BasicDiagnostic basicDiagnostic = new BasicDiagnostic(Diagnostic.ERROR, SIRIUS_COMPONENTS_EMF_PACKAGE, 0, - "The style should not be empty", //$NON-NLS-1$ + "The style should not be empty", new Object [] { conditionalNodeStyle, ViewPackage.Literals.CONDITIONAL_NODE_STYLE__STYLE, @@ -149,7 +149,7 @@ private boolean hasProperColor(NodeStyleDescription nodeStyle, DiagnosticChain d BasicDiagnostic basicDiagnostic = new BasicDiagnostic(Diagnostic.ERROR, SIRIUS_COMPONENTS_EMF_PACKAGE, 0, - "The color should not be empty", //$NON-NLS-1$ + "The color should not be empty", new Object [] { nodeStyle, ViewPackage.Literals.STYLE__COLOR, @@ -168,7 +168,7 @@ private boolean hasProperDomainType(DiagramDescription diagramDescription, Diagn List entities = this.getDomainEntitiesFromResourceSet(resourceSet); List ePackages = this.getEPackagesFromRegistry(resourceSet.getPackageRegistry()); - String domainType = Optional.ofNullable(diagramDescription.getDomainType()).orElse(""); //$NON-NLS-1$ + String domainType = Optional.ofNullable(diagramDescription.getDomainType()).orElse(""); isValid = entities.stream().anyMatch(entity -> this.describesEntity(domainType, entity)); if (!isValid && !domainType.isBlank()) { @@ -206,7 +206,7 @@ private boolean hasProperDomainType(DiagramElementDescription diagramElementDesc List entities = this.getDomainEntitiesFromResourceSet(resourceSet); List ePackages = this.getEPackagesFromRegistry(resourceSet.getPackageRegistry()); - String domainType = Optional.ofNullable(diagramElementDescription.getDomainType()).orElse(""); //$NON-NLS-1$ + String domainType = Optional.ofNullable(diagramElementDescription.getDomainType()).orElse(""); isValid = entities.stream().anyMatch(entity -> this.describesEntity(domainType, entity)); if (!isValid && !domainType.isBlank()) { @@ -244,7 +244,7 @@ private boolean hasProperDomainType(CreateInstance createInstance, DiagnosticCha List entities = this.getDomainEntitiesFromResourceSet(resourceSet); List ePackages = this.getEPackagesFromRegistry(resourceSet.getPackageRegistry()); - String domainType = Optional.ofNullable(createInstance.getTypeName()).orElse(""); //$NON-NLS-1$ + String domainType = Optional.ofNullable(createInstance.getTypeName()).orElse(""); isValid = entities.stream().anyMatch(entity -> this.describesEntity(domainType, entity)); if (!isValid && !domainType.isBlank()) { @@ -282,7 +282,7 @@ private boolean describesEntity(String domainType, Entity entity) { result = true; } else if (entity.eContainer() instanceof Domain) { String domainName = ((Domain) entity.eContainer()).getName(); - result = Objects.equals(domainType, domainName + "::" + entity.getName()); //$NON-NLS-1$ + result = Objects.equals(domainType, domainName + "::" + entity.getName()); } return result; } diff --git a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/DiagramOperationInterpreter.java b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/DiagramOperationInterpreter.java index 1835350439..4d3cf70d8b 100644 --- a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/DiagramOperationInterpreter.java +++ b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/DiagramOperationInterpreter.java @@ -60,7 +60,7 @@ public DiagramOperationInterpreter(AQLInterpreter interpreter, IObjectService ob public IStatus executeTool(Tool tool, VariableManager variableManager) { Optional optionalVariableManager = this.executeOperations(tool.getBody(), variableManager); if (optionalVariableManager.isEmpty()) { - return new Failure(String.format("Something went wrong while executing the tool '%s'", tool.getName())); //$NON-NLS-1$ + return new Failure(String.format("Something went wrong while executing the tool '%s'", tool.getName())); } return new Success(); } diff --git a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/ImageNodeStyleProvider.java b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/ImageNodeStyleProvider.java index 3128f83444..137bfcc43a 100644 --- a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/ImageNodeStyleProvider.java +++ b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/ImageNodeStyleProvider.java @@ -37,11 +37,11 @@ @Service public class ImageNodeStyleProvider implements INodeStyleProvider { - private static final String DEFAULT_COLOR = "black"; //$NON-NLS-1$ + private static final String DEFAULT_COLOR = "black"; - private static final String DEFAULT_BACKGROUND_COLOR = "white"; //$NON-NLS-1$ + private static final String DEFAULT_BACKGROUND_COLOR = "white"; - private static final String DEFAULT_BORDER_COLOR = "black"; //$NON-NLS-1$ + private static final String DEFAULT_BORDER_COLOR = "black"; private final List parametricSVGImageServices; @@ -83,14 +83,14 @@ public Optional createNodeStyle(NodeStyleDescription nodeStyle, Opti .borderSize(nodeStyle.getBorderSize()) .borderRadius(nodeStyle.getBorderRadius()) .borderStyle(LineStyle.valueOf(nodeStyle.getBorderLineStyle().getLiteral())) - .svgURL("/api/parametricsvgs/" + ((ImageNodeStyleDescription) nodeStyle).getShape()) //$NON-NLS-1$ + .svgURL("/api/parametricsvgs/" + ((ImageNodeStyleDescription) nodeStyle).getShape()) .build()); // @formatter:on } else if (nodeType.equals(Optional.of(NodeType.NODE_IMAGE))) { // @formatter:off iNodeStyle = Optional.of(ImageNodeStyle.newImageNodeStyle() .scalingFactor(1) - .imageURL("/custom/" + ((ImageNodeStyleDescription) nodeStyle).getShape()) //$NON-NLS-1$ + .imageURL("/custom/" + ((ImageNodeStyleDescription) nodeStyle).getShape()) .borderColor(Optional.ofNullable(nodeStyle.getBorderColor()).orElse(DEFAULT_COLOR)) .borderSize(nodeStyle.getBorderSize()) .borderStyle(LineStyle.valueOf(nodeStyle.getBorderLineStyle().getLiteral())) diff --git a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/NodeStylePropertiesConfigurer.java b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/NodeStylePropertiesConfigurer.java index c4059ab981..b89738a8e9 100644 --- a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/NodeStylePropertiesConfigurer.java +++ b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/NodeStylePropertiesConfigurer.java @@ -69,9 +69,9 @@ @Component public class NodeStylePropertiesConfigurer implements IPropertiesDescriptionRegistryConfigurer { - private static final String EMPTY = ""; //$NON-NLS-1$ + private static final String EMPTY = ""; - private static final String UNNAMED = ""; //$NON-NLS-1$ + private static final String UNNAMED = ""; private final Function> semanticElementsProvider = variableManager -> variableManager.get(VariableManager.SELF, Object.class).stream().collect(Collectors.toList()); @@ -99,7 +99,7 @@ public void addPropertiesDescriptions(IPropertiesDescriptionRegistry registry) { } private FormDescription getImageNodeStyleProperties() { - String formDescriptionId = UUID.nameUUIDFromBytes("nodestyle".getBytes()).toString(); //$NON-NLS-1$ + String formDescriptionId = UUID.nameUUIDFromBytes("nodestyle".getBytes()).toString(); List controls = new ArrayList<>(); controls.add(this.createShapeSelectionField(ViewPackage.Literals.IMAGE_NODE_STYLE_DESCRIPTION__SHAPE)); @@ -117,7 +117,7 @@ private FormDescription getImageNodeStyleProperties() { .isPresent(); return FormDescription.newFormDescription(formDescriptionId) - .label("Image Node Style") //$NON-NLS-1$ + .label("Image Node Style") .labelProvider(variableManager -> variableManager.get(VariableManager.SELF, ImageNodeStyleDescription.class).map(ImageNodeStyleDescription::getShape).orElse(UNNAMED)) .canCreatePredicate(variableManager -> true) .idProvider(new GetOrCreateRandomIdProvider()) @@ -129,7 +129,7 @@ private FormDescription getImageNodeStyleProperties() { } private FormDescription getIconLabelNodeStyleProperties() { - String formDescriptionId = UUID.nameUUIDFromBytes("iconlabelnodestyle".getBytes()).toString(); //$NON-NLS-1$ + String formDescriptionId = UUID.nameUUIDFromBytes("iconlabelnodestyle".getBytes()).toString(); // @formatter:off List controls = this.getGeneralControlDescription(); @@ -144,7 +144,7 @@ private FormDescription getIconLabelNodeStyleProperties() { .isPresent(); return FormDescription.newFormDescription(formDescriptionId) - .label("IconLabel Node Style") //$NON-NLS-1$ + .label("IconLabel Node Style") .labelProvider(variableManager -> variableManager.get(VariableManager.SELF, NodeStyleDescription.class).map(NodeStyleDescription::getColor).orElse(UNNAMED)) .canCreatePredicate(variableManager -> true) .idProvider(new GetOrCreateRandomIdProvider()) @@ -156,11 +156,11 @@ private FormDescription getIconLabelNodeStyleProperties() { } private FormDescription getRectangularNodeStyleProperties() { - String formDescriptionId = UUID.nameUUIDFromBytes("rectangularnodestyle".getBytes()).toString(); //$NON-NLS-1$ + String formDescriptionId = UUID.nameUUIDFromBytes("rectangularnodestyle".getBytes()).toString(); // @formatter:off List controls = new ArrayList<>(); - controls.add(this.createCheckbox("nodestyle.isWithHeader", "With Header", //$NON-NLS-1$ //$NON-NLS-2$ + controls.add(this.createCheckbox("nodestyle.isWithHeader", "With Header", style -> ((RectangularNodeStyleDescription) style).isWithHeader(), (style, newWithHeaderValue) -> ((RectangularNodeStyleDescription) style).setWithHeader(newWithHeaderValue), ViewPackage.Literals.RECTANGULAR_NODE_STYLE_DESCRIPTION__WITH_HEADER)); @@ -176,7 +176,7 @@ private FormDescription getRectangularNodeStyleProperties() { .isPresent(); return FormDescription.newFormDescription(formDescriptionId) - .label("Rectangular Node Style") //$NON-NLS-1$ + .label("Rectangular Node Style") .labelProvider(variableManager -> variableManager.get(VariableManager.SELF, NodeStyleDescription.class).map(NodeStyleDescription::getColor).orElse(UNNAMED)) .canCreatePredicate(variableManager -> true) .idProvider(new GetOrCreateRandomIdProvider()) @@ -190,27 +190,27 @@ private FormDescription getRectangularNodeStyleProperties() { private List getGeneralControlDescription() { // @formatter:off List controls = List.of( - this.createExpressionField("nodestyle.sizeExpression", "Size Expression", //$NON-NLS-1$ //$NON-NLS-2$ + this.createExpressionField("nodestyle.sizeExpression", "Size Expression", style -> ((NodeStyleDescription) style).getSizeComputationExpression(), (style, newSizeExpression) -> ((NodeStyleDescription) style).setSizeComputationExpression(newSizeExpression), ViewPackage.Literals.NODE_STYLE_DESCRIPTION__SIZE_COMPUTATION_EXPRESSION), - this.createCheckbox("nodestyle.showIcon", "Show Icon", //$NON-NLS-1$ //$NON-NLS-2$ + this.createCheckbox("nodestyle.showIcon", "Show Icon", style -> ((NodeStyleDescription) style).isShowIcon(), (style, newValue) -> ((NodeStyleDescription) style).setShowIcon(newValue), ViewPackage.Literals.NODE_STYLE_DESCRIPTION__SHOW_ICON), - this.createTextField("nodestyle.labelColor", "Label Color", //$NON-NLS-1$ //$NON-NLS-2$ + this.createTextField("nodestyle.labelColor", "Label Color", style -> ((NodeStyleDescription) style).getLabelColor(), (style, newLabelColor) -> ((NodeStyleDescription) style).setLabelColor(newLabelColor), ViewPackage.Literals.NODE_STYLE_DESCRIPTION__LABEL_COLOR), - this.createTextField("nodestyle.color", "Color", //$NON-NLS-1$ //$NON-NLS-2$ + this.createTextField("nodestyle.color", "Color", style -> ((NodeStyleDescription) style).getColor(), (style, newColor) -> ((NodeStyleDescription) style).setColor(newColor), ViewPackage.Literals.STYLE__COLOR), - this.createTextField("nodestyle.borderColor", "Border Color", //$NON-NLS-1$ //$NON-NLS-2$ + this.createTextField("nodestyle.borderColor", "Border Color", style -> ((NodeStyleDescription) style).getBorderColor(), (style, newColor) -> ((NodeStyleDescription) style).setBorderColor(newColor), ViewPackage.Literals.BORDER_STYLE__BORDER_COLOR), - this.createTextField("nodestyle.borderRadius", "Border Radius", //$NON-NLS-1$ //$NON-NLS-2$ + this.createTextField("nodestyle.borderRadius", "Border Radius", style -> String.valueOf(((NodeStyleDescription) style).getBorderRadius()), (style, newBorderRadius) -> { try { @@ -220,7 +220,7 @@ private List getGeneralControlDescription() { } }, ViewPackage.Literals.BORDER_STYLE__BORDER_RADIUS), - this.createTextField("nodestyle.borderSize", "Border Size", //$NON-NLS-1$ //$NON-NLS-2$ + this.createTextField("nodestyle.borderSize", "Border Size", style -> String.valueOf(((NodeStyleDescription) style).getBorderSize()), (style, newBorderSize) -> { try { @@ -230,8 +230,8 @@ private List getGeneralControlDescription() { } }, ViewPackage.Literals.BORDER_STYLE__BORDER_SIZE), - this.createBorderLineStyleSelectionField("nodestyle.borderstyle", ViewPackage.Literals.BORDER_STYLE__BORDER_LINE_STYLE), //$NON-NLS-1$ - this.createTextField("nodestyle.fontSize", "Font Size", //$NON-NLS-1$ //$NON-NLS-2$ + this.createBorderLineStyleSelectionField("nodestyle.borderstyle", ViewPackage.Literals.BORDER_STYLE__BORDER_LINE_STYLE), + this.createTextField("nodestyle.fontSize", "Font Size", style -> String.valueOf(((LabelStyle) style).getFontSize()), (style, newColor) -> { try { @@ -241,19 +241,19 @@ private List getGeneralControlDescription() { } }, ViewPackage.Literals.LABEL_STYLE__FONT_SIZE), - this.createCheckbox("nodestyle.italic", "Italic", //$NON-NLS-1$ //$NON-NLS-2$ + this.createCheckbox("nodestyle.italic", "Italic", style -> ((LabelStyle) style).isItalic(), (style, newItalic) -> ((LabelStyle) style).setItalic(newItalic), ViewPackage.Literals.LABEL_STYLE__ITALIC), - this.createCheckbox("nodestyle.bold", "Bold", //$NON-NLS-1$ //$NON-NLS-2$ + this.createCheckbox("nodestyle.bold", "Bold", style -> ((LabelStyle) style).isBold(), (style, newBold) -> ((LabelStyle) style).setBold(newBold), ViewPackage.Literals.LABEL_STYLE__BOLD), - this.createCheckbox("nodestyle.underline", "Underline", //$NON-NLS-1$ //$NON-NLS-2$ + this.createCheckbox("nodestyle.underline", "Underline", style -> ((LabelStyle) style).isUnderline(), (style, newUnderline) -> ((LabelStyle) style).setUnderline(newUnderline), ViewPackage.Literals.LABEL_STYLE__UNDERLINE), - this.createCheckbox("nodestyle.strikeThrough", "Strike Through", //$NON-NLS-1$ //$NON-NLS-2$ + this.createCheckbox("nodestyle.strikeThrough", "Strike Through", style -> ((LabelStyle) style).isStrikeThrough(), (style, newStrikeThrough) -> ((LabelStyle) style).setStrikeThrough(newStrikeThrough), ViewPackage.Literals.LABEL_STYLE__STRIKE_THROUGH)); @@ -276,9 +276,9 @@ private Function getTargetObjectIdProvider() { private PageDescription createSimplePageDescription(GroupDescription groupDescription, Predicate canCreatePredicate) { // @formatter:off - return PageDescription.newPageDescription("page") //$NON-NLS-1$ - .idProvider(variableManager -> "page") //$NON-NLS-1$ - .labelProvider(variableManager -> "Properties") //$NON-NLS-1$ + return PageDescription.newPageDescription("page") + .idProvider(variableManager -> "page") + .labelProvider(variableManager -> "Properties") .semanticElementsProvider(this.semanticElementsProvider) .canCreatePredicate(canCreatePredicate) .groupDescriptions(List.of(groupDescription)) @@ -288,9 +288,9 @@ private PageDescription createSimplePageDescription(GroupDescription groupDescri private GroupDescription createSimpleGroupDescription(List controls) { // @formatter:off - return GroupDescription.newGroupDescription("group") //$NON-NLS-1$ - .idProvider(variableManager -> "group") //$NON-NLS-1$ - .labelProvider(variableManager -> "General") //$NON-NLS-1$ + return GroupDescription.newGroupDescription("group") + .idProvider(variableManager -> "group") + .labelProvider(variableManager -> "General") .semanticElementsProvider(this.semanticElementsProvider) .controlDescriptions(controls) .build(); @@ -305,7 +305,7 @@ private TextfieldDescription createTextField(String id, String title, Function id) - .labelProvider(variableManager -> "Border Line Style") //$NON-NLS-1$ + .labelProvider(variableManager -> "Border Line Style") .valueProvider(variableManager -> variableManager.get(VariableManager.SELF, BorderStyle.class).map(BorderStyle::getBorderLineStyle).map(LineStyle::toString).orElse(EMPTY)) .optionsProvider(variableManager -> LineStyle.VALUES.stream().collect(Collectors.toList())) .optionIdProvider(variableManager -> variableManager.get(SelectComponent.CANDIDATE_VARIABLE, LineStyle.class).map(LineStyle::getLiteral).orElse(EMPTY)) @@ -392,7 +392,7 @@ private SelectDescription createBorderLineStyleSelectionField(String id, Object } return new Success(); } - return new Failure(""); //$NON-NLS-1$ + return new Failure(""); }) .diagnosticsProvider(this.getDiagnosticsProvider(feature)) .kindProvider(this::kindProvider) @@ -403,16 +403,16 @@ private SelectDescription createBorderLineStyleSelectionField(String id, Object private SelectDescription createShapeSelectionField(Object feature) { // @formatter:off - return SelectDescription.newSelectDescription("nodestyle.shapeSelector") //$NON-NLS-1$ - .idProvider(variableManager -> "nodestyle.shapeSelector") //$NON-NLS-1$ - .labelProvider(variableManager -> "Shape") //$NON-NLS-1$ + return SelectDescription.newSelectDescription("nodestyle.shapeSelector") + .idProvider(variableManager -> "nodestyle.shapeSelector") + .labelProvider(variableManager -> "Shape") .valueProvider(variableManager -> variableManager.get(VariableManager.SELF, ImageNodeStyleDescription.class).map(ImageNodeStyleDescription::getShape).orElse(EMPTY)) .optionsProvider(variableManager -> { Optional optionalEditingContextId = variableManager.get(IEditingContext.EDITING_CONTEXT, IEditingContext.class).map(IEditingContext::getId); Stream parametricSVGs = this.parametricSVGImageRegistries.stream() .flatMap(service-> service.getImages().stream()) - .map(image -> new CustomImageMetadata(image.getId(), optionalEditingContextId, image.getLabel(), "image/svg+xml")); //$NON-NLS-1$ + .map(image -> new CustomImageMetadata(image.getId(), optionalEditingContextId, image.getLabel(), "image/svg+xml")); List customImages = optionalEditingContextId.map(this.customImageSearchService::getAvailableImages).orElse(List.of()); @@ -437,17 +437,17 @@ private SelectDescription createShapeSelectionField(Object feature) { private ImageDescription createShapePreviewField() { // @formatter:off - return ImageDescription.newImageDescription("nodestyle.shapePreview") //$NON-NLS-1$ - .idProvider(variableManager -> "nodestyle.shapePreview") //$NON-NLS-1$ - .labelProvider(variableManager -> "Shape Preview") //$NON-NLS-1$ + return ImageDescription.newImageDescription("nodestyle.shapePreview") + .idProvider(variableManager -> "nodestyle.shapePreview") + .labelProvider(variableManager -> "Shape Preview") .urlProvider(variableManager -> { var optionalShape = variableManager.get(VariableManager.SELF, ImageNodeStyleDescription.class).map(ImageNodeStyleDescription::getShape); if (optionalShape.isPresent()) { - return String.format("/custom/%s", optionalShape.get()); //$NON-NLS-1$ + return String.format("/custom/%s", optionalShape.get()); } - return ""; //$NON-NLS-1$ + return ""; }) - .maxWidthProvider(variableManager -> "300px") //$NON-NLS-1$ + .maxWidthProvider(variableManager -> "300px") .diagnosticsProvider(variableManager -> List.of()) .kindProvider(this::kindProvider) .messageProvider(this::messageProvider) @@ -466,7 +466,7 @@ private BiFunction getNewShapeValueHandler() { optionalNodeStyle.get().setShape(newShape); return new Success(); } - return new Failure(""); //$NON-NLS-1$ + return new Failure(""); }; } @@ -485,21 +485,21 @@ private Function> getDiagnosticsProvider(Object feature } private String kindProvider(Object object) { - String kind = "Unknown"; //$NON-NLS-1$ + String kind = "Unknown"; if (object instanceof Diagnostic) { Diagnostic diagnostic = (Diagnostic) object; switch (diagnostic.getSeverity()) { case org.eclipse.emf.common.util.Diagnostic.ERROR: - kind = "Error"; //$NON-NLS-1$ + kind = "Error"; break; case org.eclipse.emf.common.util.Diagnostic.WARNING: - kind = "Warning"; //$NON-NLS-1$ + kind = "Warning"; break; case org.eclipse.emf.common.util.Diagnostic.INFO: - kind = "Info"; //$NON-NLS-1$ + kind = "Info"; break; default: - kind = "Unknown"; //$NON-NLS-1$ + kind = "Unknown"; break; } } @@ -511,7 +511,7 @@ private String messageProvider(Object object) { Diagnostic diagnostic = (Diagnostic) object; return diagnostic.getMessage(); } - return ""; //$NON-NLS-1$ + return ""; } } diff --git a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/StylesFactory.java b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/StylesFactory.java index dd3e91285c..68881a18c9 100644 --- a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/StylesFactory.java +++ b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/StylesFactory.java @@ -40,7 +40,7 @@ */ public final class StylesFactory { - private static final String DEFAULT_COLOR = "black"; //$NON-NLS-1$ + private static final String DEFAULT_COLOR = "black"; private List iNodeStyleProviders = new ArrayList<>(); @@ -61,9 +61,9 @@ public LabelStyleDescription createLabelStyleDescription(NodeStyleDescription no .underlineProvider(variableManager -> nodeStyle.isUnderline()) .strikeThroughProvider(variableManager -> nodeStyle.isStrikeThrough()) .iconURLProvider(variableManager -> { - String iconURL = ""; //$NON-NLS-1$ + String iconURL = ""; if (nodeStyle.isShowIcon()) { - iconURL = variableManager.get(VariableManager.SELF, Object.class).map(this.objectService::getImagePath).orElse(""); //$NON-NLS-1$ + iconURL = variableManager.get(VariableManager.SELF, Object.class).map(this.objectService::getImagePath).orElse(""); } return iconURL; }) @@ -81,9 +81,9 @@ public LabelStyleDescription createEdgeLabelStyleDescription(org.eclipse.sirius. .underlineProvider(variableManager -> edgeStyle.isUnderline()) .strikeThroughProvider(variableManager -> edgeStyle.isStrikeThrough()) .iconURLProvider(variableManager -> { - String iconURL = ""; //$NON-NLS-1$ + String iconURL = ""; if (edgeStyle.isShowIcon()) { - iconURL = variableManager.get(VariableManager.SELF, Object.class).map(this.objectService::getImagePath).orElse(""); //$NON-NLS-1$ + iconURL = variableManager.get(VariableManager.SELF, Object.class).map(this.objectService::getImagePath).orElse(""); } return iconURL; }) @@ -125,7 +125,7 @@ public INodeStyle createNodeStyle(NodeStyleDescription nodeStyle, Optional createDiagramDropHandler(org.eclipse. return new DiagramOperationInterpreter(converterContext.getInterpreter(), this.objectService, this.editService, this.getDiagramContext(variableManager), capturedNodeDescriptions) .executeTool(viewDiagramDescription.getOnDrop(), augmentedVariableManager); } else { - return new Failure("No drop handler configured"); //$NON-NLS-1$ + return new Failure("No drop handler configured"); } }; } @@ -333,8 +333,8 @@ private List createToolSections(ViewDiagramDescriptionConverterCont // If there are no custom tools defined, add a canonical creation tool if (i == 0) { // @formatter:off - SingleClickOnDiagramElementTool tool = SingleClickOnDiagramElementTool.newSingleClickOnDiagramElementTool(this.idProvider.apply(nodeDescription) + "_creationTool") //$NON-NLS-1$ - .label("New " + this.getSimpleTypeName(nodeDescription.getDomainType())) //$NON-NLS-1$ + SingleClickOnDiagramElementTool tool = SingleClickOnDiagramElementTool.newSingleClickOnDiagramElementTool(this.idProvider.apply(nodeDescription) + "_creationTool") + .label("New " + this.getSimpleTypeName(nodeDescription.getDomainType())) .imageURL(NODE_CREATION_TOOL_ICON) .handler(variableManager -> { VariableManager child = variableManager.createChild(); @@ -374,8 +374,8 @@ private List createToolSections(ViewDiagramDescriptionConverterCont // If there are no custom tools defined, add a canonical creation tool if (i == 0) { // @formatter:off - SingleClickOnTwoDiagramElementsTool tool = SingleClickOnTwoDiagramElementsTool.newSingleClickOnTwoDiagramElementsTool(this.idProvider.apply(edgeDescription) + "_creationTool") //$NON-NLS-1$ - .label("New " + this.getSimpleTypeName(edgeDescription.getDomainType())) //$NON-NLS-1$ + SingleClickOnTwoDiagramElementsTool tool = SingleClickOnTwoDiagramElementsTool.newSingleClickOnTwoDiagramElementsTool(this.idProvider.apply(edgeDescription) + "_creationTool") + .label("New " + this.getSimpleTypeName(edgeDescription.getDomainType())) .imageURL(EDGE_CREATION_TOOL_ICON) .candidates(List.of(SingleClickOnTwoDiagramElementsCandidate.newSingleClickOnTwoDiagramElementsCandidate() .sources(edgeDescription.getSourceNodeDescriptions().stream().map(converterContext.getConvertedNodes()::get).collect(Collectors.toList())) @@ -396,12 +396,12 @@ private List createToolSections(ViewDiagramDescriptionConverterCont var nodeCreationToolSection = ToolSection.newToolSection(UUID.randomUUID().toString()) .label(NODE_CREATION_TOOL_SECTION) .tools(nodeCreationTools) - .imageURL("") //$NON-NLS-1$ + .imageURL("") .build(); var edgeCreationToolSection = ToolSection.newToolSection(UUID.randomUUID().toString()) .label(EDGE_CREATION_TOOL_SECTION) .tools(edgeTools) - .imageURL("") //$NON-NLS-1$ + .imageURL("") .build(); return List.of(nodeCreationToolSection, edgeCreationToolSection); // @formatter:on @@ -462,9 +462,9 @@ private List createTools(ViewDiagramDescriptionConverterContext converter } private String getSimpleTypeName(String domainType) { - String result = Optional.ofNullable(domainType).orElse(""); //$NON-NLS-1$ - if (result.contains("::")) { //$NON-NLS-1$ - result = domainType.substring(domainType.indexOf("::") + 2); //$NON-NLS-1$ + String result = Optional.ofNullable(domainType).orElse(""); + if (result.contains("::")) { + result = domainType.substring(domainType.indexOf("::") + 2); } return result; } @@ -536,7 +536,7 @@ private Function> getSemanticElementsProvider(org.eclip return candidates.stream() .filter(EObject.class::isInstance) .map(EObject.class::cast) - .filter(candidate -> new DomainClassPredicate(Optional.ofNullable(elementDescription.getDomainType()).orElse("")).test(candidate.eClass())) //$NON-NLS-1$ + .filter(candidate -> new DomainClassPredicate(Optional.ofNullable(elementDescription.getDomainType()).orElse("")).test(candidate.eClass())) .collect(Collectors.toList()); // @formatter:on }; @@ -625,9 +625,9 @@ private EdgeDescription convert(org.eclipse.sirius.components.view.EdgeDescripti .deleteHandler(this.createDeleteHandler(viewEdgeDescription, converterContext)) .labelEditHandler(this.createLabelEditHandler(viewEdgeDescription, converterContext)); - this.getSpecificEdgeLabelDescription(viewEdgeDescription, viewEdgeDescription.getBeginLabelExpression(), "_beginlabel", interpreter).ifPresent(builder::beginLabelDescription); //$NON-NLS-1$ - this.getSpecificEdgeLabelDescription(viewEdgeDescription, viewEdgeDescription.getLabelExpression(), "_centerlabel", interpreter).ifPresent(builder::centerLabelDescription); //$NON-NLS-1$ - this.getSpecificEdgeLabelDescription(viewEdgeDescription, viewEdgeDescription.getEndLabelExpression(), "_endlabel", interpreter).ifPresent(builder::endLabelDescription); //$NON-NLS-1$ + this.getSpecificEdgeLabelDescription(viewEdgeDescription, viewEdgeDescription.getBeginLabelExpression(), "_beginlabel", interpreter).ifPresent(builder::beginLabelDescription); + this.getSpecificEdgeLabelDescription(viewEdgeDescription, viewEdgeDescription.getLabelExpression(), "_centerlabel", interpreter).ifPresent(builder::centerLabelDescription); + this.getSpecificEdgeLabelDescription(viewEdgeDescription, viewEdgeDescription.getEndLabelExpression(), "_endlabel", interpreter).ifPresent(builder::endLabelDescription); EdgeDescription result = builder.build(); converterContext.getConvertedEdges().put(viewEdgeDescription, result); @@ -656,7 +656,7 @@ private BiFunction createLabelEditHandler(Diag if (tool != null) { return (variableManager, newLabel) -> { VariableManager childVariableManager = variableManager.createChild(); - childVariableManager.put("arg0", newLabel); //$NON-NLS-1$ + childVariableManager.put("arg0", newLabel); childVariableManager.put(CONVERTED_NODES_VARIABLE, capturedConvertedNodes); return new DiagramOperationInterpreter(converterContext.getInterpreter(), this.objectService, this.editService, this.getDiagramContext(variableManager), capturedConvertedNodes) .executeTool(tool, childVariableManager); @@ -683,7 +683,7 @@ private Optional self(VariableManager variableManager) { } private String evaluateString(AQLInterpreter interpreter, VariableManager variableManager, String expression) { - return interpreter.evaluateExpression(variableManager.getVariables(), expression).asString().orElse(""); //$NON-NLS-1$ + return interpreter.evaluateExpression(variableManager.getVariables(), expression).asString().orElse(""); } private IDiagramContext getDiagramContext(VariableManager variableManager) { @@ -691,7 +691,7 @@ private IDiagramContext getDiagramContext(VariableManager variableManager) { } private String getToolId(DiagramElementDescription diagramElementDescription, int count) { - return this.idProvider.apply(diagramElementDescription) + "_tool" + count; //$NON-NLS-1$ + return this.idProvider.apply(diagramElementDescription) + "_tool" + count; } } diff --git a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/ViewReconnectionToolsExecutor.java b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/ViewReconnectionToolsExecutor.java index d4dee1e64c..971687703d 100644 --- a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/ViewReconnectionToolsExecutor.java +++ b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/ViewReconnectionToolsExecutor.java @@ -89,7 +89,7 @@ public boolean canExecute(DiagramDescription diagramDescription) { @Override public IStatus execute(IEditingContext editingContext, ReconnectionToolInterpreterData toolInterpreterData, Edge edge, EdgeDescription edgeDescription, ReconnectEdgeKind reconnectEdgeKind, DiagramDescription diagramDescription) { - IStatus status = new Failure(""); //$NON-NLS-1$ + IStatus status = new Failure(""); // @formatter:off var optionalDiagramDescription = this.viewService.getRepresentationDescription(diagramDescription.getId()) @@ -129,15 +129,15 @@ public IStatus execute(IEditingContext editingContext, ReconnectionToolInterpret private VariableManager createVariableManager(ReconnectionToolInterpreterData toolInterpreterData, IEditingContext editingContext) { VariableManager variableManager = new VariableManager(); - variableManager.put("diagram", toolInterpreterData.getDiagramContext().getDiagram()); //$NON-NLS-1$ - variableManager.put("semanticReconnectionSource", toolInterpreterData.getSemanticReconnectionSource()); //$NON-NLS-1$ - variableManager.put("reconnectionSourceView", toolInterpreterData.getReconnectionSourceView()); //$NON-NLS-1$ - variableManager.put("semanticReconnectionTarget", toolInterpreterData.getSemanticReconnectionTarget()); //$NON-NLS-1$ - variableManager.put("reconnectionTargetView", toolInterpreterData.getReconnectionTargetView()); //$NON-NLS-1$ - variableManager.put("edgeSemanticElement", toolInterpreterData.getSemanticElement()); //$NON-NLS-1$ - variableManager.put("otherEnd", toolInterpreterData.getOtherEdgeEnd()); //$NON-NLS-1$ - variableManager.put("semanticOtherEnd", toolInterpreterData.getSemanticOtherEdgeEnd()); //$NON-NLS-1$ - variableManager.put("edgeView", toolInterpreterData.getEdgeView()); //$NON-NLS-1$ + variableManager.put("diagram", toolInterpreterData.getDiagramContext().getDiagram()); + variableManager.put("semanticReconnectionSource", toolInterpreterData.getSemanticReconnectionSource()); + variableManager.put("reconnectionSourceView", toolInterpreterData.getReconnectionSourceView()); + variableManager.put("semanticReconnectionTarget", toolInterpreterData.getSemanticReconnectionTarget()); + variableManager.put("reconnectionTargetView", toolInterpreterData.getReconnectionTargetView()); + variableManager.put("edgeSemanticElement", toolInterpreterData.getSemanticElement()); + variableManager.put("otherEnd", toolInterpreterData.getOtherEdgeEnd()); + variableManager.put("semanticOtherEnd", toolInterpreterData.getSemanticOtherEdgeEnd()); + variableManager.put("edgeView", toolInterpreterData.getEdgeView()); variableManager.put(IEditingContext.EDITING_CONTEXT, editingContext); return variableManager; } @@ -165,7 +165,7 @@ private AQLInterpreter createInterpreter(View view, List visibleEPacka try { return beanFactory.createBean(serviceClass); } catch (BeansException beansException) { - this.logger.warn("Error while trying to instantiate Java service class " + serviceClass.getName(), beansException); //$NON-NLS-1$ + this.logger.warn("Error while trying to instantiate Java service class " + serviceClass.getName(), beansException); return null; } }) diff --git a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/ViewToolSectionsProvider.java b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/ViewToolSectionsProvider.java index b9cf6828ec..0459cc0d94 100644 --- a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/ViewToolSectionsProvider.java +++ b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/ViewToolSectionsProvider.java @@ -129,46 +129,46 @@ private List createExtraToolSections(Object diagramElementDescripti // Graphical Delete Tool for unsynchronized mapping only (the handler is never called) if (diagramElementDescription instanceof NodeDescription || diagramElementDescription instanceof EdgeDescription) { // Edit Tool (the handler is never called) - SingleClickOnDiagramElementTool editTool = SingleClickOnDiagramElementTool.newSingleClickOnDiagramElementTool("edit") //$NON-NLS-1$ - .label("Edit") //$NON-NLS-1$ + SingleClickOnDiagramElementTool editTool = SingleClickOnDiagramElementTool.newSingleClickOnDiagramElementTool("edit") + .label("Edit") .imageURL(DiagramImageConstants.EDIT_SVG) .targetDescriptions(targetDescriptions) .handler(fakeHandler) .appliesToDiagramRoot(false) .build(); - var editToolSection = ToolSection.newToolSection("edit-section") //$NON-NLS-1$ - .label("") //$NON-NLS-1$ - .imageURL("") //$NON-NLS-1$ + var editToolSection = ToolSection.newToolSection("edit-section") + .label("") + .imageURL("") .tools(List.of(editTool)) .build(); extraToolSections.add(editToolSection); if (unsynchronizedMapping) { - SingleClickOnDiagramElementTool graphicalDeleteTool = SingleClickOnDiagramElementTool.newSingleClickOnDiagramElementTool("graphical-delete") //$NON-NLS-1$ - .label("Delete from diagram") //$NON-NLS-1$ + SingleClickOnDiagramElementTool graphicalDeleteTool = SingleClickOnDiagramElementTool.newSingleClickOnDiagramElementTool("graphical-delete") + .label("Delete from diagram") .imageURL(DiagramImageConstants.GRAPHICAL_DELETE_SVG) .targetDescriptions(targetDescriptions) .handler(fakeHandler) .appliesToDiagramRoot(false) .build(); - var graphicalDeleteToolSection = ToolSection.newToolSection("graphical-delete-section") //$NON-NLS-1$ - .label("") //$NON-NLS-1$ - .imageURL("") //$NON-NLS-1$ + var graphicalDeleteToolSection = ToolSection.newToolSection("graphical-delete-section") + .label("") + .imageURL("") .tools(List.of(graphicalDeleteTool)) .build(); extraToolSections.add(graphicalDeleteToolSection); } // Semantic Delete Tool (the handler is never called) - SingleClickOnDiagramElementTool semanticDeleteTool = SingleClickOnDiagramElementTool.newSingleClickOnDiagramElementTool("semantic-delete") //$NON-NLS-1$ - .label("Delete from model") //$NON-NLS-1$ + SingleClickOnDiagramElementTool semanticDeleteTool = SingleClickOnDiagramElementTool.newSingleClickOnDiagramElementTool("semantic-delete") + .label("Delete from model") .imageURL(DiagramImageConstants.SEMANTIC_DELETE_SVG) .targetDescriptions(targetDescriptions) .handler(fakeHandler) .appliesToDiagramRoot(false) .build(); - var semanticDeleteToolSection = ToolSection.newToolSection("semantic-delete-section") //$NON-NLS-1$ - .label("") //$NON-NLS-1$ - .imageURL("") //$NON-NLS-1$ + var semanticDeleteToolSection = ToolSection.newToolSection("semantic-delete-section") + .label("") + .imageURL("") .tools(List.of(semanticDeleteTool)) .build(); extraToolSections.add(semanticDeleteToolSection); diff --git a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/providers/ViewInitialDirectEditElementLabelProvider.java b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/providers/ViewInitialDirectEditElementLabelProvider.java index 319a23d1e3..b466da89c5 100644 --- a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/providers/ViewInitialDirectEditElementLabelProvider.java +++ b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/providers/ViewInitialDirectEditElementLabelProvider.java @@ -92,7 +92,7 @@ public boolean canHandle(org.eclipse.sirius.components.diagrams.description.Diag @Override public String getInitialDirectEditElementLabel(Object graphicalElement, Diagram diagram, IEditingContext editingContext) { - String initialDirectEditElementLabel = ""; //$NON-NLS-1$ + String initialDirectEditElementLabel = ""; String diagramDescriptionId = diagram.getDescriptionId(); var optionalDiagramDescription = this.viewService.getRepresentationDescription(diagramDescriptionId).filter(DiagramDescription.class::isInstance).map(DiagramDescription.class::cast); @@ -121,8 +121,8 @@ public String getInitialDirectEditElementLabel(Object graphicalElement, Diagram AQLInterpreter interpreter = this.createInterpreter((View) diagramDescription.eContainer(), editingContext); VariableManager variableManager = new VariableManager(); variableManager.put(VariableManager.SELF, semanticElement.get()); - variableManager.put("view", graphicalElement); //$NON-NLS-1$ - variableManager.put("diagram", diagram); //$NON-NLS-1$ + variableManager.put("view", graphicalElement); + variableManager.put("diagram", diagram); Result result = interpreter.evaluateExpression(variableManager.getVariables(), labelEditTool.getInitialDirectEditLabelExpression()); if (result.getStatus().compareTo(Status.WARNING) <= 0 && result.asString().isPresent()) { initialDirectEditElementLabel = result.asString().get(); @@ -180,7 +180,7 @@ private AQLInterpreter createInterpreter(View view, IEditingContext editingConte try { return beanFactory.createBean(serviceClass); } catch (BeansException beansException) { - this.logger.warn("Error while trying to instantiate Java service class " + serviceClass.getName(), beansException); //$NON-NLS-1$ + this.logger.warn("Error while trying to instantiate Java service class " + serviceClass.getName(), beansException); return null; } }) diff --git a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/form/ViewFormDescriptionConverter.java b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/form/ViewFormDescriptionConverter.java index 4341f78ddb..dd0613c754 100644 --- a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/form/ViewFormDescriptionConverter.java +++ b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/form/ViewFormDescriptionConverter.java @@ -48,11 +48,11 @@ @Service public class ViewFormDescriptionConverter implements IRepresentationDescriptionConverter { - public static final String NEW_VALUE = "newValue"; //$NON-NLS-1$ + public static final String NEW_VALUE = "newValue"; - private static final String DEFAULT_FORM_LABEL = "Form"; //$NON-NLS-1$ + private static final String DEFAULT_FORM_LABEL = "Form"; - private static final String DEFAULT_GROUP_LABEL = ""; //$NON-NLS-1$ + private static final String DEFAULT_GROUP_LABEL = ""; private final IObjectService objectService; @@ -82,7 +82,7 @@ public IRepresentationDescription convert(RepresentationDescription representati .collect(Collectors.toList()); String descriptionId = this.getDescriptionId(viewFormDescription); - PageDescription pageDescription = PageDescription.newPageDescription(descriptionId + "_page") //$NON-NLS-1$ + PageDescription pageDescription = PageDescription.newPageDescription(descriptionId + "_page") .idProvider(new GetOrCreateRandomIdProvider()) .labelProvider(variableManager -> this.computeFormLabel(viewFormDescription, variableManager, interpreter)) .semanticElementsProvider(semanticElementsProvider) @@ -173,7 +173,7 @@ private Function> getSemanticElementsProvider(org.eclip } private String evaluateString(AQLInterpreter interpreter, VariableManager variableManager, String expression) { - return interpreter.evaluateExpression(variableManager.getVariables(), expression).asString().orElse(""); //$NON-NLS-1$ + return interpreter.evaluateExpression(variableManager.getVariables(), expression).asString().orElse(""); } private boolean canCreatForm(org.eclipse.sirius.components.view.FormDescription viewFormDescription, VariableManager variableManager, AQLInterpreter interpreter) { diff --git a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/form/ViewFormDescriptionConverterSwitch.java b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/form/ViewFormDescriptionConverterSwitch.java index 1912cbcbc4..84e58c3677 100644 --- a/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/form/ViewFormDescriptionConverterSwitch.java +++ b/packages/view/backend/sirius-components-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/form/ViewFormDescriptionConverterSwitch.java @@ -133,8 +133,8 @@ public AbstractWidgetDescription caseTextfieldDescription(org.eclipse.sirius.com .valueProvider(valueProvider) .newValueHandler(newValueHandler) .diagnosticsProvider(variableManager -> List.of()) - .kindProvider(diagnostic -> "") //$NON-NLS-1$ - .messageProvider(diagnostic -> "") //$NON-NLS-1$ + .kindProvider(diagnostic -> "") + .messageProvider(diagnostic -> "") .styleProvider(styleProvider) .build(); // @formatter:on @@ -145,7 +145,7 @@ public AbstractWidgetDescription caseCheckboxDescription(org.eclipse.sirius.comp String descriptionId = this.getDescriptionId(viewCheckboxDescription); WidgetIdProvider idProvider = new WidgetIdProvider(); StringValueProvider labelProvider = this.getStringValueProvider(viewCheckboxDescription.getLabelExpression()); - String valueExpression = Optional.ofNullable(viewCheckboxDescription.getValueExpression()).orElse(""); //$NON-NLS-1$ + String valueExpression = Optional.ofNullable(viewCheckboxDescription.getValueExpression()).orElse(""); BooleanValueProvider valueProvider = new BooleanValueProvider(this.interpreter, valueExpression); BiFunction newValueHandler = this.getNewValueHandler(viewCheckboxDescription.getBody()); Function styleProvider = variableManager -> { @@ -169,8 +169,8 @@ public AbstractWidgetDescription caseCheckboxDescription(org.eclipse.sirius.comp .valueProvider(valueProvider) .newValueHandler(newValueHandler) .diagnosticsProvider(variableManager -> List.of()) - .kindProvider(diagnostic -> "") //$NON-NLS-1$ - .messageProvider(diagnostic -> "") //$NON-NLS-1$ + .kindProvider(diagnostic -> "") + .messageProvider(diagnostic -> "") .styleProvider(styleProvider) .build(); // @formatter:on @@ -211,8 +211,8 @@ public AbstractWidgetDescription caseSelectDescription(org.eclipse.sirius.compon .optionsProvider(optionsProvider) .newValueHandler(selectNewValueHandler) .diagnosticsProvider(variableManager -> List.of()) - .kindProvider(diagnostic -> "") //$NON-NLS-1$ - .messageProvider(diagnostic -> "") //$NON-NLS-1$ + .kindProvider(diagnostic -> "") + .messageProvider(diagnostic -> "") .styleProvider(styleProvider) .build(); // @formatter:on @@ -246,8 +246,8 @@ public AbstractWidgetDescription caseTextAreaDescription(TextAreaDescription tex .valueProvider(valueProvider) .newValueHandler(newValueHandler) .diagnosticsProvider(variableManager -> List.of()) - .kindProvider(diagnostic -> "") //$NON-NLS-1$ - .messageProvider(diagnostic -> "") //$NON-NLS-1$ + .kindProvider(diagnostic -> "") + .messageProvider(diagnostic -> "") .styleProvider(styleProvider) .build(); // @formatter:on @@ -268,8 +268,8 @@ public AbstractWidgetDescription caseRichTextDescription(RichTextDescription ric .valueProvider(valueProvider) .newValueHandler(newValueHandler) .diagnosticsProvider(variableManager -> List.of()) - .kindProvider(diagnostic -> "") //$NON-NLS-1$ - .messageProvider(diagnostic -> "") //$NON-NLS-1$ + .kindProvider(diagnostic -> "") + .messageProvider(diagnostic -> "") .build(); // @formatter:on } @@ -309,8 +309,8 @@ public AbstractWidgetDescription caseMultiSelectDescription(org.eclipse.sirius.c .optionsProvider(optionsProvider) .newValuesHandler(multiSelectNewValueHandler) .diagnosticsProvider(variableManager -> List.of()) - .kindProvider(diagnostic -> "") //$NON-NLS-1$ - .messageProvider(diagnostic -> "") //$NON-NLS-1$ + .kindProvider(diagnostic -> "") + .messageProvider(diagnostic -> "") .styleProvider(styleProvider) .build(); // @formatter:on @@ -358,8 +358,8 @@ public AbstractWidgetDescription caseRadioDescription(org.eclipse.sirius.compone .optionsProvider(optionsProvider) .newValueHandler(newValueHandler) .diagnosticsProvider(variableManager -> List.of()) - .kindProvider(object -> "") //$NON-NLS-1$ - .messageProvider(object -> "") //$NON-NLS-1$ + .kindProvider(object -> "") + .messageProvider(object -> "") .styleProvider(styleProvider) .build(); // @formatter:on @@ -422,8 +422,8 @@ public AbstractWidgetDescription caseFlexboxContainerDescription(org.eclipse.sir .flexDirection(flexDirection) .children(children) .diagnosticsProvider(variableManager -> List.of()) - .kindProvider(object -> "") //$NON-NLS-1$ - .messageProvider(object -> "") //$NON-NLS-1$ + .kindProvider(object -> "") + .messageProvider(object -> "") .build(); // @formatter:on } @@ -458,8 +458,8 @@ public AbstractWidgetDescription caseButtonDescription(org.eclipse.sirius.compon .imageURLProvider(imageURLProvider) .pushButtonHandler(pushButtonHandler) .diagnosticsProvider(variableManager -> List.of()) - .kindProvider(diagnostic -> "") //$NON-NLS-1$ - .messageProvider(diagnostic -> "") //$NON-NLS-1$ + .kindProvider(diagnostic -> "") + .messageProvider(diagnostic -> "") .styleProvider(styleProvider) .build(); // @formatter:on @@ -491,8 +491,8 @@ public AbstractWidgetDescription caseLabelDescription(org.eclipse.sirius.compone .labelProvider(labelProvider) .valueProvider(valueProvider) .diagnosticsProvider(variableManager -> List.of()) - .kindProvider(diagnostic -> "") //$NON-NLS-1$ - .messageProvider(diagnostic -> "") //$NON-NLS-1$ + .kindProvider(diagnostic -> "") + .messageProvider(diagnostic -> "") .styleProvider(styleProvider) .build(); // @formatter:on @@ -525,8 +525,8 @@ public AbstractWidgetDescription caseLinkDescription(org.eclipse.sirius.componen .urlProvider(valueProvider) .styleProvider(styleProvider) .diagnosticsProvider(variableManager -> List.of()) - .kindProvider(diagnostic -> "") //$NON-NLS-1$ - .messageProvider(diagnostic -> "") //$NON-NLS-1$ + .kindProvider(diagnostic -> "") + .messageProvider(diagnostic -> "") .build(); // @formatter:on } @@ -573,8 +573,8 @@ public AbstractWidgetDescription caseListDescription(org.eclipse.sirius.componen .itemClickHandlerProvider(itemClickHandlerProvider) .styleProvider(styleProvider) .diagnosticsProvider(variableManager -> List.of()) - .kindProvider(object -> "") //$NON-NLS-1$ - .messageProvider(object -> ""); //$NON-NLS-1$ + .kindProvider(object -> "") + .messageProvider(object -> ""); // @formatter:on return builder.build(); @@ -594,8 +594,8 @@ public AbstractWidgetDescription caseImageDescription(org.eclipse.sirius.compone .urlProvider(urlProvider) .maxWidthProvider(maxWidthProvider) .diagnosticsProvider(variableManager -> List.of()) - .kindProvider(object -> "") //$NON-NLS-1$ - .messageProvider(object -> "") //$NON-NLS-1$ + .kindProvider(object -> "") + .messageProvider(object -> "") .build(); // @formatter:on } @@ -609,7 +609,7 @@ private IStatus getListItemClickHandler(VariableManager variableManager, List optionalVariableManager = operationInterpreter.executeOperations(operations, variableManager); if (optionalVariableManager.isEmpty()) { - return new Failure("Something went wrong while handling the item click."); //$NON-NLS-1$ + return new Failure("Something went wrong while handling the item click."); } else { return new Success(ChangeKind.SEMANTIC_CHANGE, Map.of()); } @@ -626,14 +626,14 @@ private String getItemId(VariableManager variableManager) { } private Function> getMultiValueProvider(String expression) { - String safeExpression = Optional.ofNullable(expression).orElse(""); //$NON-NLS-1$ + String safeExpression = Optional.ofNullable(expression).orElse(""); return variableManager -> { return this.interpreter.evaluateExpression(variableManager.getVariables(), safeExpression).asObjects().orElse(List.of()); }; } private Function> getMultiValueProvider(String expression, Class type) { - String safeExpression = Optional.ofNullable(expression).orElse(""); //$NON-NLS-1$ + String safeExpression = Optional.ofNullable(expression).orElse(""); return variableManager -> { return this.interpreter.evaluateExpression(variableManager.getVariables(), safeExpression).asObjects().orElse(List.of()).stream().map(type::cast).collect(Collectors.toList()); }; @@ -650,8 +650,8 @@ private AbstractWidgetDescription createChartWidgetDescription(org.eclipse.siriu .idProvider(idProvider) .chartDescription(chartDescription) .diagnosticsProvider(variableManager -> List.of()) - .kindProvider(object -> "") //$NON-NLS-1$ - .messageProvider(object -> "") //$NON-NLS-1$ + .kindProvider(object -> "") + .messageProvider(object -> "") .build(); // @formatter:on } @@ -665,7 +665,7 @@ private Function getOptionIdProvider() { private BiFunction, IStatus> getMultiSelectNewValuesHandler(List operations) { return (variableManager, newValue) -> { - IStatus status = new Failure("An error occured while handling the new selected values."); //$NON-NLS-1$ + IStatus status = new Failure("An error occured while handling the new selected values."); Optional optionalEditingDomain = variableManager.get(IEditingContext.EDITING_CONTEXT, IEditingContext.class); if (optionalEditingDomain.isPresent()) { IEditingContext editingContext = optionalEditingDomain.get(); @@ -680,7 +680,7 @@ private BiFunction, IStatus> getMultiSelectNewValu OperationInterpreter operationInterpreter = new OperationInterpreter(this.interpreter, this.editService); Optional optionalVariableManager = operationInterpreter.executeOperations(operations, childVariableManager); if (optionalVariableManager.isEmpty()) { - status = new Failure("Something went wrong while handling the MultiSelect widget new values."); //$NON-NLS-1$ + status = new Failure("Something went wrong while handling the MultiSelect widget new values."); } else { status = new Success(); } @@ -690,7 +690,7 @@ private BiFunction, IStatus> getMultiSelectNewValu } private Function> getMultiSelectValuesProvider(String valueExpression) { - String safeValueExpression = Optional.ofNullable(valueExpression).orElse(""); //$NON-NLS-1$ + String safeValueExpression = Optional.ofNullable(valueExpression).orElse(""); return variableManager -> { List values = new ArrayList<>(); if (!safeValueExpression.isBlank()) { @@ -704,24 +704,24 @@ private Function> getMultiSelectValuesProvider(Str } private StringValueProvider getStringValueProvider(String valueExpression) { - String safeValueExpression = Optional.ofNullable(valueExpression).orElse(""); //$NON-NLS-1$ + String safeValueExpression = Optional.ofNullable(valueExpression).orElse(""); return new StringValueProvider(this.interpreter, safeValueExpression); } private BooleanValueProvider getBooleanValueProvider(String valueExpression) { - String safeValueExpression = Optional.ofNullable(valueExpression).orElse(""); //$NON-NLS-1$ + String safeValueExpression = Optional.ofNullable(valueExpression).orElse(""); return new BooleanValueProvider(this.interpreter, safeValueExpression); } private Function getSelectValueProvider(String valueExpression) { - String safeValueExpression = Optional.ofNullable(valueExpression).orElse(""); //$NON-NLS-1$ + String safeValueExpression = Optional.ofNullable(valueExpression).orElse(""); return variableManager -> { if (!safeValueExpression.isBlank()) { Result result = this.interpreter.evaluateExpression(variableManager.getVariables(), safeValueExpression); - return result.asObject().map(this.objectService::getId).orElse(""); //$NON-NLS-1$ + return result.asObject().map(this.objectService::getId).orElse(""); } - return ""; //$NON-NLS-1$ + return ""; }; } @@ -730,7 +730,7 @@ private Function getOperationsHandler(List OperationInterpreter operationInterpreter = new OperationInterpreter(this.interpreter, this.editService); Optional optionalVariableManager = operationInterpreter.executeOperations(operations, variableManager); if (optionalVariableManager.isEmpty()) { - return new Failure("Something went wrong while handling the widget operations execution."); //$NON-NLS-1$ + return new Failure("Something went wrong while handling the widget operations execution."); } else { return new Success(); } @@ -744,7 +744,7 @@ private BiFunction getNewValueHandler(List optionalVariableManager = operationInterpreter.executeOperations(operations, childVariableManager); if (optionalVariableManager.isEmpty()) { - return new Failure("Something went wrong while handling the widget new value."); //$NON-NLS-1$ + return new Failure("Something went wrong while handling the widget new value."); } else { return new Success(); } @@ -753,7 +753,7 @@ private BiFunction getNewValueHandler(List getSelectNewValueHandler(List operations) { return (variableManager, newValue) -> { - IStatus status = new Failure("An error occured while handling the new selected value."); //$NON-NLS-1$ + IStatus status = new Failure("An error occured while handling the new selected value."); Object newValueObject = null; if (newValue != null && !newValue.isBlank()) { @@ -765,7 +765,7 @@ private BiFunction getSelectNewValueHandler(Li OperationInterpreter operationInterpreter = new OperationInterpreter(this.interpreter, this.editService); Optional optionalVariableManager = operationInterpreter.executeOperations(operations, childVariableManager); if (optionalVariableManager.isEmpty()) { - status = new Failure("Something went wrong while handling the Select widget new value."); //$NON-NLS-1$ + status = new Failure("Something went wrong while handling the Select widget new value."); } else { status = new Success(); } @@ -782,7 +782,7 @@ private String getListItemImageURL(VariableManager variablemanager) { // @formatter:off return variablemanager.get(ListComponent.CANDIDATE_VARIABLE, EObject.class) .map(candidate -> this.objectService.getImagePath(candidate)) - .orElse(""); //$NON-NLS-1$ + .orElse(""); // @formatter:on } diff --git a/packages/view/backend/sirius-components-view-emf/src/test/java/org/eclipse/sirius/components/view/emf/architecture/ArchitectureConstants.java b/packages/view/backend/sirius-components-view-emf/src/test/java/org/eclipse/sirius/components/view/emf/architecture/ArchitectureConstants.java index 54bcfa4612..e8d4f1369b 100644 --- a/packages/view/backend/sirius-components-view-emf/src/test/java/org/eclipse/sirius/components/view/emf/architecture/ArchitectureConstants.java +++ b/packages/view/backend/sirius-components-view-emf/src/test/java/org/eclipse/sirius/components/view/emf/architecture/ArchitectureConstants.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -22,7 +22,7 @@ * @author sbegaudeau */ public final class ArchitectureConstants { - public static final String SIRIUS_COMPONENTS_VIEW_EMF_ROOT_PACKAGE = "org.eclipse.sirius.components.view.emf.."; //$NON-NLS-1$ + public static final String SIRIUS_COMPONENTS_VIEW_EMF_ROOT_PACKAGE = "org.eclipse.sirius.components.view.emf.."; // @formatter:off public static final JavaClasses CLASSES = new ClassFileImporter() diff --git a/packages/view/backend/sirius-components-view-emf/src/test/java/org/eclipse/sirius/components/view/emf/validation/ViewValidatorTests.java b/packages/view/backend/sirius-components-view-emf/src/test/java/org/eclipse/sirius/components/view/emf/validation/ViewValidatorTests.java index 6551b2892e..3f1162c35e 100644 --- a/packages/view/backend/sirius-components-view-emf/src/test/java/org/eclipse/sirius/components/view/emf/validation/ViewValidatorTests.java +++ b/packages/view/backend/sirius-components-view-emf/src/test/java/org/eclipse/sirius/components/view/emf/validation/ViewValidatorTests.java @@ -46,11 +46,11 @@ */ public class ViewValidatorTests { - private static final String SAMPLE_DOMAIN_NAME = "sample"; //$NON-NLS-1$ + private static final String SAMPLE_DOMAIN_NAME = "sample"; - private static final String SAMPLE_ENTITY_NAME = "SampleEntity"; //$NON-NLS-1$ + private static final String SAMPLE_ENTITY_NAME = "SampleEntity"; - private static final String SIRIUS_COMPONENTS_EMF_PACKAGE = "org.eclipse.sirius.components.emf"; //$NON-NLS-1$ + private static final String SIRIUS_COMPONENTS_EMF_PACKAGE = "org.eclipse.sirius.components.emf"; @Test public void testNodeStyleDefaultValuesAreValid() { @@ -68,7 +68,7 @@ public void testNodeStyleDefaultValuesAreValid() { public void testConditionalConditionIsAbsent() { Map defaultContext = Diagnostician.INSTANCE.createDefaultContext(); ConditionalNodeStyle conditionalNodeStyle = ViewFactory.eINSTANCE.createConditionalNodeStyle(); - conditionalNodeStyle.setCondition(""); //$NON-NLS-1$ + conditionalNodeStyle.setCondition(""); conditionalNodeStyle.setStyle(ViewFactory.eINSTANCE.createRectangularNodeStyleDescription()); BasicDiagnostic expected = new BasicDiagnostic(Diagnostic.OK, null, 0, null, null); @@ -76,7 +76,7 @@ public void testConditionalConditionIsAbsent() { expected.add(new BasicDiagnostic(Diagnostic.ERROR, SIRIUS_COMPONENTS_EMF_PACKAGE, 0, - "The condition should not be empty", //$NON-NLS-1$ + "The condition should not be empty", new Object [] { conditionalNodeStyle, ViewPackage.Literals.CONDITIONAL__CONDITION, @@ -100,7 +100,7 @@ public void testConditionalStyleIsAbsent() { expected.add(new BasicDiagnostic(Diagnostic.ERROR, SIRIUS_COMPONENTS_EMF_PACKAGE, 0, - "The style should not be empty", //$NON-NLS-1$ + "The style should not be empty", new Object [] { conditionalNodeStyle, ViewPackage.Literals.CONDITIONAL_NODE_STYLE__STYLE, @@ -118,14 +118,14 @@ public void testConditionalStyleIsAbsent() { public void testNodeStyleColorIsAbsent() { Map defaultContext = Diagnostician.INSTANCE.createDefaultContext(); RectangularNodeStyleDescription conditionalNodeStyle = ViewFactory.eINSTANCE.createRectangularNodeStyleDescription(); - conditionalNodeStyle.setColor(""); //$NON-NLS-1$ + conditionalNodeStyle.setColor(""); BasicDiagnostic expected = new BasicDiagnostic(Diagnostic.ERROR, null, 0, null, null); // @formatter:off expected.add(new BasicDiagnostic(Diagnostic.ERROR, SIRIUS_COMPONENTS_EMF_PACKAGE, 0, - "The color should not be empty", //$NON-NLS-1$ + "The color should not be empty", new Object [] { conditionalNodeStyle, ViewPackage.Literals.STYLE__COLOR, @@ -154,7 +154,7 @@ public void testNodeDescriptionInvalidDomain() { expected.add(new BasicDiagnostic(Diagnostic.ERROR, SIRIUS_COMPONENTS_EMF_PACKAGE, 0, - String.format(DiagramDescriptionValidator.DIAGRAM_ELEMENT_DESCRIPTION_INVALID_DOMAIN_TYPE_ERROR_MESSAGE, Optional.ofNullable(nodeDescription.getDomainType()).orElse("")), //$NON-NLS-1$ + String.format(DiagramDescriptionValidator.DIAGRAM_ELEMENT_DESCRIPTION_INVALID_DOMAIN_TYPE_ERROR_MESSAGE, Optional.ofNullable(nodeDescription.getDomainType()).orElse("")), new Object [] { nodeDescription, ViewPackage.Literals.DIAGRAM_ELEMENT_DESCRIPTION__DOMAIN_TYPE, @@ -199,7 +199,7 @@ public void testNodeStyleDescriptionValidDomainInResourceSet() { public void testNodeStyleDescriptionValidQualifiedDomainInResourceSet() { Map defaultContext = Diagnostician.INSTANCE.createDefaultContext(); NodeDescription nodeDescription = ViewFactory.eINSTANCE.createNodeDescription(); - nodeDescription.setDomainType(SAMPLE_DOMAIN_NAME + "::" + SAMPLE_ENTITY_NAME); //$NON-NLS-1$ + nodeDescription.setDomainType(SAMPLE_DOMAIN_NAME + "::" + SAMPLE_ENTITY_NAME); ResourceSetImpl resourceSet = new ResourceSetImpl(); XMIResourceImpl viewResource = new XMIResourceImpl(); @@ -236,7 +236,7 @@ public void testNodeStyleDescriptionValidDomainInPackageRegistry() { EPackage ePackage = EcoreFactory.eINSTANCE.createEPackage(); ePackage.setName(SAMPLE_DOMAIN_NAME); ePackage.setNsPrefix(SAMPLE_DOMAIN_NAME); - ePackage.setNsURI("domain://sample"); //$NON-NLS-1$ + ePackage.setNsURI("domain://sample"); EClass sampleClass = EcoreFactory.eINSTANCE.createEClass(); sampleClass.setName(SAMPLE_ENTITY_NAME); @@ -255,7 +255,7 @@ public void testNodeStyleDescriptionValidDomainInPackageRegistry() { public void testNodeStyleDescriptionValidQualifiedDomainInPackageRegistry() { Map defaultContext = Diagnostician.INSTANCE.createDefaultContext(); NodeDescription nodeDescription = ViewFactory.eINSTANCE.createNodeDescription(); - nodeDescription.setDomainType(SAMPLE_DOMAIN_NAME + "::" + SAMPLE_ENTITY_NAME); //$NON-NLS-1$ + nodeDescription.setDomainType(SAMPLE_DOMAIN_NAME + "::" + SAMPLE_ENTITY_NAME); ResourceSetImpl resourceSet = new ResourceSetImpl(); XMIResourceImpl viewResource = new XMIResourceImpl(); @@ -266,7 +266,7 @@ public void testNodeStyleDescriptionValidQualifiedDomainInPackageRegistry() { EPackage ePackage = EcoreFactory.eINSTANCE.createEPackage(); ePackage.setName(SAMPLE_DOMAIN_NAME); ePackage.setNsPrefix(SAMPLE_DOMAIN_NAME); - ePackage.setNsURI("domain://sample"); //$NON-NLS-1$ + ePackage.setNsURI("domain://sample"); EClass sampleClass = EcoreFactory.eINSTANCE.createEClass(); sampleClass.setName(SAMPLE_ENTITY_NAME); diff --git a/packages/view/backend/sirius-components-view-emf/src/test/java/org/eclipse/sirius/components/view/emf/view/DynamicDiagramsTests.java b/packages/view/backend/sirius-components-view-emf/src/test/java/org/eclipse/sirius/components/view/emf/view/DynamicDiagramsTests.java index f70609a133..5e584a8f05 100644 --- a/packages/view/backend/sirius-components-view-emf/src/test/java/org/eclipse/sirius/components/view/emf/view/DynamicDiagramsTests.java +++ b/packages/view/backend/sirius-components-view-emf/src/test/java/org/eclipse/sirius/components/view/emf/view/DynamicDiagramsTests.java @@ -57,19 +57,19 @@ */ public class DynamicDiagramsTests { - private static final String NAME_EXPRESSION = "aql:self.name"; //$NON-NLS-1$ + private static final String NAME_EXPRESSION = "aql:self.name"; private EPackage fixture; @BeforeEach void buildFixture() { this.fixture = EcoreFactory.eINSTANCE.createEPackage(); - this.fixture.setName("fixture"); //$NON-NLS-1$ + this.fixture.setName("fixture"); EClass klass1 = EcoreFactory.eINSTANCE.createEClass(); - klass1.setName("Class1"); //$NON-NLS-1$ + klass1.setName("Class1"); this.fixture.getEClassifiers().add(klass1); EClass klass2 = EcoreFactory.eINSTANCE.createEClass(); - klass2.setName("Class2"); //$NON-NLS-1$ + klass2.setName("Class2"); this.fixture.getEClassifiers().add(klass2); } @@ -82,18 +82,18 @@ private void setBasicNodeStyle(NodeDescription nodeDescription, String color) { @Test void testRenderSynchronizedEcoreDiagram() throws Exception { DiagramDescription diagramDescription = ViewFactory.eINSTANCE.createDiagramDescription(); - diagramDescription.setName("Simple Ecore Diagram"); //$NON-NLS-1$ + diagramDescription.setName("Simple Ecore Diagram"); diagramDescription.setTitleExpression(NAME_EXPRESSION); diagramDescription.setAutoLayout(false); - diagramDescription.setDomainType("ecore::EPackage"); //$NON-NLS-1$ + diagramDescription.setDomainType("ecore::EPackage"); NodeDescription eClassNode = ViewFactory.eINSTANCE.createNodeDescription(); - eClassNode.setName("EClass Node"); //$NON-NLS-1$ - eClassNode.setDomainType("ecore::EClass"); //$NON-NLS-1$ + eClassNode.setName("EClass Node"); + eClassNode.setDomainType("ecore::EClass"); eClassNode.setLabelExpression(NAME_EXPRESSION); - eClassNode.setSemanticCandidatesExpression("aql:self.eClassifiers"); //$NON-NLS-1$ + eClassNode.setSemanticCandidatesExpression("aql:self.eClassifiers"); eClassNode.setSynchronizationPolicy(SynchronizationPolicy.SYNCHRONIZED); - this.setBasicNodeStyle(eClassNode, "red"); //$NON-NLS-1$ + this.setBasicNodeStyle(eClassNode, "red"); diagramDescription.getNodeDescriptions().add(eClassNode); @@ -102,24 +102,24 @@ void testRenderSynchronizedEcoreDiagram() throws Exception { assertThat(result).isNotNull(); assertThat(result.getEdges()).isEmpty(); assertThat(result.getNodes()).hasSize(2); - assertThat(result.getNodes()).extracting(node -> node.getLabel().getText()).containsExactlyInAnyOrder("Class1", "Class2"); //$NON-NLS-1$ //$NON-NLS-2$ + assertThat(result.getNodes()).extracting(node -> node.getLabel().getText()).containsExactlyInAnyOrder("Class1", "Class2"); } @Test void testRenderUnsynchronizedEcoreDiagram() throws Exception { DiagramDescription diagramDescription = ViewFactory.eINSTANCE.createDiagramDescription(); - diagramDescription.setName("Simple Ecore Diagram"); //$NON-NLS-1$ + diagramDescription.setName("Simple Ecore Diagram"); diagramDescription.setTitleExpression(NAME_EXPRESSION); diagramDescription.setAutoLayout(false); - diagramDescription.setDomainType("ecore::EPackage"); //$NON-NLS-1$ + diagramDescription.setDomainType("ecore::EPackage"); NodeDescription eClassNode = ViewFactory.eINSTANCE.createNodeDescription(); - eClassNode.setName("EClass Node"); //$NON-NLS-1$ - eClassNode.setDomainType("ecore::EClass"); //$NON-NLS-1$ + eClassNode.setName("EClass Node"); + eClassNode.setDomainType("ecore::EClass"); eClassNode.setLabelExpression(NAME_EXPRESSION); - eClassNode.setSemanticCandidatesExpression("aql:self.eClassifiers"); //$NON-NLS-1$ + eClassNode.setSemanticCandidatesExpression("aql:self.eClassifiers"); eClassNode.setSynchronizationPolicy(SynchronizationPolicy.UNSYNCHRONIZED); - this.setBasicNodeStyle(eClassNode, "red"); //$NON-NLS-1$ + this.setBasicNodeStyle(eClassNode, "red"); diagramDescription.getNodeDescriptions().add(eClassNode); @@ -134,7 +134,7 @@ private Diagram render(DiagramDescription diagramDescription, Object target) { // Wrap into a View and put it inside a proper Resource(Set), as expected by ViewConverter View view = ViewFactory.eINSTANCE.createView(); view.getDescriptions().add(diagramDescription); - Resource res = new JSONResourceFactory().createResource(URI.createURI(EditingContext.RESOURCE_SCHEME + ":///fixture")); //$NON-NLS-1$ + Resource res = new JSONResourceFactory().createResource(URI.createURI(EditingContext.RESOURCE_SCHEME + ":///fixture")); res.getContents().add(view); new ResourceSetImpl().getResources().add(res); @@ -159,6 +159,6 @@ public Optional findById(IEditingContext editingCont IEditingContext editinContext = new IEditingContext.NoOp(); - return diagramCreationService.create("Test Diagram", target, convertedDiagramDescription, editinContext); //$NON-NLS-1$ + return diagramCreationService.create("Test Diagram", target, convertedDiagramDescription, editinContext); } } diff --git a/packages/view/backend/sirius-components-view-emf/src/test/java/org/eclipse/sirius/components/view/emf/view/DynamicFormsTests.java b/packages/view/backend/sirius-components-view-emf/src/test/java/org/eclipse/sirius/components/view/emf/view/DynamicFormsTests.java index de4bd2c77c..f954aed884 100644 --- a/packages/view/backend/sirius-components-view-emf/src/test/java/org/eclipse/sirius/components/view/emf/view/DynamicFormsTests.java +++ b/packages/view/backend/sirius-components-view-emf/src/test/java/org/eclipse/sirius/components/view/emf/view/DynamicFormsTests.java @@ -272,15 +272,15 @@ void testSetNullOnSelectEcoreForm() { Form form = this.render(eClassFormDescription, this.eClasses[0]); Group group = form.getPages().get(0).getGroups().get(0); Select select = (Select) group.getWidgets().get(4); - assertThat(select.getValue()).isEqualTo("Class2"); //$NON-NLS-1$ + assertThat(select.getValue()).isEqualTo("Class2"); assertThat(this.eClasses[0].getESuperTypes().isEmpty()).isFalse(); select.getNewValueHandler().apply(null); assertThat(this.eClasses[0].getESuperTypes().isEmpty()).isTrue(); } private void checkTextfield(Textfield textfield, boolean checkStyle, boolean checkConditionalStyle) { - assertThat(textfield.getValue()).isEqualTo("Class1"); //$NON-NLS-1$ - assertThat(textfield.getLabel()).isEqualTo("EClass name"); //$NON-NLS-1$ + assertThat(textfield.getValue()).isEqualTo("Class1"); + assertThat(textfield.getLabel()).isEqualTo("EClass name"); if (!(checkStyle || checkConditionalStyle)) { this.testNoStyle(textfield); } else if (checkStyle) { @@ -291,8 +291,8 @@ private void checkTextfield(Textfield textfield, boolean checkStyle, boolean che } private void checkTextarea(Textarea textarea, boolean checkStyle, boolean checkConditionalStyle) { - assertThat(textarea.getValue()).isEqualTo("Class1Instance"); //$NON-NLS-1$ - assertThat(textarea.getLabel()).isEqualTo("Instance Class Name"); //$NON-NLS-1$ + assertThat(textarea.getValue()).isEqualTo("Class1Instance"); + assertThat(textarea.getLabel()).isEqualTo("Instance Class Name"); if (!(checkStyle || checkConditionalStyle)) { this.testNoStyle(textarea); } else if (checkStyle) { @@ -305,8 +305,8 @@ private void checkTextarea(Textarea textarea, boolean checkStyle, boolean checkC private void checkMultiSelect(MultiSelect multiSelect, boolean checkStyle, boolean checkConditionalStyle) { assertThat(multiSelect.getOptions()).hasSize(3); assertThat(multiSelect.getValues()).hasSize(2); - assertThat(multiSelect.getValues()).containsExactlyInAnyOrder("Class2", "Class3"); //$NON-NLS-1$ //$NON-NLS-2$ - assertThat(multiSelect.getLabel()).isEqualTo("ESuperTypes"); //$NON-NLS-1$ + assertThat(multiSelect.getValues()).containsExactlyInAnyOrder("Class2", "Class3"); + assertThat(multiSelect.getLabel()).isEqualTo("ESuperTypes"); if (!(checkStyle || checkConditionalStyle)) { this.testNoStyle(multiSelect); } else if (checkStyle) { @@ -318,7 +318,7 @@ private void checkMultiSelect(MultiSelect multiSelect, boolean checkStyle, boole private void checkCheckbox(Checkbox checkBox, boolean checkStyle, boolean checkConditionalStyle) { assertThat(checkBox.isValue()).isTrue(); - assertThat(checkBox.getLabel()).isEqualTo("is Abstract"); //$NON-NLS-1$ + assertThat(checkBox.getLabel()).isEqualTo("is Abstract"); if (!(checkStyle || checkConditionalStyle)) { this.testNoStyle(checkBox); } else if (checkStyle) { @@ -330,8 +330,8 @@ private void checkCheckbox(Checkbox checkBox, boolean checkStyle, boolean checkC private void checkSelect(Select select, boolean checkStyle, boolean checkConditionalStyle) { assertThat(select.getOptions()).hasSize(3); - assertThat(select.getValue()).isEqualTo("Class2"); //$NON-NLS-1$ - assertThat(select.getLabel()).isEqualTo("eSuper Types"); //$NON-NLS-1$ + assertThat(select.getValue()).isEqualTo("Class2"); + assertThat(select.getLabel()).isEqualTo("eSuper Types"); if (!(checkStyle || checkConditionalStyle)) { this.testNoStyle(select); } else if (checkStyle) { @@ -344,13 +344,13 @@ private void checkSelect(Select select, boolean checkStyle, boolean checkConditi private void checkRadio(Radio radio, boolean checkStyle, boolean checkConditionalStyle) { assertThat(radio.getOptions()).hasSize(3); assertThat(radio.getOptions()).allSatisfy(option -> { - if (option.getLabel().equals("Class2")) { //$NON-NLS-1$ + if (option.getLabel().equals("Class2")) { assertThat(option.isSelected()).isTrue(); } else { assertThat(option.isSelected()).isFalse(); } }); - assertThat(radio.getLabel()).isEqualTo("ESuperTypes"); //$NON-NLS-1$ + assertThat(radio.getLabel()).isEqualTo("ESuperTypes"); if (!(checkStyle || checkConditionalStyle)) { this.testNoStyle(radio); } else if (checkStyle) { @@ -361,8 +361,8 @@ private void checkRadio(Radio radio, boolean checkStyle, boolean checkConditiona } private void checkButton(Button button, boolean checkStyle, boolean checkConditionalStyle) { - assertThat(button.getButtonLabel()).isEqualTo("Class1"); //$NON-NLS-1$ - assertThat(button.getLabel()).isEqualTo("EClass name"); //$NON-NLS-1$ + assertThat(button.getButtonLabel()).isEqualTo("Class1"); + assertThat(button.getLabel()).isEqualTo("EClass name"); if (!(checkStyle || checkConditionalStyle)) { this.testNoStyle(button); } else if (checkStyle) { @@ -373,8 +373,8 @@ private void checkButton(Button button, boolean checkStyle, boolean checkConditi } private void checkLabel(LabelWidget labelWidget, boolean checkStyle, boolean checkConditionalStyle) { - assertThat(labelWidget.getValue()).isEqualTo("Class1"); //$NON-NLS-1$ - assertThat(labelWidget.getLabel()).isEqualTo("Label EClass name"); //$NON-NLS-1$ + assertThat(labelWidget.getValue()).isEqualTo("Class1"); + assertThat(labelWidget.getLabel()).isEqualTo("Label EClass name"); if (!(checkStyle || checkConditionalStyle)) { this.testNoStyle(labelWidget); } else if (checkStyle) { @@ -385,8 +385,8 @@ private void checkLabel(LabelWidget labelWidget, boolean checkStyle, boolean che } private void checkLink(Link link, boolean checkStyle, boolean checkConditionalStyle) { - assertThat(link.getLabel()).isEqualTo("Label EClass link"); //$NON-NLS-1$ - assertThat(link.getUrl()).isEqualTo("myHyperLink"); //$NON-NLS-1$ + assertThat(link.getLabel()).isEqualTo("Label EClass link"); + assertThat(link.getUrl()).isEqualTo("myHyperLink"); if (!(checkStyle || checkConditionalStyle)) { this.testNoStyle(link); } else if (checkStyle) { @@ -397,17 +397,17 @@ private void checkLink(Link link, boolean checkStyle, boolean checkConditionalSt } private void checkList(org.eclipse.sirius.components.forms.List list, boolean checkStyle, boolean checkConditionalStyle) { - assertThat(list.getLabel()).isEqualTo("Label EClass List"); //$NON-NLS-1$ + assertThat(list.getLabel()).isEqualTo("Label EClass List"); List items = list.getItems(); assertThat(items).hasSize(3); for (int i = 0; i < 3; i++) { - assertThat(items.get(i).getLabel()).isEqualTo("Class" + (i + 1)); //$NON-NLS-1$ ; + assertThat(items.get(i).getLabel()).isEqualTo("Class" + (i + 1)); assertThat(items.get(i).isDeletable()).isTrue(); items.get(i).getClickHandler().apply(ClickEventKind.DOUBLE_CLICK); - assertThat(this.eClasses[i].getName()).isEqualTo("Class" + (i + 1) + " click event kind: DOUBLE_CLICK"); //$NON-NLS-1$ //$NON-NLS-2$ + assertThat(this.eClasses[i].getName()).isEqualTo("Class" + (i + 1) + " click event kind: DOUBLE_CLICK"); items.get(i).getClickHandler().apply(ClickEventKind.SINGLE_CLICK); - assertThat(this.eClasses[i].getName()).isEqualTo("Class" + (i + 1) + " click event kind: DOUBLE_CLICK click event kind: SINGLE_CLICK"); //$NON-NLS-1$ //$NON-NLS-2$ - this.eClasses[i].setName("Class" + (i + 1)); //$NON-NLS-1$ + assertThat(this.eClasses[i].getName()).isEqualTo("Class" + (i + 1) + " click event kind: DOUBLE_CLICK click event kind: SINGLE_CLICK"); + this.eClasses[i].setName("Class" + (i + 1)); } if (!(checkStyle || checkConditionalStyle)) { this.testNoStyle(list); @@ -419,20 +419,20 @@ private void checkList(org.eclipse.sirius.components.forms.List list, boolean ch } private void checkPieChart(ChartWidget chartWidgetWithPieChart, boolean checkStyle, boolean checkConditionalStyle) { - assertThat(chartWidgetWithPieChart.getLabel()).isEqualTo("The Chart Widget label"); //$NON-NLS-1$ + assertThat(chartWidgetWithPieChart.getLabel()).isEqualTo("The Chart Widget label"); IChart chart = chartWidgetWithPieChart.getChart(); assertThat(chart).isInstanceOf(PieChart.class); PieChart pieChart = (PieChart) chart; List pieChartEntries = pieChart.getEntries(); - this.checkPieChartEntry(pieChartEntries, 0, "a", 1); //$NON-NLS-1$ - this.checkPieChartEntry(pieChartEntries, 1, "b", 3); //$NON-NLS-1$ - this.checkPieChartEntry(pieChartEntries, 2, "c", 5); //$NON-NLS-1$ - this.checkPieChartEntry(pieChartEntries, 3, "d", 7); //$NON-NLS-1$ + this.checkPieChartEntry(pieChartEntries, 0, "a", 1); + this.checkPieChartEntry(pieChartEntries, 1, "b", 3); + this.checkPieChartEntry(pieChartEntries, 2, "c", 5); + this.checkPieChartEntry(pieChartEntries, 3, "d", 7); PieChartStyle style = pieChart.getStyle(); if (checkStyle) { assertThat(style).isNotNull(); - assertThat(style.getColors()).isEqualTo(List.of("AliceBlue", "AntiqueWhite", "DarkMagenta", "DarkGreen")); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$ - assertThat(style.getStrokeColor()).isEqualTo("Orchid"); //$NON-NLS-1$ + assertThat(style.getColors()).isEqualTo(List.of("AliceBlue", "AntiqueWhite", "DarkMagenta", "DarkGreen")); + assertThat(style.getStrokeColor()).isEqualTo("Orchid"); assertThat(style.getStrokeWidth()).isEqualTo(3); assertThat(style.getFontSize()).isEqualTo(20); assertThat(style.isItalic()).isTrue(); @@ -441,8 +441,8 @@ private void checkPieChart(ChartWidget chartWidgetWithPieChart, boolean checkSty assertThat(style.isStrikeThrough()).isTrue(); } else if (checkConditionalStyle) { assertThat(style).isNotNull(); - assertThat(style.getColors()).isEqualTo(List.of("CadetBlue", "AntiqueWhite", "DarkMagenta", "Coral")); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$ - assertThat(style.getStrokeColor()).isEqualTo("PaleGoldenRod"); //$NON-NLS-1$ + assertThat(style.getColors()).isEqualTo(List.of("CadetBlue", "AntiqueWhite", "DarkMagenta", "Coral")); + assertThat(style.getStrokeColor()).isEqualTo("PaleGoldenRod"); assertThat(style.getStrokeWidth()).isEqualTo(2); assertThat(style.getFontSize()).isEqualTo(30); assertThat(style.isItalic()).isTrue(); @@ -453,20 +453,20 @@ private void checkPieChart(ChartWidget chartWidgetWithPieChart, boolean checkSty } private void checkBarChart(ChartWidget chartWidgetWithBarChart, boolean checkStyle, boolean checkConditionalStyle) { - assertThat(chartWidgetWithBarChart.getLabel()).isEqualTo("The Chart Widget label"); //$NON-NLS-1$ + assertThat(chartWidgetWithBarChart.getLabel()).isEqualTo("The Chart Widget label"); IChart chart = chartWidgetWithBarChart.getChart(); assertThat(chart).isInstanceOf(BarChart.class); BarChart barChart = (BarChart) chart; - assertThat(barChart.getLabel()).isEqualTo("the values"); //$NON-NLS-1$ + assertThat(barChart.getLabel()).isEqualTo("the values"); List barChartEntries = barChart.getEntries(); - this.checkBarChartEntry(barChartEntries, 0, "a", 1); //$NON-NLS-1$ - this.checkBarChartEntry(barChartEntries, 1, "b", 3); //$NON-NLS-1$ - this.checkBarChartEntry(barChartEntries, 2, "c", 5); //$NON-NLS-1$ - this.checkBarChartEntry(barChartEntries, 3, "d", 7); //$NON-NLS-1$ + this.checkBarChartEntry(barChartEntries, 0, "a", 1); + this.checkBarChartEntry(barChartEntries, 1, "b", 3); + this.checkBarChartEntry(barChartEntries, 2, "c", 5); + this.checkBarChartEntry(barChartEntries, 3, "d", 7); BarChartStyle style = barChart.getStyle(); if (checkStyle) { assertThat(style).isNotNull(); - assertThat(style.getBarsColor()).isEqualTo("Orchid"); //$NON-NLS-1$ + assertThat(style.getBarsColor()).isEqualTo("Orchid"); assertThat(style.getFontSize()).isEqualTo(20); assertThat(style.isItalic()).isTrue(); assertThat(style.isBold()).isTrue(); @@ -474,7 +474,7 @@ private void checkBarChart(ChartWidget chartWidgetWithBarChart, boolean checkSty assertThat(style.isStrikeThrough()).isTrue(); } else if (checkConditionalStyle) { assertThat(style).isNotNull(); - assertThat(style.getBarsColor()).isEqualTo("PaleGoldenRod"); //$NON-NLS-1$ + assertThat(style.getBarsColor()).isEqualTo("PaleGoldenRod"); assertThat(style.getFontSize()).isEqualTo(30); assertThat(style.isItalic()).isTrue(); assertThat(style.isBold()).isFalse(); @@ -494,21 +494,21 @@ private void checkPieChartEntry(List entries, int index, String e } private void checkImage(Image image) { - assertThat(image.getLabel()).isEqualTo("Icon for EClass Class1"); //$NON-NLS-1$ - assertThat(image.getUrl()).isEqualTo("icons/Class1.svg"); //$NON-NLS-1$ - assertThat(image.getMaxWidth()).isEqualTo("30%"); //$NON-NLS-1$ + assertThat(image.getLabel()).isEqualTo("Icon for EClass Class1"); + assertThat(image.getUrl()).isEqualTo("icons/Class1.svg"); + assertThat(image.getMaxWidth()).isEqualTo("30%"); } private void checkFlexboxContainer(FlexboxContainer flexboxContainer, boolean checkStyle, boolean checkConditionalStyle) { - assertThat(flexboxContainer.getLabel()).isEqualTo("A Widget Container"); //$NON-NLS-1$ + assertThat(flexboxContainer.getLabel()).isEqualTo("A Widget Container"); List children = flexboxContainer.getChildren(); assertThat(children).hasSize(2); assertThat(children.get(0)).isInstanceOf(Textfield.class); assertThat(children.get(1)).isInstanceOf(Checkbox.class); Textfield childrenTextfield = (Textfield) children.get(0); - assertThat(childrenTextfield.getValue()).isEqualTo("Class1"); //$NON-NLS-1$ - assertThat(childrenTextfield.getLabel()).isEqualTo("EClass name"); //$NON-NLS-1$ + assertThat(childrenTextfield.getValue()).isEqualTo("Class1"); + assertThat(childrenTextfield.getLabel()).isEqualTo("EClass name"); if (!(checkStyle || checkConditionalStyle)) { this.testNoStyle(childrenTextfield); } else if (checkStyle) { @@ -519,7 +519,7 @@ private void checkFlexboxContainer(FlexboxContainer flexboxContainer, boolean ch Checkbox childrenCheckbox = (Checkbox) children.get(1); assertThat(childrenCheckbox.isValue()).isTrue(); - assertThat(childrenCheckbox.getLabel()).isEqualTo("is Abstract"); //$NON-NLS-1$ + assertThat(childrenCheckbox.getLabel()).isEqualTo("is Abstract"); if (!(checkStyle || checkConditionalStyle)) { this.testNoStyle(childrenCheckbox); } else if (checkStyle) { @@ -534,21 +534,21 @@ private void checkValuesEditing(EClass eClass, Form form) { assertThat(group.getWidgets()).hasSize(14); Textfield textfield = (Textfield) group.getWidgets().get(0); - assertThat(textfield.getValue()).isEqualTo("Class1"); //$NON-NLS-1$ - assertThat(eClass.getName()).isEqualTo("Class1"); //$NON-NLS-1$ - textfield.getNewValueHandler().apply("my New Value"); //$NON-NLS-1$ - assertThat(eClass.getName()).isEqualTo("my New Value"); //$NON-NLS-1$ + assertThat(textfield.getValue()).isEqualTo("Class1"); + assertThat(eClass.getName()).isEqualTo("Class1"); + textfield.getNewValueHandler().apply("my New Value"); + assertThat(eClass.getName()).isEqualTo("my New Value"); Textarea textarea = (Textarea) group.getWidgets().get(1); - assertThat(textarea.getValue()).isEqualTo("Class1Instance"); //$NON-NLS-1$ - assertThat(eClass.getInstanceClassName()).isEqualTo("Class1Instance"); //$NON-NLS-1$ - textarea.getNewValueHandler().apply("newInstanceName"); //$NON-NLS-1$ - assertThat(eClass.getInstanceClassName()).isEqualTo("newInstanceName"); //$NON-NLS-1$ + assertThat(textarea.getValue()).isEqualTo("Class1Instance"); + assertThat(eClass.getInstanceClassName()).isEqualTo("Class1Instance"); + textarea.getNewValueHandler().apply("newInstanceName"); + assertThat(eClass.getInstanceClassName()).isEqualTo("newInstanceName"); MultiSelect multiSelect = (MultiSelect) group.getWidgets().get(2); assertThat(multiSelect.getValues()).hasSize(2); - assertThat(multiSelect.getValues()).containsExactlyInAnyOrder("Class2", "Class3"); //$NON-NLS-1$//$NON-NLS-2$ - multiSelect.getNewValuesHandler().apply(List.of("Class2")); //$NON-NLS-1$ + assertThat(multiSelect.getValues()).containsExactlyInAnyOrder("Class2", "Class3"); + multiSelect.getNewValuesHandler().apply(List.of("Class2")); assertThat(eClass.getESuperTypes()).containsExactlyInAnyOrder(this.eClasses[1]); Checkbox checkBox = (Checkbox) group.getWidgets().get(3); @@ -559,14 +559,14 @@ private void checkValuesEditing(EClass eClass, Form form) { Select select = (Select) group.getWidgets().get(4); assertThat(select.getOptions()).hasSize(3); - assertThat(select.getValue()).isEqualTo("Class2"); //$NON-NLS-1$ - select.getNewValueHandler().apply("Class3"); //$NON-NLS-1$ + assertThat(select.getValue()).isEqualTo("Class2"); + select.getNewValueHandler().apply("Class3"); assertThat(this.eClasses[0].getESuperTypes()).containsExactlyInAnyOrder(this.eClasses[2]); Radio radio = (Radio) group.getWidgets().get(5); assertThat(radio.getOptions()).hasSize(3); radio.getOptions().forEach(option -> { - if (option.getLabel().equals("Class2")) { //$NON-NLS-1$ + if (option.getLabel().equals("Class2")) { assertThat(option.isSelected()).isTrue(); } else { assertThat(option.isSelected()).isFalse(); @@ -576,7 +576,7 @@ private void checkValuesEditing(EClass eClass, Form form) { this.renderOnEcoreFormWithStyleOnWidgetContainer(eClass, group); Button button = (Button) group.getWidgets().get(9); - assertThat(button.getButtonLabel()).isEqualTo("Class1"); //$NON-NLS-1$ + assertThat(button.getButtonLabel()).isEqualTo("Class1"); } private void renderOnEcoreFormWithStyleOnWidgetContainer(EClass eClass, Group group) { @@ -586,10 +586,10 @@ private void renderOnEcoreFormWithStyleOnWidgetContainer(EClass eClass, Group gr assertThat(flexboxContainer.getChildren().get(1)).isInstanceOf(Checkbox.class); Textfield childrenTextfield = (Textfield) flexboxContainer.getChildren().get(0); - assertThat(childrenTextfield.getValue()).isEqualTo("Class1"); //$NON-NLS-1$ - assertThat(eClass.getName()).isEqualTo("my New Value"); //$NON-NLS-1$ - childrenTextfield.getNewValueHandler().apply("my New Value 2"); //$NON-NLS-1$ - assertThat(eClass.getName()).isEqualTo("my New Value 2"); //$NON-NLS-1$ + assertThat(childrenTextfield.getValue()).isEqualTo("Class1"); + assertThat(eClass.getName()).isEqualTo("my New Value"); + childrenTextfield.getNewValueHandler().apply("my New Value 2"); + assertThat(eClass.getName()).isEqualTo("my New Value 2"); Checkbox childrenCheckbox = (Checkbox) flexboxContainer.getChildren().get(1); assertThat(childrenCheckbox.isValue()).isTrue(); @@ -600,11 +600,11 @@ private void renderOnEcoreFormWithStyleOnWidgetContainer(EClass eClass, Group gr private FormDescription createClassFormDescription(boolean withStyle, boolean withConditionalStyle) { FormDescription formDescription = ViewFactory.eINSTANCE.createFormDescription(); - formDescription.setName("Simple Ecore Form"); //$NON-NLS-1$ - formDescription.setTitleExpression("aql:self.name"); //$NON-NLS-1$ - formDescription.setDomainType("ecore::EClass"); //$NON-NLS-1$ + formDescription.setName("Simple Ecore Form"); + formDescription.setTitleExpression("aql:self.name"); + formDescription.setDomainType("ecore::EClass"); GroupDescription groupDescription = ViewFactory.eINSTANCE.createGroupDescription(); - groupDescription.setLabelExpression("aql:self.name"); //$NON-NLS-1$ + groupDescription.setLabelExpression("aql:self.name"); formDescription.getGroups().add(groupDescription); TextfieldDescription textfieldDescription = this.createTextfield(withStyle, withConditionalStyle); groupDescription.getWidgets().add(textfieldDescription); @@ -639,21 +639,21 @@ private FormDescription createClassFormDescription(boolean withStyle, boolean wi private BarChartDescription createBarChart(boolean withStyle, boolean withConditionalStyle) { BarChartDescription barChartDescription = ViewFactory.eINSTANCE.createBarChartDescription(); - barChartDescription.setName("barChart"); //$NON-NLS-1$ - barChartDescription.setLabelExpression("aql:'The Chart Widget label'"); //$NON-NLS-1$ - barChartDescription.setYAxisLabelExpression("aql:'the values'"); //$NON-NLS-1$ - barChartDescription.setKeysExpression("aql:Sequence{'a','b','c','d'}"); //$NON-NLS-1$ - barChartDescription.setValuesExpression("aql:Sequence{1,3,5,7}"); //$NON-NLS-1$ + barChartDescription.setName("barChart"); + barChartDescription.setLabelExpression("aql:'The Chart Widget label'"); + barChartDescription.setYAxisLabelExpression("aql:'the values'"); + barChartDescription.setKeysExpression("aql:Sequence{'a','b','c','d'}"); + barChartDescription.setValuesExpression("aql:Sequence{1,3,5,7}"); if (withStyle) { BarChartDescriptionStyle style = ViewFactory.eINSTANCE.createBarChartDescriptionStyle(); - style.setBarsColor("Orchid"); //$NON-NLS-1$ + style.setBarsColor("Orchid"); this.setFontStyle(style); barChartDescription.setStyle(style); } if (withConditionalStyle) { ConditionalBarChartDescriptionStyle conditionalStyle = ViewFactory.eINSTANCE.createConditionalBarChartDescriptionStyle(); - conditionalStyle.setCondition("aql:true"); //$NON-NLS-1$ - conditionalStyle.setBarsColor("PaleGoldenRod"); //$NON-NLS-1$ + conditionalStyle.setCondition("aql:true"); + conditionalStyle.setBarsColor("PaleGoldenRod"); this.setConditionalFontStyle(conditionalStyle); barChartDescription.getConditionalStyles().add(conditionalStyle); } @@ -663,26 +663,26 @@ private BarChartDescription createBarChart(boolean withStyle, boolean withCondit private PieChartDescription createPieChart(boolean withStyle, boolean withConditionalStyle) { PieChartDescription pieChartDescription = ViewFactory.eINSTANCE.createPieChartDescription(); - pieChartDescription.setName("chartWidget"); //$NON-NLS-1$ - pieChartDescription.setLabelExpression("aql:'The Chart Widget label'"); //$NON-NLS-1$ - pieChartDescription.setName("pieChart"); //$NON-NLS-1$ - pieChartDescription.setKeysExpression("aql:Sequence{'a','b','c','d'}"); //$NON-NLS-1$ - pieChartDescription.setValuesExpression("aql:Sequence{1,3,5,7}"); //$NON-NLS-1$ + pieChartDescription.setName("chartWidget"); + pieChartDescription.setLabelExpression("aql:'The Chart Widget label'"); + pieChartDescription.setName("pieChart"); + pieChartDescription.setKeysExpression("aql:Sequence{'a','b','c','d'}"); + pieChartDescription.setValuesExpression("aql:Sequence{1,3,5,7}"); if (withStyle) { PieChartDescriptionStyle style = ViewFactory.eINSTANCE.createPieChartDescriptionStyle(); - style.setColors("aql:Sequence{'AliceBlue','AntiqueWhite','DarkMagenta','DarkGreen'}"); //$NON-NLS-1$ - style.setStrokeColor("Orchid"); //$NON-NLS-1$ - style.setStrokeWidth("3"); //$NON-NLS-1$ + style.setColors("aql:Sequence{'AliceBlue','AntiqueWhite','DarkMagenta','DarkGreen'}"); + style.setStrokeColor("Orchid"); + style.setStrokeWidth("3"); this.setFontStyle(style); pieChartDescription.setStyle(style); } if (withConditionalStyle) { ConditionalPieChartDescriptionStyle conditionalStyle = ViewFactory.eINSTANCE.createConditionalPieChartDescriptionStyle(); - conditionalStyle.setCondition("aql:true"); //$NON-NLS-1$ - conditionalStyle.setColors("aql:Sequence{'CadetBlue','AntiqueWhite','DarkMagenta','Coral'}"); //$NON-NLS-1$ - conditionalStyle.setStrokeColor("PaleGoldenRod"); //$NON-NLS-1$ - conditionalStyle.setStrokeWidth("2"); //$NON-NLS-1$ + conditionalStyle.setCondition("aql:true"); + conditionalStyle.setColors("aql:Sequence{'CadetBlue','AntiqueWhite','DarkMagenta','Coral'}"); + conditionalStyle.setStrokeColor("PaleGoldenRod"); + conditionalStyle.setStrokeWidth("2"); this.setConditionalFontStyle(conditionalStyle); pieChartDescription.getConditionalStyles().add(conditionalStyle); } @@ -691,7 +691,7 @@ private PieChartDescription createPieChart(boolean withStyle, boolean withCondit private FlexboxContainerDescription createFlexboxContainer(boolean withStyle, boolean withConditionalStyle) { FlexboxContainerDescription flexboxContainerDescription = ViewFactory.eINSTANCE.createFlexboxContainerDescription(); - flexboxContainerDescription.setLabelExpression("aql:'A Widget Container'"); //$NON-NLS-1$ + flexboxContainerDescription.setLabelExpression("aql:'A Widget Container'"); TextfieldDescription textfieldDescription = this.createTextfield(withStyle, withConditionalStyle); flexboxContainerDescription.getChildren().add(textfieldDescription); CheckboxDescription checkboxDescription = this.createCheckbox(withStyle, withConditionalStyle); @@ -701,220 +701,220 @@ private FlexboxContainerDescription createFlexboxContainer(boolean withStyle, bo private RadioDescription createRadio(boolean withStyle, boolean withConditionalStyle) { RadioDescription radioDescription = ViewFactory.eINSTANCE.createRadioDescription(); - radioDescription.setLabelExpression("aql:'ESuperTypes'"); //$NON-NLS-1$ - radioDescription.setValueExpression("aql:self.eSuperTypes->first()"); //$NON-NLS-1$ - radioDescription.setCandidatesExpression("aql:self.eContainer().eAllContents(ecore::EClass)"); //$NON-NLS-1$ - radioDescription.setCandidateLabelExpression("aql:candidate.name"); //$NON-NLS-1$ + radioDescription.setLabelExpression("aql:'ESuperTypes'"); + radioDescription.setValueExpression("aql:self.eSuperTypes->first()"); + radioDescription.setCandidatesExpression("aql:self.eContainer().eAllContents(ecore::EClass)"); + radioDescription.setCandidateLabelExpression("aql:candidate.name"); if (withStyle) { RadioDescriptionStyle style = ViewFactory.eINSTANCE.createRadioDescriptionStyle(); - style.setColor("#de1000"); //$NON-NLS-1$ + style.setColor("#de1000"); this.setFontStyle(style); radioDescription.setStyle(style); } if (withConditionalStyle) { ConditionalRadioDescriptionStyle conditionalStyle = ViewFactory.eINSTANCE.createConditionalRadioDescriptionStyle(); - conditionalStyle.setCondition("aql:true"); //$NON-NLS-1$ - conditionalStyle.setColor("#fbb800"); //$NON-NLS-1$ + conditionalStyle.setCondition("aql:true"); + conditionalStyle.setColor("#fbb800"); this.setConditionalFontStyle(conditionalStyle); radioDescription.getConditionalStyles().add(conditionalStyle); } SetValue radioSetValue = ViewFactory.eINSTANCE.createSetValue(); - radioSetValue.setFeatureName("eSuperTypes"); //$NON-NLS-1$ - radioSetValue.setValueExpression("aql:newValue"); //$NON-NLS-1$ + radioSetValue.setFeatureName("eSuperTypes"); + radioSetValue.setValueExpression("aql:newValue"); radioDescription.getBody().add(radioSetValue); return radioDescription; } private SelectDescription createSelect(boolean withStyle, boolean withConditionalStyle) { SelectDescription selectDescription = ViewFactory.eINSTANCE.createSelectDescription(); - selectDescription.setLabelExpression("aql:'eSuper Types'"); //$NON-NLS-1$ - selectDescription.setValueExpression("aql:self.eSuperTypes->first()"); //$NON-NLS-1$ - selectDescription.setCandidatesExpression("aql:self.eContainer().eAllContents(ecore::EClass)"); //$NON-NLS-1$ - selectDescription.setCandidateLabelExpression("aql:candidate.name"); //$NON-NLS-1$ + selectDescription.setLabelExpression("aql:'eSuper Types'"); + selectDescription.setValueExpression("aql:self.eSuperTypes->first()"); + selectDescription.setCandidatesExpression("aql:self.eContainer().eAllContents(ecore::EClass)"); + selectDescription.setCandidateLabelExpression("aql:candidate.name"); if (withStyle) { SelectDescriptionStyle style = ViewFactory.eINSTANCE.createSelectDescriptionStyle(); - style.setBackgroundColor("#de1000"); //$NON-NLS-1$ - style.setForegroundColor("#777777"); //$NON-NLS-1$ + style.setBackgroundColor("#de1000"); + style.setForegroundColor("#777777"); this.setFontStyle(style); selectDescription.setStyle(style); } if (withConditionalStyle) { ConditionalSelectDescriptionStyle conditionalStyle = ViewFactory.eINSTANCE.createConditionalSelectDescriptionStyle(); - conditionalStyle.setCondition("aql:true"); //$NON-NLS-1$ - conditionalStyle.setBackgroundColor("#fbb800"); //$NON-NLS-1$ - conditionalStyle.setForegroundColor("#134cba"); //$NON-NLS-1$ + conditionalStyle.setCondition("aql:true"); + conditionalStyle.setBackgroundColor("#fbb800"); + conditionalStyle.setForegroundColor("#134cba"); this.setConditionalFontStyle(conditionalStyle); selectDescription.getConditionalStyles().add(conditionalStyle); } UnsetValue selectUnsetValue = ViewFactory.eINSTANCE.createUnsetValue(); - selectUnsetValue.setFeatureName("eSuperTypes"); //$NON-NLS-1$ - selectUnsetValue.setElementExpression("aql:self.eSuperTypes"); //$NON-NLS-1$ + selectUnsetValue.setFeatureName("eSuperTypes"); + selectUnsetValue.setElementExpression("aql:self.eSuperTypes"); selectDescription.getBody().add(selectUnsetValue); SetValue selectSetValue = ViewFactory.eINSTANCE.createSetValue(); - selectSetValue.setFeatureName("eSuperTypes"); //$NON-NLS-1$ - selectSetValue.setValueExpression("aql:newValue"); //$NON-NLS-1$ + selectSetValue.setFeatureName("eSuperTypes"); + selectSetValue.setValueExpression("aql:newValue"); selectUnsetValue.getChildren().add(selectSetValue); return selectDescription; } private CheckboxDescription createCheckbox(boolean withStyle, boolean withConditionalStyle) { CheckboxDescription checkboxDescription = ViewFactory.eINSTANCE.createCheckboxDescription(); - checkboxDescription.setLabelExpression("is Abstract"); //$NON-NLS-1$ - checkboxDescription.setValueExpression("aql:self.abstract"); //$NON-NLS-1$ + checkboxDescription.setLabelExpression("is Abstract"); + checkboxDescription.setValueExpression("aql:self.abstract"); if (withStyle) { CheckboxDescriptionStyle style = ViewFactory.eINSTANCE.createCheckboxDescriptionStyle(); - style.setColor("#de1000"); //$NON-NLS-1$ + style.setColor("#de1000"); checkboxDescription.setStyle(style); } if (withConditionalStyle) { ConditionalCheckboxDescriptionStyle conditionalStyle = ViewFactory.eINSTANCE.createConditionalCheckboxDescriptionStyle(); - conditionalStyle.setCondition("aql:true"); //$NON-NLS-1$ - conditionalStyle.setColor("#fbb800"); //$NON-NLS-1$ + conditionalStyle.setCondition("aql:true"); + conditionalStyle.setColor("#fbb800"); checkboxDescription.getConditionalStyles().add(conditionalStyle); } SetValue checkboxSetValue = ViewFactory.eINSTANCE.createSetValue(); - checkboxSetValue.setFeatureName("abstract"); //$NON-NLS-1$ - checkboxSetValue.setValueExpression("aql:newValue"); //$NON-NLS-1$ + checkboxSetValue.setFeatureName("abstract"); + checkboxSetValue.setValueExpression("aql:newValue"); checkboxDescription.getBody().add(checkboxSetValue); return checkboxDescription; } private MultiSelectDescription createMultiSelect(boolean withStyle, boolean withConditionalStyle) { MultiSelectDescription multiSelectDescription = ViewFactory.eINSTANCE.createMultiSelectDescription(); - multiSelectDescription.setLabelExpression("aql:'ESuperTypes'"); //$NON-NLS-1$ - multiSelectDescription.setValueExpression("aql:self.eSuperTypes"); //$NON-NLS-1$ - multiSelectDescription.setCandidatesExpression("aql:self.eContainer().eAllContents(ecore::EClass)"); //$NON-NLS-1$ - multiSelectDescription.setCandidateLabelExpression("aql:candidate.name"); //$NON-NLS-1$ + multiSelectDescription.setLabelExpression("aql:'ESuperTypes'"); + multiSelectDescription.setValueExpression("aql:self.eSuperTypes"); + multiSelectDescription.setCandidatesExpression("aql:self.eContainer().eAllContents(ecore::EClass)"); + multiSelectDescription.setCandidateLabelExpression("aql:candidate.name"); if (withStyle) { MultiSelectDescriptionStyle style = ViewFactory.eINSTANCE.createMultiSelectDescriptionStyle(); - style.setBackgroundColor("#de1000"); //$NON-NLS-1$ - style.setForegroundColor("#777777"); //$NON-NLS-1$ + style.setBackgroundColor("#de1000"); + style.setForegroundColor("#777777"); this.setFontStyle(style); multiSelectDescription.setStyle(style); } if (withConditionalStyle) { ConditionalMultiSelectDescriptionStyle conditionalStyle = ViewFactory.eINSTANCE.createConditionalMultiSelectDescriptionStyle(); - conditionalStyle.setCondition("aql:true"); //$NON-NLS-1$ - conditionalStyle.setBackgroundColor("#fbb800"); //$NON-NLS-1$ - conditionalStyle.setForegroundColor("#134cba"); //$NON-NLS-1$ + conditionalStyle.setCondition("aql:true"); + conditionalStyle.setBackgroundColor("#fbb800"); + conditionalStyle.setForegroundColor("#134cba"); this.setConditionalFontStyle(conditionalStyle); multiSelectDescription.getConditionalStyles().add(conditionalStyle); } UnsetValue multiSelectUnsetValue = ViewFactory.eINSTANCE.createUnsetValue(); - multiSelectUnsetValue.setFeatureName("eSuperTypes"); //$NON-NLS-1$ - multiSelectUnsetValue.setElementExpression("aql:self.eSuperTypes"); //$NON-NLS-1$ + multiSelectUnsetValue.setFeatureName("eSuperTypes"); + multiSelectUnsetValue.setElementExpression("aql:self.eSuperTypes"); multiSelectDescription.getBody().add(multiSelectUnsetValue); SetValue multiSelectSetValue = ViewFactory.eINSTANCE.createSetValue(); - multiSelectSetValue.setFeatureName("eSuperTypes"); //$NON-NLS-1$ - multiSelectSetValue.setValueExpression("aql:newValue"); //$NON-NLS-1$ + multiSelectSetValue.setFeatureName("eSuperTypes"); + multiSelectSetValue.setValueExpression("aql:newValue"); multiSelectUnsetValue.getChildren().add(multiSelectSetValue); return multiSelectDescription; } private TextAreaDescription createTextArea(boolean withStyle, boolean withConditionalStyle) { TextAreaDescription textareaDescription = ViewFactory.eINSTANCE.createTextAreaDescription(); - textareaDescription.setLabelExpression("aql:'Instance Class Name'"); //$NON-NLS-1$ - textareaDescription.setValueExpression("aql:self.instanceClassName"); //$NON-NLS-1$ + textareaDescription.setLabelExpression("aql:'Instance Class Name'"); + textareaDescription.setValueExpression("aql:self.instanceClassName"); if (withStyle) { TextareaDescriptionStyle style = ViewFactory.eINSTANCE.createTextareaDescriptionStyle(); - style.setBackgroundColor("#de1000"); //$NON-NLS-1$ - style.setForegroundColor("#777777"); //$NON-NLS-1$ + style.setBackgroundColor("#de1000"); + style.setForegroundColor("#777777"); this.setFontStyle(style); textareaDescription.setStyle(style); } if (withConditionalStyle) { ConditionalTextareaDescriptionStyle conditionalStyle = ViewFactory.eINSTANCE.createConditionalTextareaDescriptionStyle(); - conditionalStyle.setCondition("aql:true"); //$NON-NLS-1$ - conditionalStyle.setBackgroundColor("#fbb800"); //$NON-NLS-1$ - conditionalStyle.setForegroundColor("#134cba"); //$NON-NLS-1$ + conditionalStyle.setCondition("aql:true"); + conditionalStyle.setBackgroundColor("#fbb800"); + conditionalStyle.setForegroundColor("#134cba"); this.setConditionalFontStyle(conditionalStyle); textareaDescription.getConditionalStyles().add(conditionalStyle); } SetValue textareaSetValue = ViewFactory.eINSTANCE.createSetValue(); - textareaSetValue.setFeatureName("instanceClassName"); //$NON-NLS-1$ - textareaSetValue.setValueExpression("aql:newValue"); //$NON-NLS-1$ + textareaSetValue.setFeatureName("instanceClassName"); + textareaSetValue.setValueExpression("aql:newValue"); textareaDescription.getBody().add(textareaSetValue); return textareaDescription; } private TextfieldDescription createTextfield(boolean withStyle, boolean withConditionalStyle) { TextfieldDescription textfieldDescription = ViewFactory.eINSTANCE.createTextfieldDescription(); - textfieldDescription.setLabelExpression("aql:'EClass name'"); //$NON-NLS-1$ - textfieldDescription.setValueExpression("aql:self.name"); //$NON-NLS-1$ - textfieldDescription.setName("Class Name"); //$NON-NLS-1$ + textfieldDescription.setLabelExpression("aql:'EClass name'"); + textfieldDescription.setValueExpression("aql:self.name"); + textfieldDescription.setName("Class Name"); if (withStyle) { TextfieldDescriptionStyle style = ViewFactory.eINSTANCE.createTextfieldDescriptionStyle(); - style.setBackgroundColor("#de1000"); //$NON-NLS-1$ - style.setForegroundColor("#777777"); //$NON-NLS-1$ + style.setBackgroundColor("#de1000"); + style.setForegroundColor("#777777"); this.setFontStyle(style); textfieldDescription.setStyle(style); } if (withConditionalStyle) { ConditionalTextfieldDescriptionStyle conditionalStyle = ViewFactory.eINSTANCE.createConditionalTextfieldDescriptionStyle(); - conditionalStyle.setCondition("aql:true"); //$NON-NLS-1$ - conditionalStyle.setBackgroundColor("#fbb800"); //$NON-NLS-1$ - conditionalStyle.setForegroundColor("#134cba"); //$NON-NLS-1$ + conditionalStyle.setCondition("aql:true"); + conditionalStyle.setBackgroundColor("#fbb800"); + conditionalStyle.setForegroundColor("#134cba"); this.setConditionalFontStyle(conditionalStyle); textfieldDescription.getConditionalStyles().add(conditionalStyle); } SetValue setValue = ViewFactory.eINSTANCE.createSetValue(); - setValue.setFeatureName("name"); //$NON-NLS-1$ - setValue.setValueExpression("aql:newValue"); //$NON-NLS-1$ + setValue.setFeatureName("name"); + setValue.setValueExpression("aql:newValue"); textfieldDescription.getBody().add(setValue); return textfieldDescription; } private ButtonDescription createButton(boolean withStyle, boolean withConditionalStyle) { ButtonDescription buttonDescription = ViewFactory.eINSTANCE.createButtonDescription(); - buttonDescription.setLabelExpression("aql:'EClass name'"); //$NON-NLS-1$ - buttonDescription.setButtonLabelExpression("aql:self.name"); //$NON-NLS-1$ - buttonDescription.setName("Class Name"); //$NON-NLS-1$ + buttonDescription.setLabelExpression("aql:'EClass name'"); + buttonDescription.setButtonLabelExpression("aql:self.name"); + buttonDescription.setName("Class Name"); if (withStyle) { ButtonDescriptionStyle style = ViewFactory.eINSTANCE.createButtonDescriptionStyle(); - style.setBackgroundColor("#de1000"); //$NON-NLS-1$ - style.setForegroundColor("#777777"); //$NON-NLS-1$ + style.setBackgroundColor("#de1000"); + style.setForegroundColor("#777777"); this.setFontStyle(style); buttonDescription.setStyle(style); } if (withConditionalStyle) { ConditionalButtonDescriptionStyle conditionalStyle = ViewFactory.eINSTANCE.createConditionalButtonDescriptionStyle(); - conditionalStyle.setCondition("aql:true"); //$NON-NLS-1$ - conditionalStyle.setBackgroundColor("#fbb800"); //$NON-NLS-1$ - conditionalStyle.setForegroundColor("#134cba"); //$NON-NLS-1$ + conditionalStyle.setCondition("aql:true"); + conditionalStyle.setBackgroundColor("#fbb800"); + conditionalStyle.setForegroundColor("#134cba"); this.setConditionalFontStyle(conditionalStyle); buttonDescription.getConditionalStyles().add(conditionalStyle); } SetValue setValue = ViewFactory.eINSTANCE.createSetValue(); - setValue.setFeatureName("name"); //$NON-NLS-1$ - setValue.setValueExpression("aql:newValue"); //$NON-NLS-1$ + setValue.setFeatureName("name"); + setValue.setValueExpression("aql:newValue"); buttonDescription.getBody().add(setValue); return buttonDescription; } private LabelDescription createLabel(boolean withStyle, boolean withConditionalStyle) { LabelDescription labelDescription = ViewFactory.eINSTANCE.createLabelDescription(); - labelDescription.setLabelExpression("aql:'Label EClass name'"); //$NON-NLS-1$ - labelDescription.setValueExpression("aql:self.name"); //$NON-NLS-1$ - labelDescription.setName("Class Name"); //$NON-NLS-1$ + labelDescription.setLabelExpression("aql:'Label EClass name'"); + labelDescription.setValueExpression("aql:self.name"); + labelDescription.setName("Class Name"); if (withStyle) { LabelDescriptionStyle style = ViewFactory.eINSTANCE.createLabelDescriptionStyle(); - style.setColor("#de1000"); //$NON-NLS-1$ + style.setColor("#de1000"); this.setFontStyle(style); labelDescription.setStyle(style); } if (withConditionalStyle) { ConditionalLabelDescriptionStyle conditionalStyle = ViewFactory.eINSTANCE.createConditionalLabelDescriptionStyle(); - conditionalStyle.setCondition("aql:true"); //$NON-NLS-1$ - conditionalStyle.setColor("#fbb800"); //$NON-NLS-1$ + conditionalStyle.setCondition("aql:true"); + conditionalStyle.setColor("#fbb800"); this.setConditionalFontStyle(conditionalStyle); labelDescription.getConditionalStyles().add(conditionalStyle); } @@ -924,19 +924,19 @@ private LabelDescription createLabel(boolean withStyle, boolean withConditionalS private LinkDescription createLink(boolean withStyle, boolean withConditionalStyle) { LinkDescription linkDescription = ViewFactory.eINSTANCE.createLinkDescription(); - linkDescription.setLabelExpression("aql:'Label EClass link'"); //$NON-NLS-1$ - linkDescription.setValueExpression("myHyperLink"); //$NON-NLS-1$ - linkDescription.setName("Class Name"); //$NON-NLS-1$ + linkDescription.setLabelExpression("aql:'Label EClass link'"); + linkDescription.setValueExpression("myHyperLink"); + linkDescription.setName("Class Name"); if (withStyle) { LinkDescriptionStyle style = ViewFactory.eINSTANCE.createLinkDescriptionStyle(); - style.setColor("#de1000"); //$NON-NLS-1$ + style.setColor("#de1000"); this.setFontStyle(style); linkDescription.setStyle(style); } if (withConditionalStyle) { ConditionalLinkDescriptionStyle conditionalStyle = ViewFactory.eINSTANCE.createConditionalLinkDescriptionStyle(); - conditionalStyle.setCondition("aql:true"); //$NON-NLS-1$ - conditionalStyle.setColor("#fbb800"); //$NON-NLS-1$ + conditionalStyle.setCondition("aql:true"); + conditionalStyle.setColor("#fbb800"); this.setConditionalFontStyle(conditionalStyle); linkDescription.getConditionalStyles().add(conditionalStyle); } @@ -946,30 +946,30 @@ private LinkDescription createLink(boolean withStyle, boolean withConditionalSty private ListDescription createList(boolean withStyle, boolean withConditionalStyle) { ListDescription listDescription = ViewFactory.eINSTANCE.createListDescription(); - listDescription.setLabelExpression("aql:'Label EClass List'"); //$NON-NLS-1$ - listDescription.setName("Classes list"); //$NON-NLS-1$ - listDescription.setValueExpression("aql:self.eContainer().eAllContents(ecore::EClass)"); //$NON-NLS-1$ - listDescription.setDisplayExpression("aql:candidate.name"); //$NON-NLS-1$ - listDescription.setIsDeletableExpression("aql:true"); //$NON-NLS-1$ + listDescription.setLabelExpression("aql:'Label EClass List'"); + listDescription.setName("Classes list"); + listDescription.setValueExpression("aql:self.eContainer().eAllContents(ecore::EClass)"); + listDescription.setDisplayExpression("aql:candidate.name"); + listDescription.setIsDeletableExpression("aql:true"); ChangeContext changeContext = ViewFactory.eINSTANCE.createChangeContext(); - changeContext.setExpression("aql:candidate"); //$NON-NLS-1$ + changeContext.setExpression("aql:candidate"); SetValue setValue = ViewFactory.eINSTANCE.createSetValue(); - setValue.setFeatureName("name"); //$NON-NLS-1$ - setValue.setValueExpression("aql:self.name + ' click event kind: ' + onClickEventKind"); //$NON-NLS-1$ + setValue.setFeatureName("name"); + setValue.setValueExpression("aql:self.name + ' click event kind: ' + onClickEventKind"); changeContext.getChildren().add(setValue); listDescription.getBody().add(changeContext); if (withStyle) { ListDescriptionStyle style = ViewFactory.eINSTANCE.createListDescriptionStyle(); - style.setColor("lightBlue"); //$NON-NLS-1$ + style.setColor("lightBlue"); this.setFontStyle(style); listDescription.setStyle(style); } if (withConditionalStyle) { ConditionalListDescriptionStyle conditionalStyle = ViewFactory.eINSTANCE.createConditionalListDescriptionStyle(); - conditionalStyle.setCondition("aql:true"); //$NON-NLS-1$ - conditionalStyle.setColor("orange"); //$NON-NLS-1$ + conditionalStyle.setCondition("aql:true"); + conditionalStyle.setColor("orange"); this.setConditionalFontStyle(conditionalStyle); listDescription.getConditionalStyles().add(conditionalStyle); } @@ -979,10 +979,10 @@ private ListDescription createList(boolean withStyle, boolean withConditionalSty private ImageDescription createImage() { ImageDescription imageDescription = ViewFactory.eINSTANCE.createImageDescription(); - imageDescription.setName("EClass Icon"); //$NON-NLS-1$ - imageDescription.setLabelExpression("aql:'Icon for EClass ' + self.name"); //$NON-NLS-1$ - imageDescription.setUrlExpression("aql:'icons/' + self.name + '.svg'"); //$NON-NLS-1$ - imageDescription.setMaxWidthExpression("30%"); //$NON-NLS-1$ + imageDescription.setName("EClass Icon"); + imageDescription.setLabelExpression("aql:'Icon for EClass ' + self.name"); + imageDescription.setUrlExpression("aql:'icons/' + self.name + '.svg'"); + imageDescription.setMaxWidthExpression("30%"); return imageDescription; } @@ -1005,16 +1005,16 @@ private void setConditionalFontStyle(LabelStyle labelStyle) { private void testStyle(Textfield textfield) { TextfieldStyle textfieldStyle = textfield.getStyle(); assertThat(textfieldStyle).isNotNull(); - assertThat(textfieldStyle.getBackgroundColor()).isEqualTo("#de1000"); //$NON-NLS-1$ - assertThat(textfieldStyle.getForegroundColor()).isEqualTo("#777777"); //$NON-NLS-1$ + assertThat(textfieldStyle.getBackgroundColor()).isEqualTo("#de1000"); + assertThat(textfieldStyle.getForegroundColor()).isEqualTo("#777777"); this.testFontStyle(textfieldStyle); } private void testConditionalStyle(Textfield textfield) { TextfieldStyle textfieldStyle = textfield.getStyle(); assertThat(textfieldStyle).isNotNull(); - assertThat(textfieldStyle.getBackgroundColor()).isEqualTo("#fbb800"); //$NON-NLS-1$ - assertThat(textfieldStyle.getForegroundColor()).isEqualTo("#134cba"); //$NON-NLS-1$ + assertThat(textfieldStyle.getBackgroundColor()).isEqualTo("#fbb800"); + assertThat(textfieldStyle.getForegroundColor()).isEqualTo("#134cba"); this.testConditionalFontStyle(textfieldStyle); } @@ -1026,16 +1026,16 @@ private void testNoStyle(Textfield textfield) { private void testStyle(Textarea textarea) { TextareaStyle textareaStyle = textarea.getStyle(); assertThat(textareaStyle).isNotNull(); - assertThat(textareaStyle.getBackgroundColor()).isEqualTo("#de1000"); //$NON-NLS-1$ - assertThat(textareaStyle.getForegroundColor()).isEqualTo("#777777"); //$NON-NLS-1$ + assertThat(textareaStyle.getBackgroundColor()).isEqualTo("#de1000"); + assertThat(textareaStyle.getForegroundColor()).isEqualTo("#777777"); this.testFontStyle(textareaStyle); } private void testConditionalStyle(Textarea textarea) { TextareaStyle textareaStyle = textarea.getStyle(); assertThat(textareaStyle).isNotNull(); - assertThat(textareaStyle.getBackgroundColor()).isEqualTo("#fbb800"); //$NON-NLS-1$ - assertThat(textareaStyle.getForegroundColor()).isEqualTo("#134cba"); //$NON-NLS-1$ + assertThat(textareaStyle.getBackgroundColor()).isEqualTo("#fbb800"); + assertThat(textareaStyle.getForegroundColor()).isEqualTo("#134cba"); this.testConditionalFontStyle(textareaStyle); } @@ -1052,14 +1052,14 @@ private void testNoStyle(LabelWidget labelWidget) { private void testStyle(LabelWidget labelWidget) { LabelWidgetStyle labelWidgetStyle = labelWidget.getStyle(); assertThat(labelWidgetStyle).isNotNull(); - assertThat(labelWidgetStyle.getColor()).isEqualTo("#de1000"); //$NON-NLS-1$ + assertThat(labelWidgetStyle.getColor()).isEqualTo("#de1000"); this.testFontStyle(labelWidgetStyle); } private void testConditionalStyle(LabelWidget labelWidget) { LabelWidgetStyle labelWidgetStyle = labelWidget.getStyle(); assertThat(labelWidgetStyle).isNotNull(); - assertThat(labelWidgetStyle.getColor()).isEqualTo("#fbb800"); //$NON-NLS-1$ + assertThat(labelWidgetStyle.getColor()).isEqualTo("#fbb800"); this.testConditionalFontStyle(labelWidgetStyle); } @@ -1071,28 +1071,28 @@ private void testNoStyle(Link link) { private void testStyle(Link link) { LinkStyle linkStyle = link.getStyle(); assertThat(linkStyle).isNotNull(); - assertThat(linkStyle.getColor()).isEqualTo("#de1000"); //$NON-NLS-1$ + assertThat(linkStyle.getColor()).isEqualTo("#de1000"); this.testFontStyle(linkStyle); } private void testConditionalStyle(Link link) { LinkStyle linkStyle = link.getStyle(); assertThat(linkStyle).isNotNull(); - assertThat(linkStyle.getColor()).isEqualTo("#fbb800"); //$NON-NLS-1$ + assertThat(linkStyle.getColor()).isEqualTo("#fbb800"); this.testConditionalFontStyle(linkStyle); } private void testStyle(Radio radio) { RadioStyle radioStyle = radio.getStyle(); assertThat(radioStyle).isNotNull(); - assertThat(radioStyle.getColor()).isEqualTo("#de1000"); //$NON-NLS-1$ + assertThat(radioStyle.getColor()).isEqualTo("#de1000"); this.testFontStyle(radioStyle); } private void testConditionalStyle(Radio radio) { RadioStyle radioStyle = radio.getStyle(); assertThat(radioStyle).isNotNull(); - assertThat(radioStyle.getColor()).isEqualTo("#fbb800"); //$NON-NLS-1$ + assertThat(radioStyle.getColor()).isEqualTo("#fbb800"); this.testConditionalFontStyle(radioStyle); } @@ -1104,16 +1104,16 @@ private void testNoStyle(Radio radio) { private void testStyle(Select select) { SelectStyle selectStyle = select.getStyle(); assertThat(selectStyle).isNotNull(); - assertThat(selectStyle.getBackgroundColor()).isEqualTo("#de1000"); //$NON-NLS-1$ - assertThat(selectStyle.getForegroundColor()).isEqualTo("#777777"); //$NON-NLS-1$ + assertThat(selectStyle.getBackgroundColor()).isEqualTo("#de1000"); + assertThat(selectStyle.getForegroundColor()).isEqualTo("#777777"); this.testFontStyle(selectStyle); } private void testConditionalStyle(Select select) { SelectStyle selectStyle = select.getStyle(); assertThat(selectStyle).isNotNull(); - assertThat(selectStyle.getBackgroundColor()).isEqualTo("#fbb800"); //$NON-NLS-1$ - assertThat(selectStyle.getForegroundColor()).isEqualTo("#134cba"); //$NON-NLS-1$ + assertThat(selectStyle.getBackgroundColor()).isEqualTo("#fbb800"); + assertThat(selectStyle.getForegroundColor()).isEqualTo("#134cba"); this.testConditionalFontStyle(selectStyle); } @@ -1125,13 +1125,13 @@ private void testNoStyle(Select select) { private void testStyle(Checkbox checkBox) { CheckboxStyle checkBoxStyle = checkBox.getStyle(); assertThat(checkBoxStyle).isNotNull(); - assertThat(checkBoxStyle.getColor()).isEqualTo("#de1000"); //$NON-NLS-1$ + assertThat(checkBoxStyle.getColor()).isEqualTo("#de1000"); } private void testConditionalStyle(Checkbox checkBox) { CheckboxStyle checkBoxStyle = checkBox.getStyle(); assertThat(checkBoxStyle).isNotNull(); - assertThat(checkBoxStyle.getColor()).isEqualTo("#fbb800"); //$NON-NLS-1$ + assertThat(checkBoxStyle.getColor()).isEqualTo("#fbb800"); } private void testNoStyle(Checkbox checkBox) { @@ -1142,8 +1142,8 @@ private void testNoStyle(Checkbox checkBox) { private void testStyle(MultiSelect multiSelect) { MultiSelectStyle multiSelectStyle = multiSelect.getStyle(); assertThat(multiSelectStyle).isNotNull(); - assertThat(multiSelectStyle.getBackgroundColor()).isEqualTo("#de1000"); //$NON-NLS-1$ - assertThat(multiSelectStyle.getForegroundColor()).isEqualTo("#777777"); //$NON-NLS-1$ + assertThat(multiSelectStyle.getBackgroundColor()).isEqualTo("#de1000"); + assertThat(multiSelectStyle.getForegroundColor()).isEqualTo("#777777"); this.testFontStyle(multiSelectStyle); } @@ -1155,22 +1155,22 @@ private void testNoStyle(org.eclipse.sirius.components.forms.List list) { private void testStyle(org.eclipse.sirius.components.forms.List list) { ListStyle listStyle = list.getStyle(); assertThat(listStyle).isNotNull(); - assertThat(listStyle.getColor()).isEqualTo("lightBlue"); //$NON-NLS-1$ + assertThat(listStyle.getColor()).isEqualTo("lightBlue"); this.testFontStyle(listStyle); } private void testConditionalStyle(org.eclipse.sirius.components.forms.List list) { ListStyle listStyle = list.getStyle(); assertThat(listStyle).isNotNull(); - assertThat(listStyle.getColor()).isEqualTo("orange"); //$NON-NLS-1$ + assertThat(listStyle.getColor()).isEqualTo("orange"); this.testConditionalFontStyle(listStyle); } private void testConditionalStyle(MultiSelect multiSelect) { MultiSelectStyle multiSelectStyle = multiSelect.getStyle(); assertThat(multiSelectStyle).isNotNull(); - assertThat(multiSelectStyle.getBackgroundColor()).isEqualTo("#fbb800"); //$NON-NLS-1$ - assertThat(multiSelectStyle.getForegroundColor()).isEqualTo("#134cba"); //$NON-NLS-1$ + assertThat(multiSelectStyle.getBackgroundColor()).isEqualTo("#fbb800"); + assertThat(multiSelectStyle.getForegroundColor()).isEqualTo("#134cba"); this.testConditionalFontStyle(multiSelectStyle); } @@ -1182,16 +1182,16 @@ private void testNoStyle(MultiSelect multiSelect) { private void testStyle(Button button) { ButtonStyle buttonStyle = button.getStyle(); assertThat(buttonStyle).isNotNull(); - assertThat(buttonStyle.getBackgroundColor()).isEqualTo("#de1000"); //$NON-NLS-1$ - assertThat(buttonStyle.getForegroundColor()).isEqualTo("#777777"); //$NON-NLS-1$ + assertThat(buttonStyle.getBackgroundColor()).isEqualTo("#de1000"); + assertThat(buttonStyle.getForegroundColor()).isEqualTo("#777777"); this.testFontStyle(buttonStyle); } private void testConditionalStyle(Button button) { ButtonStyle buttonStyle = button.getStyle(); assertThat(buttonStyle).isNotNull(); - assertThat(buttonStyle.getBackgroundColor()).isEqualTo("#fbb800"); //$NON-NLS-1$ - assertThat(buttonStyle.getForegroundColor()).isEqualTo("#134cba"); //$NON-NLS-1$ + assertThat(buttonStyle.getBackgroundColor()).isEqualTo("#fbb800"); + assertThat(buttonStyle.getForegroundColor()).isEqualTo("#134cba"); this.testConditionalFontStyle(buttonStyle); } @@ -1218,20 +1218,20 @@ private void testConditionalFontStyle(AbstractFontStyle fontStyle) { private EPackage buildFixture() { EPackage fixture = EcoreFactory.eINSTANCE.createEPackage(); - fixture.setName("fixture"); //$NON-NLS-1$ + fixture.setName("fixture"); EClass eClass1 = EcoreFactory.eINSTANCE.createEClass(); - eClass1.setName("Class1"); //$NON-NLS-1$ + eClass1.setName("Class1"); eClass1.setAbstract(true); - eClass1.setInstanceClassName("Class1Instance"); //$NON-NLS-1$ + eClass1.setInstanceClassName("Class1Instance"); this.eClasses[0] = eClass1; fixture.getEClassifiers().add(eClass1); EClass eClass2 = EcoreFactory.eINSTANCE.createEClass(); - eClass2.setName("Class2"); //$NON-NLS-1$ + eClass2.setName("Class2"); this.eClasses[1] = eClass2; fixture.getEClassifiers().add(eClass2); EClass eClass3 = EcoreFactory.eINSTANCE.createEClass(); - eClass3.setName("Class3"); //$NON-NLS-1$ + eClass3.setName("Class3"); this.eClasses[2] = eClass3; fixture.getEClassifiers().add(eClass3); @@ -1258,13 +1258,13 @@ public String getId(Object object) { public Optional getObject(IEditingContext editingContext, String objectId) { Optional optional = Optional.empty(); switch (objectId) { - case "Class1": //$NON-NLS-1$ + case "Class1": optional = Optional.of(DynamicFormsTests.this.eClasses[0]); break; - case "Class2": //$NON-NLS-1$ + case "Class2": optional = Optional.of(DynamicFormsTests.this.eClasses[1]); break; - case "Class3": //$NON-NLS-1$ + case "Class3": optional = Optional.of(DynamicFormsTests.this.eClasses[2]); break; default: diff --git a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/ArrowStyle.java b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/ArrowStyle.java index 700af4957b..995b6fcd72 100644 --- a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/ArrowStyle.java +++ b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/ArrowStyle.java @@ -34,7 +34,7 @@ public enum ArrowStyle implements Enumerator { * @generated * @ordered */ - NONE(0, "None", "None"), //$NON-NLS-1$ //$NON-NLS-2$ + NONE(0, "None", "None"), /** * The 'Output Arrow' literal object. @@ -43,7 +43,7 @@ public enum ArrowStyle implements Enumerator { * @generated * @ordered */ - OUTPUT_ARROW(1, "OutputArrow", "OutputArrow"), //$NON-NLS-1$ //$NON-NLS-2$ + OUTPUT_ARROW(1, "OutputArrow", "OutputArrow"), /** * The 'Input Arrow' literal object. @@ -52,7 +52,7 @@ public enum ArrowStyle implements Enumerator { * @generated * @ordered */ - INPUT_ARROW(2, "InputArrow", "InputArrow"), //$NON-NLS-1$ //$NON-NLS-2$ + INPUT_ARROW(2, "InputArrow", "InputArrow"), /** * The 'Output Closed Arrow' literal object. @@ -61,7 +61,7 @@ public enum ArrowStyle implements Enumerator { * @generated * @ordered */ - OUTPUT_CLOSED_ARROW(3, "OutputClosedArrow", "OutputClosedArrow"), //$NON-NLS-1$ //$NON-NLS-2$ + OUTPUT_CLOSED_ARROW(3, "OutputClosedArrow", "OutputClosedArrow"), /** * The 'Input Closed Arrow' literal object. @@ -70,7 +70,7 @@ public enum ArrowStyle implements Enumerator { * @generated * @ordered */ - INPUT_CLOSED_ARROW(4, "InputClosedArrow", "InputClosedArrow"), //$NON-NLS-1$ //$NON-NLS-2$ + INPUT_CLOSED_ARROW(4, "InputClosedArrow", "InputClosedArrow"), /** * The 'Output Fill Closed Arrow' literal object. @@ -79,7 +79,7 @@ public enum ArrowStyle implements Enumerator { * @generated * @ordered */ - OUTPUT_FILL_CLOSED_ARROW(5, "OutputFillClosedArrow", "OutputFillClosedArrow"), //$NON-NLS-1$ //$NON-NLS-2$ + OUTPUT_FILL_CLOSED_ARROW(5, "OutputFillClosedArrow", "OutputFillClosedArrow"), /** * The 'Input Fill Closed Arrow' literal object. @@ -88,7 +88,7 @@ public enum ArrowStyle implements Enumerator { * @generated * @ordered */ - INPUT_FILL_CLOSED_ARROW(6, "InputFillClosedArrow", "InputFillClosedArrow"), //$NON-NLS-1$ //$NON-NLS-2$ + INPUT_FILL_CLOSED_ARROW(6, "InputFillClosedArrow", "InputFillClosedArrow"), /** * The 'Diamond' literal object. @@ -97,7 +97,7 @@ public enum ArrowStyle implements Enumerator { * @generated * @ordered */ - DIAMOND(7, "Diamond", "Diamond"), //$NON-NLS-1$ //$NON-NLS-2$ + DIAMOND(7, "Diamond", "Diamond"), /** * The 'Fill Diamond' literal object. @@ -106,7 +106,7 @@ public enum ArrowStyle implements Enumerator { * @generated * @ordered */ - FILL_DIAMOND(8, "FillDiamond", "FillDiamond"), //$NON-NLS-1$ //$NON-NLS-2$ + FILL_DIAMOND(8, "FillDiamond", "FillDiamond"), /** * The 'Input Arrow With Diamond' literal object. @@ -115,7 +115,7 @@ public enum ArrowStyle implements Enumerator { * @generated * @ordered */ - INPUT_ARROW_WITH_DIAMOND(9, "InputArrowWithDiamond", "InputArrowWithDiamond"), //$NON-NLS-1$ //$NON-NLS-2$ + INPUT_ARROW_WITH_DIAMOND(9, "InputArrowWithDiamond", "InputArrowWithDiamond"), /** * The 'Input Arrow With Fill Diamond' literal object. @@ -124,7 +124,7 @@ public enum ArrowStyle implements Enumerator { * @generated * @ordered */ - INPUT_ARROW_WITH_FILL_DIAMOND(10, "InputArrowWithFillDiamond", "InputArrowWithFillDiamond"), //$NON-NLS-1$ //$NON-NLS-2$ + INPUT_ARROW_WITH_FILL_DIAMOND(10, "InputArrowWithFillDiamond", "InputArrowWithFillDiamond"), /** * The 'Circle' literal object. * @@ -132,7 +132,7 @@ public enum ArrowStyle implements Enumerator { * @generated * @ordered */ - CIRCLE(11, "Circle", "Circle"), //$NON-NLS-1$ //$NON-NLS-2$ + CIRCLE(11, "Circle", "Circle"), /** * The 'Fill Circle' literal object. * @@ -140,7 +140,7 @@ public enum ArrowStyle implements Enumerator { * @generated * @ordered */ - FILL_CIRCLE(12, "FillCircle", "FillCircle"), //$NON-NLS-1$ //$NON-NLS-2$ + FILL_CIRCLE(12, "FillCircle", "FillCircle"), /** * The 'Crossed Circle' literal object. * @@ -148,7 +148,7 @@ public enum ArrowStyle implements Enumerator { * @generated * @ordered */ - CROSSED_CIRCLE(13, "CrossedCircle", "CrossedCircle"); //$NON-NLS-1$ //$NON-NLS-2$ + CROSSED_CIRCLE(13, "CrossedCircle", "CrossedCircle"); /** * The 'None' literal value. diff --git a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/FlexDirection.java b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/FlexDirection.java index 7e21b9a6ef..b9ad812d37 100644 --- a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/FlexDirection.java +++ b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/FlexDirection.java @@ -34,7 +34,7 @@ public enum FlexDirection implements Enumerator { * @generated * @ordered */ - ROW(0, "row", "row"), //$NON-NLS-1$ //$NON-NLS-2$ + ROW(0, "row", "row"), /** * The 'Row Reverse' literal object. @@ -43,7 +43,7 @@ public enum FlexDirection implements Enumerator { * @generated * @ordered */ - ROW_REVERSE(1, "rowReverse", "row-reverse"), //$NON-NLS-1$ //$NON-NLS-2$ + ROW_REVERSE(1, "rowReverse", "row-reverse"), /** * The 'Column' literal object. @@ -52,7 +52,7 @@ public enum FlexDirection implements Enumerator { * @generated * @ordered */ - COLUMN(2, "column", "column"), //$NON-NLS-1$ //$NON-NLS-2$ + COLUMN(2, "column", "column"), /** * The 'Column Reverse' literal object. @@ -61,7 +61,7 @@ public enum FlexDirection implements Enumerator { * @generated * @ordered */ - COLUMN_REVERSE(3, "columnReverse", "column-reverse"); //$NON-NLS-1$ //$NON-NLS-2$ + COLUMN_REVERSE(3, "columnReverse", "column-reverse"); /** * The 'Row' literal value. diff --git a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/GroupDisplayMode.java b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/GroupDisplayMode.java index e97595384c..f6aabf3c0b 100644 --- a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/GroupDisplayMode.java +++ b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/GroupDisplayMode.java @@ -34,7 +34,7 @@ public enum GroupDisplayMode implements Enumerator { * @generated * @ordered */ - LIST(0, "LIST", "LIST"), //$NON-NLS-1$ //$NON-NLS-2$ + LIST(0, "LIST", "LIST"), /** * The 'TOGGLEABLE AREAS' literal object. @@ -43,7 +43,7 @@ public enum GroupDisplayMode implements Enumerator { * @generated * @ordered */ - TOGGLEABLE_AREAS(1, "TOGGLEABLE_AREAS", "TOGGLEABLE_AREAS"); //$NON-NLS-1$ //$NON-NLS-2$ + TOGGLEABLE_AREAS(1, "TOGGLEABLE_AREAS", "TOGGLEABLE_AREAS"); /** * The 'LIST' literal value. diff --git a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/LayoutDirection.java b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/LayoutDirection.java index 1d54b04857..0c35518a6a 100644 --- a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/LayoutDirection.java +++ b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/LayoutDirection.java @@ -34,7 +34,7 @@ public enum LayoutDirection implements Enumerator { * @generated * @ordered */ - COLUMN(0, "Column", "Column"); //$NON-NLS-1$ //$NON-NLS-2$ + COLUMN(0, "Column", "Column"); /** * The 'Column' literal value. diff --git a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/LineStyle.java b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/LineStyle.java index d50c76eeed..4251b30fdc 100644 --- a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/LineStyle.java +++ b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/LineStyle.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -34,7 +34,7 @@ public enum LineStyle implements Enumerator { * @generated * @ordered */ - SOLID(0, "Solid", "Solid"), //$NON-NLS-1$ //$NON-NLS-2$ + SOLID(0, "Solid", "Solid"), /** * The 'Dash' literal object. @@ -43,7 +43,7 @@ public enum LineStyle implements Enumerator { * @generated * @ordered */ - DASH(1, "Dash", "Dash"), //$NON-NLS-1$ //$NON-NLS-2$ + DASH(1, "Dash", "Dash"), /** * The 'Dot' literal object. @@ -52,7 +52,7 @@ public enum LineStyle implements Enumerator { * @generated * @ordered */ - DOT(2, "Dot", "Dot"), //$NON-NLS-1$ //$NON-NLS-2$ + DOT(2, "Dot", "Dot"), /** * The 'Dash Dot' literal object. @@ -61,7 +61,7 @@ public enum LineStyle implements Enumerator { * @generated * @ordered */ - DASH_DOT(3, "Dash_Dot", "Dash_Dot"); //$NON-NLS-1$ //$NON-NLS-2$ + DASH_DOT(3, "Dash_Dot", "Dash_Dot"); /** * The 'Solid' literal value. diff --git a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/SynchronizationPolicy.java b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/SynchronizationPolicy.java index 8f23ecf1d6..798d07e33c 100644 --- a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/SynchronizationPolicy.java +++ b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/SynchronizationPolicy.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -34,7 +34,7 @@ public enum SynchronizationPolicy implements Enumerator { * @generated * @ordered */ - SYNCHRONIZED(0, "SYNCHRONIZED", "SYNCHRONIZED"), //$NON-NLS-1$ //$NON-NLS-2$ + SYNCHRONIZED(0, "SYNCHRONIZED", "SYNCHRONIZED"), /** * The 'UNSYNCHRONIZED' literal object. @@ -43,7 +43,7 @@ public enum SynchronizationPolicy implements Enumerator { * @generated * @ordered */ - UNSYNCHRONIZED(1, "UNSYNCHRONIZED", "UNSYNCHRONIZED"); //$NON-NLS-1$ //$NON-NLS-2$ + UNSYNCHRONIZED(1, "UNSYNCHRONIZED", "UNSYNCHRONIZED"); /** * The 'SYNCHRONIZED' literal value. diff --git a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/ViewPackage.java b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/ViewPackage.java index 1dd042a4d8..374db35820 100644 --- a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/ViewPackage.java +++ b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/ViewPackage.java @@ -40,21 +40,21 @@ public interface ViewPackage extends EPackage { * * @generated */ - String eNAME = "view"; //$NON-NLS-1$ + String eNAME = "view"; /** * The package namespace URI. * * @generated */ - String eNS_URI = "http://www.eclipse.org/sirius-web/view"; //$NON-NLS-1$ + String eNS_URI = "http://www.eclipse.org/sirius-web/view"; /** * The package namespace name. * * @generated */ - String eNS_PREFIX = "view"; //$NON-NLS-1$ + String eNS_PREFIX = "view"; /** * The singleton instance of the package. diff --git a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/BarChartDescriptionImpl.java b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/BarChartDescriptionImpl.java index 4e2562870d..506a70c343 100644 --- a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/BarChartDescriptionImpl.java +++ b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/BarChartDescriptionImpl.java @@ -513,15 +513,15 @@ public String toString() { return super.toString(); StringBuilder result = new StringBuilder(super.toString()); - result.append(" (valuesExpression: "); //$NON-NLS-1$ + result.append(" (valuesExpression: "); result.append(this.valuesExpression); - result.append(", keysExpression: "); //$NON-NLS-1$ + result.append(", keysExpression: "); result.append(this.keysExpression); - result.append(", yAxisLabelExpression: "); //$NON-NLS-1$ + result.append(", yAxisLabelExpression: "); result.append(this.yAxisLabelExpression); - result.append(", width: "); //$NON-NLS-1$ + result.append(", width: "); result.append(this.width); - result.append(", height: "); //$NON-NLS-1$ + result.append(", height: "); result.append(this.height); result.append(')'); return result.toString(); diff --git a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/BarChartDescriptionStyleImpl.java b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/BarChartDescriptionStyleImpl.java index 2317a3adc1..dbe3a1a8f3 100644 --- a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/BarChartDescriptionStyleImpl.java +++ b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/BarChartDescriptionStyleImpl.java @@ -487,17 +487,17 @@ public String toString() { return super.toString(); StringBuilder result = new StringBuilder(super.toString()); - result.append(" (fontSize: "); //$NON-NLS-1$ + result.append(" (fontSize: "); result.append(this.fontSize); - result.append(", italic: "); //$NON-NLS-1$ + result.append(", italic: "); result.append(this.italic); - result.append(", bold: "); //$NON-NLS-1$ + result.append(", bold: "); result.append(this.bold); - result.append(", underline: "); //$NON-NLS-1$ + result.append(", underline: "); result.append(this.underline); - result.append(", strikeThrough: "); //$NON-NLS-1$ + result.append(", strikeThrough: "); result.append(this.strikeThrough); - result.append(", barsColor: "); //$NON-NLS-1$ + result.append(", barsColor: "); result.append(this.barsColor); result.append(')'); return result.toString(); diff --git a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/ButtonDescriptionImpl.java b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/ButtonDescriptionImpl.java index ee44504b5b..bbd85b3078 100644 --- a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/ButtonDescriptionImpl.java +++ b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/ButtonDescriptionImpl.java @@ -387,9 +387,9 @@ public String toString() { return super.toString(); StringBuilder result = new StringBuilder(super.toString()); - result.append(" (buttonLabelExpression: "); //$NON-NLS-1$ + result.append(" (buttonLabelExpression: "); result.append(this.buttonLabelExpression); - result.append(", imageExpression: "); //$NON-NLS-1$ + result.append(", imageExpression: "); result.append(this.imageExpression); result.append(')'); return result.toString(); diff --git a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/ButtonDescriptionStyleImpl.java b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/ButtonDescriptionStyleImpl.java index d13a8295c3..7e475cf9f1 100644 --- a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/ButtonDescriptionStyleImpl.java +++ b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/ButtonDescriptionStyleImpl.java @@ -542,19 +542,19 @@ public String toString() { return super.toString(); StringBuilder result = new StringBuilder(super.toString()); - result.append(" (fontSize: "); //$NON-NLS-1$ + result.append(" (fontSize: "); result.append(this.fontSize); - result.append(", italic: "); //$NON-NLS-1$ + result.append(", italic: "); result.append(this.italic); - result.append(", bold: "); //$NON-NLS-1$ + result.append(", bold: "); result.append(this.bold); - result.append(", underline: "); //$NON-NLS-1$ + result.append(", underline: "); result.append(this.underline); - result.append(", strikeThrough: "); //$NON-NLS-1$ + result.append(", strikeThrough: "); result.append(this.strikeThrough); - result.append(", backgroundColor: "); //$NON-NLS-1$ + result.append(", backgroundColor: "); result.append(this.backgroundColor); - result.append(", foregroundColor: "); //$NON-NLS-1$ + result.append(", foregroundColor: "); result.append(this.foregroundColor); result.append(')'); return result.toString(); diff --git a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/ChangeContextImpl.java b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/ChangeContextImpl.java index 63bc904924..9cdce43845 100644 --- a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/ChangeContextImpl.java +++ b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/ChangeContextImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -38,7 +38,7 @@ public class ChangeContextImpl extends OperationImpl implements ChangeContext { * @generated * @ordered */ - protected static final String EXPRESSION_EDEFAULT = "aql:self"; //$NON-NLS-1$ + protected static final String EXPRESSION_EDEFAULT = "aql:self"; /** * The cached value of the '{@link #getExpression() Expression}' attribute. @@ -270,11 +270,11 @@ public String toString() { return super.toString(); StringBuilder result = new StringBuilder(super.toString()); - result.append(" (typeName: "); //$NON-NLS-1$ + result.append(" (typeName: "); result.append(this.typeName); - result.append(", referenceName: "); //$NON-NLS-1$ + result.append(", referenceName: "); result.append(this.referenceName); - result.append(", variableName: "); //$NON-NLS-1$ + result.append(", variableName: "); result.append(this.variableName); result.append(')'); return result.toString(); diff --git a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/CreateViewImpl.java b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/CreateViewImpl.java index 0aeb82977b..eeb989a93c 100644 --- a/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/CreateViewImpl.java +++ b/packages/view/backend/sirius-components-view/src/main/java/org/eclipse/sirius/components/view/impl/CreateViewImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 Obeo. + * Copyright (c) 2021, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -46,7 +46,7 @@ public class CreateViewImpl extends OperationImpl implements CreateView { * @generated * @ordered */ - protected static final String PARENT_VIEW_EXPRESSION_EDEFAULT = "aql:selectedNode"; //$NON-NLS-1$ + protected static final String PARENT_VIEW_EXPRESSION_EDEFAULT = "aql:selectedNode"; /** * The cached value of the '{@link #getParentViewExpression() Parent View Expression}' attribute.