diff options
362 files changed, 16181 insertions, 13847 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF index 19e614f0f07..e279eaf7e0e 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF @@ -31,7 +31,7 @@ Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)";visibility:=reexport, +Require-Bundle: org.eclipse.ui.navigator;visibility:=reexport;bundle-version="[3.6.0,4.0.0)", org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0)", org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)", org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)", @@ -41,10 +41,10 @@ Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)";visibili org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)", org.eclipse.papyrus.uml.service.types;bundle-version="[4.0.0,5.0.0)", org.eclipse.papyrus.uml.appearance;bundle-version="[2.0.0,3.0.0)", - org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, - org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, - org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport, - org.eclipse.emf.validation;bundle-version="[1.8.0,2.0.0)";visibility:=reexport, + org.eclipse.emf.ecore;visibility:=reexport;bundle-version="[2.12.0,3.0.0)", + org.eclipse.emf.ecore;visibility:=reexport;bundle-version="[2.12.0,3.0.0)", + org.eclipse.emf.ecore.edit;visibility:=reexport;bundle-version="[2.9.0,3.0.0)", + org.eclipse.emf.validation;visibility:=reexport;bundle-version="[1.8.0,2.0.0)", org.eclipse.papyrus.infra.gmfdiag.hyperlink;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.uml.internationalization.utils;bundle-version="[1.0.0,2.0.0)", org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)", @@ -69,8 +69,8 @@ Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)";visibili org.eclipse.gmf.runtime.diagram.ui.properties, org.eclipse.gmf.runtime.diagram.ui.providers, org.eclipse.gmf.runtime.diagram.ui.resources.editor, - org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)";visibility:=reexport, - org.eclipse.uml2.uml.edit;bundle-version="[5.3.0,6.0.0)";visibility:=reexport, + org.eclipse.uml2.uml;visibility:=reexport;bundle-version="[5.3.0,6.0.0)", + org.eclipse.uml2.uml.edit;visibility:=reexport;bundle-version="[5.3.0,6.0.0)", org.eclipse.gmf.runtime.draw2d.ui;visibility:=reexport, org.eclipse.gef, org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors;bundle-version="[1.0.0,2.0.0)", @@ -79,7 +79,7 @@ Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)";visibili org.eclipse.papyrus.infra.architecture;bundle-version="[2.0.0,3.0.0)" Bundle-Vendor: %providerName Eclipse-LazyStart: true -Bundle-Version: 3.0.200.qualifier +Bundle-Version: 3.1.0.qualifier Bundle-Activator: org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin Bundle-ManifestVersion: 2 Bundle-Description: %pluginDescription diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/UmlClassDiagramForMultiEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/UmlClassDiagramForMultiEditor.java index f787c4dcfaa..606fbdc66d0 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/UmlClassDiagramForMultiEditor.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/UmlClassDiagramForMultiEditor.java @@ -44,7 +44,7 @@ public class UmlClassDiagramForMultiEditor extends org.eclipse.papyrus.uml.diagr /** * The location of diagram icon in the plug-in */ - private static final String DIAG_IMG_PATH = "icons/obj16/Diagram_Class.gif"; //$NON-NLS-1$ + private static final String DIAG_IMG_PATH = "icons/obj16/Diagram_Class.gif"; //$NON-NLS-1$ /** * The image descriptor of the diagram icon diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/AbstractCustomCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/AbstractCustomCommand.java index 5ea9e210a9e..00aee0c3a50 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/AbstractCustomCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/AbstractCustomCommand.java @@ -51,7 +51,7 @@ public abstract class AbstractCustomCommand extends AbstractTransactionalCommand } } - List<IFile> result = new ArrayList<IFile>(); + List<IFile> result = new ArrayList<>(); List<?> affectedFiles = super.getAffectedFiles(); for (Object affectedFile : affectedFiles) { result.add((IFile) affectedFile); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/AssociationBranchDeletion.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/AssociationBranchDeletion.java index 8066db76e18..e2c8eb0e5e2 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/AssociationBranchDeletion.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/AssociationBranchDeletion.java @@ -35,12 +35,12 @@ import org.eclipse.gmf.runtime.notation.View; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.papyrus.infra.gmfdiag.common.adapter.SemanticAdapter; import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils; import org.eclipse.papyrus.infra.services.edit.service.IElementEditService; import org.eclipse.papyrus.uml.diagram.clazz.custom.helper.MultiAssociationHelper; import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPart; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; -import org.eclipse.papyrus.infra.gmfdiag.common.adapter.SemanticAdapter; import org.eclipse.ui.IObjectActionDelegate; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.uml2.uml.Association; @@ -95,8 +95,8 @@ public class AssociationBranchDeletion implements IObjectActionDelegate { // 5. Graphical creation of the binary dependency // 5.1 calculus of the future source and target of the binary // dependency - List<EditPart> sourceList = new ArrayList<EditPart>(); - List<EditPart> targetList = new ArrayList<EditPart>(); + List<EditPart> sourceList = new ArrayList<>(); + List<EditPart> targetList = new ArrayList<>(); for (Object editPart : associationNodeEditPart.getSourceConnections()) { sourceList.add((EditPart) editPart); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/AssociationClassViewCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/AssociationClassViewCreateCommand.java index 2a6e154350b..2fca36b5729 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/AssociationClassViewCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/AssociationClassViewCreateCommand.java @@ -98,8 +98,7 @@ public class AssociationClassViewCreateCommand extends AbstractCustomCommand { // UMLElementTypes.AssociationClass_2013).getSemanticHint(), -1, // true, preferenceHint); // put to the good position - if (getNode() instanceof Node) - { + if (getNode() instanceof Node) { ((Bounds) ((Node) getNode()).getLayoutConstraint()).setX(location.x); ((Bounds) ((Node) getNode()).getLayoutConstraint()).setY(location.y); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/AssociationDiamonViewCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/AssociationDiamonViewCreateCommand.java index 7e788d58e3d..eb95d1f6516 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/AssociationDiamonViewCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/AssociationDiamonViewCreateCommand.java @@ -29,8 +29,8 @@ import org.eclipse.gmf.runtime.notation.Location; import org.eclipse.gmf.runtime.notation.Node; import org.eclipse.gmf.runtime.notation.NotationFactory; import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLViewProvider; import org.eclipse.papyrus.infra.gmfdiag.common.adapter.SemanticAdapter; +import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLViewProvider; /** * Custom class to create the associationClass node @@ -94,8 +94,7 @@ public class AssociationDiamonViewCreateCommand extends AbstractCustomCommand { Location notationLocation = NotationFactory.eINSTANCE.createLocation(); notationLocation.setX(location.x); notationLocation.setY(location.y); - if (getNode() instanceof Node) - { + if (getNode() instanceof Node) { ((Node) getNode()).setLayoutConstraint(notationLocation); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/CustomCreateContainmentLinkCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/CustomCreateContainmentLinkCommand.java index 6fc78f8b3c0..e1388149c91 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/CustomCreateContainmentLinkCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/CustomCreateContainmentLinkCommand.java @@ -53,7 +53,7 @@ public class CustomCreateContainmentLinkCommand extends CommonDeferredCreateConn public CustomCreateContainmentLinkCommand(TransactionalEditingDomain editingDomain, EObject element, IAdaptable sourceViewAdapter, IAdaptable targetViewAdapter, EditPartViewer viewer, PreferencesHint preferencesHint, ICommand command) { super(editingDomain, element, sourceViewAdapter, targetViewAdapter, viewer, preferencesHint, command); sourceView = null; - targetView = (View) targetViewAdapter.getAdapter(View.class); + targetView = targetViewAdapter.getAdapter(View.class); } /** @@ -63,7 +63,7 @@ public class CustomCreateContainmentLinkCommand extends CommonDeferredCreateConn ConnectionViewDescriptor viewDescriptor, ICommand command) { super(editingDomain, semanticHint, sourceCircleViewAdapter, targetViewAdapter, viewer, preferencesHint, viewDescriptor, command); sourceView = source; - targetView = (View) targetViewAdapter.getAdapter(View.class); + targetView = targetViewAdapter.getAdapter(View.class); } @Override @@ -104,8 +104,8 @@ public class CustomCreateContainmentLinkCommand extends CommonDeferredCreateConn if (sourceContainmentCircleEP == null) { return null; } - View targetView = (View) targetViewAdapter.getAdapter(View.class); - View sourceView = (View) sourceContainmentCircleEP.getParent().getAdapter(View.class); + View targetView = targetViewAdapter.getAdapter(View.class); + View sourceView = sourceContainmentCircleEP.getParent().getAdapter(View.class); PackageableElement targetElement = (PackageableElement) targetView.getElement(); PackageableElement sourceElement = (PackageableElement) sourceView.getElement(); EditPart sourceEP = sourceContainmentCircleEP.getParent(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/DefferedAppliedStereotypeToDisplayCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/DefferedAppliedStereotypeToDisplayCommand.java index ad32d19ceb3..384045036e5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/DefferedAppliedStereotypeToDisplayCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/DefferedAppliedStereotypeToDisplayCommand.java @@ -33,10 +33,10 @@ import org.eclipse.uml2.uml.Stereotype; /** * The Class DefferedAppliedStereotypeToDisplayCommand used to set the list of applied stereotype to * display - * + * * @deprecated The Display of stereotype is now treated with notation View (Bug 455311) * use the command into oep.uml.diagram.common.stereotype.display.command instead - * + * */ @Deprecated public class DefferedAppliedStereotypeToDisplayCommand extends CreateEAnnotationCommand { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/DependencyBranchDeletion.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/DependencyBranchDeletion.java index 92c1435349c..ca1a6fc50ca 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/DependencyBranchDeletion.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/DependencyBranchDeletion.java @@ -35,9 +35,9 @@ import org.eclipse.gmf.runtime.notation.View; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.papyrus.infra.gmfdiag.common.adapter.SemanticAdapter; import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; -import org.eclipse.papyrus.infra.gmfdiag.common.adapter.SemanticAdapter; import org.eclipse.ui.IObjectActionDelegate; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.uml2.uml.Dependency; @@ -71,7 +71,7 @@ public class DependencyBranchDeletion implements IObjectActionDelegate { GraphicalEditPart branchSource = (GraphicalEditPart) selectedElement.getSource(); GraphicalEditPart branchtarget = (GraphicalEditPart) selectedElement.getTarget(); EStructuralFeature feature = null; - List<NamedElement> newValue = new ArrayList<NamedElement>(); + List<NamedElement> newValue = new ArrayList<>(); if (branchSource.resolveSemanticElement() instanceof Dependency) { // target is the supplier of the dependency dependency = (Dependency) branchSource.resolveSemanticElement(); @@ -101,8 +101,8 @@ public class DependencyBranchDeletion implements IObjectActionDelegate { // 5. Graphical creation of the binary dependency // 5.1 calculus of the furture source and taget of the binary // dependency - List<EditPart> sourceList = new ArrayList<EditPart>(); - List<EditPart> targetList = new ArrayList<EditPart>(); + List<EditPart> sourceList = new ArrayList<>(); + List<EditPart> targetList = new ArrayList<>(); for (Object editPart : dependencyNodeEditPart.getSourceConnections()) { sourceList.add((EditPart) editPart); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/DependencyDiamonViewCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/DependencyDiamonViewCreateCommand.java index 97dfa69c08f..9dd721bf608 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/DependencyDiamonViewCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/DependencyDiamonViewCreateCommand.java @@ -29,8 +29,8 @@ import org.eclipse.gmf.runtime.notation.Location; import org.eclipse.gmf.runtime.notation.Node; import org.eclipse.gmf.runtime.notation.NotationFactory; import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLViewProvider; import org.eclipse.papyrus.infra.gmfdiag.common.adapter.SemanticAdapter; +import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLViewProvider; /** * Custom class to create the associationClass node @@ -93,8 +93,7 @@ public class DependencyDiamonViewCreateCommand extends AbstractCustomCommand { Location notationLocation = NotationFactory.eINSTANCE.createLocation(); notationLocation.setX(location.x); notationLocation.setY(location.y); - if (getNode() instanceof Node) - { + if (getNode() instanceof Node) { ((Node) getNode()).setLayoutConstraint(notationLocation); semanticApdater.setView(getNode()); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/PropertyCommandForAssociation.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/PropertyCommandForAssociation.java index 7302552bc56..9ec8c563852 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/PropertyCommandForAssociation.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/command/PropertyCommandForAssociation.java @@ -50,6 +50,7 @@ public class PropertyCommandForAssociation extends CreateElementCommand { /** * {@inheritDoc} */ + @Override protected EObject doDefaultElementCreation() { Property newElement = UMLFactory.eINSTANCE.createProperty(); Association owner = (Association) getElementToEdit(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/commands/InitializeDiagramCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/commands/InitializeDiagramCommand.java index 32256989518..54371f886a1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/commands/InitializeDiagramCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/commands/InitializeDiagramCommand.java @@ -77,7 +77,7 @@ public class InitializeDiagramCommand extends AbstractTransactionalCommand { protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { // To load visualIDRegistry host().refresh(); - List<Object> createdViews = new LinkedList<Object>(); + List<Object> createdViews = new LinkedList<>(); createdViews.addAll(populateSemanticNodes()); if (createdViews.size() > 0) { RestoreRelatedLinksCommand restoreRelatedLinksCommand = new RestoreRelatedLinksCommand(((DiagramEditPart) getHost()), createdViews); @@ -217,7 +217,7 @@ public class InitializeDiagramCommand extends AbstractTransactionalCommand { } protected List<ViewDescriptor> populateSemanticNodes() { - List<ViewDescriptor> descriptors = new ArrayList<ViewDescriptor>(); + List<ViewDescriptor> descriptors = new ArrayList<>(); View viewObject = (View) getHost().getModel(); EObject container = getDiagram().getElement(); if (container instanceof Package) { @@ -253,7 +253,7 @@ public class InitializeDiagramCommand extends AbstractTransactionalCommand { } private List<Object> prepareAdapterList(List<Object> createdViews) { - List<Object> viewAdapters = new ArrayList<Object>(); + List<Object> viewAdapters = new ArrayList<>(); viewAdapters.add(host()); ListIterator<Object> li = createdViews.listIterator(); while (li.hasNext()) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/commands/RestoreRelatedLinksCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/commands/RestoreRelatedLinksCommand.java index b918f0337c5..17ca4491a2a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/commands/RestoreRelatedLinksCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/commands/RestoreRelatedLinksCommand.java @@ -115,7 +115,7 @@ public class RestoreRelatedLinksCommand extends AbstractTransactionalCommand { * @return linkdescriptors */ protected Collection<? extends UMLLinkDescriptor> collectPartRelatedLinks(View view, Map<EObject, View> domain2NotationMap) { - Collection<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + Collection<UMLLinkDescriptor> result = new LinkedList<>(); if (!domain2NotationMap.containsKey(view.getElement())) { // We must prevent duplicate descriptors List<?> outgoingDescriptors = CustomUMLDiagramUpdater.INSTANCE.getOutgoingLinks(view); @@ -171,7 +171,7 @@ public class RestoreRelatedLinksCommand extends AbstractTransactionalCommand { for (Object object : adapters) { if (object instanceof IAdaptable) { IAdaptable ad = (IAdaptable) object; - View view = (View) ad.getAdapter(View.class); + View view = ad.getAdapter(View.class); if (view != null) { refreshRelatedLinks(view); } @@ -208,7 +208,7 @@ public class RestoreRelatedLinksCommand extends AbstractTransactionalCommand { // Collect all related link from semantic model Collection<? extends UMLLinkDescriptor> linkDescriptors = collectPartRelatedLinks(notationView, domain2NotationMap); // Collect all related link from graphical model - Collection<Edge> existingLinks = new LinkedList<Edge>(); + Collection<Edge> existingLinks = new LinkedList<>(); for (Object edge : notationView.getTargetEdges()) { if (edge instanceof Edge && false == existingLinks.contains(edge)) { existingLinks.add((Edge) edge); @@ -225,7 +225,7 @@ public class RestoreRelatedLinksCommand extends AbstractTransactionalCommand { for (Iterator<Edge> linksIterator = existingLinks.iterator(); linksIterator.hasNext();) { Edge nextDiagramLink = linksIterator.next(); String diagramLinkVisualID = UMLVisualIDRegistry.getVisualID(nextDiagramLink); - if (diagramLinkVisualID == null || diagramLinkVisualID.isEmpty() ) { + if (diagramLinkVisualID == null || diagramLinkVisualID.isEmpty()) { if (nextDiagramLink.getSource() != null && nextDiagramLink.getTarget() != null) { linksIterator.remove(); } @@ -298,7 +298,7 @@ public class RestoreRelatedLinksCommand extends AbstractTransactionalCommand { * @param graphicalEditPart */ protected void refreshRelatedLinks(View notationView) { - Map<EObject, View> domain2NotationMap = new HashMap<EObject, View>(); + Map<EObject, View> domain2NotationMap = new HashMap<>(); // Create related links Collection<? extends UMLLinkDescriptor> linkDescriptors = getLinkDescriptorToProcess(notationView, domain2NotationMap); createRelatedLinks(linkDescriptors, domain2NotationMap); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/AbstractAssociationBranchEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/AbstractAssociationBranchEditPart.java index 8c09ed513d1..6f7093245b4 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/AbstractAssociationBranchEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/AbstractAssociationBranchEditPart.java @@ -31,7 +31,7 @@ import org.eclipse.uml2.uml.Property; public abstract class AbstractAssociationBranchEditPart extends ConnectionEditPart { /** - * + * */ private static final String ASSOCIATION_END_LISTENERS_TARGET = "AssociationEndListenersTarget"; //$NON-NLS-1$ @@ -56,7 +56,7 @@ public abstract class AbstractAssociationBranchEditPart extends ConnectionEditPa if (resolveSemanticElement() instanceof Association) { Property targetEnd = MultiAssociationHelper.getPropertyToListen(((Edge) getModel()), (Association) resolveSemanticElement()); if (targetEnd != null) { - addListenerFilter(ASSOCIATION_END_LISTENERS_TARGET, this, targetEnd); + addListenerFilter(ASSOCIATION_END_LISTENERS_TARGET, this, targetEnd); } } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CSourceISLinkLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CSourceISLinkLabelEditPart.java index 691aae0d357..dce6a9d4c3f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CSourceISLinkLabelEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CSourceISLinkLabelEditPart.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2015 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -22,7 +22,7 @@ import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SourceISLinkLabelEditPar /** * Custom Edit Part for {@link SourceISLinkLabelEditPart}. - * + * * @author Gabriel Pascual * */ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CTargetISLinkLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CTargetISLinkLabelEditPart.java index 0ed4c52b512..d7d5c695d20 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CTargetISLinkLabelEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CTargetISLinkLabelEditPart.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2015 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -22,7 +22,7 @@ import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TargetISLinkLabelEditPar /** * Custom Edit Part for {@link TargetISLinkLabelEditPart}. - * + * * @author Gabriel Pascual * */ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CustomConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CustomConstraintEditPartCN.java index bea222a3276..abc705965d6 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CustomConstraintEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CustomConstraintEditPartCN.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 CEA LIST and others. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -10,7 +10,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part; @@ -22,6 +22,7 @@ import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; /** * Custom variant. Provides elementType for @see AbstractConstraintEditPart + * * @since 3.0 */ public class CustomConstraintEditPartCN extends ConstraintEditPartCN { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CustomDurationObservationStereotypeLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CustomDurationObservationStereotypeLabelEditPart.java index 1c8a5866718..06d47c2d4aa 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CustomDurationObservationStereotypeLabelEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CustomDurationObservationStereotypeLabelEditPart.java @@ -40,7 +40,7 @@ public class CustomDurationObservationStereotypeLabelEditPart extends DurationOb /** * Redefine the refresh label to get the STEREOTYPE_LABEL_POLICY if exist and don't recalculate the text. - * + * * @see org.eclipse.papyrus.uml.diagram.composite.edit.parts.PortAppliedStereotypeEditPart#refreshLabel() */ @Override diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CustomInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CustomInterfaceEditPart.java index a12709b7e06..4a9bf14d999 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CustomInterfaceEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CustomInterfaceEditPart.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2017 CEA LIST and others. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -10,7 +10,7 @@ * * Contributors: * Yupanqui MUNOZ JULHO (CEA LIST) yupanqui.munozjulho@cea.fr - Bug 514518 - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part; @@ -22,7 +22,8 @@ import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPart; /** * The custom edit policy for the interface edit part. - * @since 3.0 + * + * @since 3.0 */ public class CustomInterfaceEditPart extends InterfaceEditPart { @@ -34,7 +35,7 @@ public class CustomInterfaceEditPart extends InterfaceEditPart { public CustomInterfaceEditPart(View view) { super(view); } - + /** * @see org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPart#createDefaultEditPolicies() * diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CustomTimeObservationStereotypeLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CustomTimeObservationStereotypeLabelEditPart.java index 80069f94b0f..25b770844bb 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CustomTimeObservationStereotypeLabelEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CustomTimeObservationStereotypeLabelEditPart.java @@ -40,7 +40,7 @@ public class CustomTimeObservationStereotypeLabelEditPart extends TimeObservatio /** * Redefine the refresh label to get the STEREOTYPE_LABEL_POLICY if exist and don't recalculate the text. - * + * * @see org.eclipse.papyrus.uml.diagram.composite.edit.parts.PortAppliedStereotypeEditPart#refreshLabel() */ @Override diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CustomUMLDiagramUpdater.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CustomUMLDiagramUpdater.java index 9a5862a3349..821d041c070 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CustomUMLDiagramUpdater.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CustomUMLDiagramUpdater.java @@ -46,7 +46,7 @@ public class CustomUMLDiagramUpdater extends UMLDiagramUpdater { @Override protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Association_Edge(Package container) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { EObject linkObject = (EObject) links.next(); if (false == linkObject instanceof Association) { @@ -115,7 +115,7 @@ public class CustomUMLDiagramUpdater extends UMLDiagramUpdater { if (container == null) { return Collections.emptyList(); } - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { EObject linkObject = (EObject) links.next(); if (false == linkObject instanceof Association) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/figure/ContainmentDecoration.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/figure/ContainmentDecoration.java index 5ab1006bd04..770c256ba78 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/figure/ContainmentDecoration.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/figure/ContainmentDecoration.java @@ -46,8 +46,7 @@ public class ContainmentDecoration extends Ellipse implements RotatableDecoratio /** * Constructor */ - public ContainmentDecoration() - { + public ContainmentDecoration() { location = new Point(); transform = new Transform(); } @@ -55,10 +54,9 @@ public class ContainmentDecoration extends Ellipse implements RotatableDecoratio /** * @see org.eclipse.draw2d.Figure#getBounds() */ - public Rectangle getBounds() - { - if (bounds == null) - { + @Override + public Rectangle getBounds() { + if (bounds == null) { updatePoints(); bounds = new Rectangle(location, new Dimension(0, 0)); @@ -80,14 +78,13 @@ public class ContainmentDecoration extends Ellipse implements RotatableDecoratio /** * Set the sacle of the Oval. By default, the oval has a size of 10 per 10 : * that is a circle ! - * + * * @param x * the x-scale value * @param y * the y-scale value */ - public void setScale(double x, double y) - { + public void setScale(double x, double y) { ovalCenter = null; ovalSize = null; bounds = null; @@ -99,8 +96,8 @@ public class ContainmentDecoration extends Ellipse implements RotatableDecoratio /** * @see org.eclipse.draw2d.Figure#setLocation(org.eclipse.draw2d.geometry.Point) */ - public void setLocation(Point p) - { + @Override + public void setLocation(Point p) { ovalCenter = null; ovalSize = null; bounds = null; @@ -112,8 +109,8 @@ public class ContainmentDecoration extends Ellipse implements RotatableDecoratio /** * @see org.eclipse.draw2d.RotatableDecoration#setReferencePoint(org.eclipse.draw2d.geometry.Point) */ - public void setReferencePoint(Point p) - { + @Override + public void setReferencePoint(Point p) { ovalCenter = null; ovalSize = null; bounds = null; @@ -125,12 +122,11 @@ public class ContainmentDecoration extends Ellipse implements RotatableDecoratio /** * Set the rotation parameter - * + * * @param angle * set the angle of the oval */ - public void setRotation(double angle) - { + public void setRotation(double angle) { ovalCenter = null; ovalSize = null; bounds = null; @@ -140,14 +136,11 @@ public class ContainmentDecoration extends Ellipse implements RotatableDecoratio /** * Update the points of the Circle */ - protected void updatePoints() - { - if (ovalSize == null) - { + protected void updatePoints() { + if (ovalSize == null) { ovalSize = new Dimension((int) xScale * radius * 2, (int) yScale * radius * 2); } - if (ovalCenter == null) - { + if (ovalCenter == null) { ovalCenter = new Point(transform.getTransformed(new Point((int) -xScale * radius, 0))); } @@ -156,8 +149,8 @@ public class ContainmentDecoration extends Ellipse implements RotatableDecoratio /** * @see org.eclipse.draw2d.Figure#paintFigure(org.eclipse.draw2d.Graphics) */ - public void paintFigure(Graphics graphics) - { + @Override + public void paintFigure(Graphics graphics) { updatePoints(); graphics.pushState(); @@ -172,8 +165,8 @@ public class ContainmentDecoration extends Ellipse implements RotatableDecoratio /** * @see org.eclipse.draw2d.Figure#paintBorder(org.eclipse.draw2d.Graphics) */ - protected void paintBorder(Graphics graphics) - { + @Override + protected void paintBorder(Graphics graphics) { updatePoints(); graphics.pushState(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/figure/ContainmentFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/figure/ContainmentFigure.java index 8886df53fa1..0de290f39ed 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/figure/ContainmentFigure.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/figure/ContainmentFigure.java @@ -26,8 +26,8 @@ public class ContainmentFigure extends RoundedCompartmentFigure { super.paint(graphics); graphics.pushState(); // Draw the cross. - int x = (int) (bounds.width / 2); - int y = (int) (bounds.height / (2)); + int x = bounds.width / 2; + int y = bounds.height / (2); graphics.drawLine(bounds.getCenter().translate(x, 0), bounds.getCenter().translate(-x, 0)); graphics.drawLine(bounds.getCenter().translate(0, -y), bounds.getCenter().translate(0, y)); graphics.popState(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/figure/LiteralEnumerationFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/figure/LiteralEnumerationFigure.java index 7f0cb5b33e2..e5634afbf4b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/figure/LiteralEnumerationFigure.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/figure/LiteralEnumerationFigure.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2016, 2018 CEA LIST and others. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -10,7 +10,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.clazz.custom.figure; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/figure/ReceptionFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/figure/ReceptionFigure.java index b40f7a2ddd1..6dd292d6f51 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/figure/ReceptionFigure.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/figure/ReceptionFigure.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2016 CEA LIST and others. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -10,7 +10,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.clazz.custom.figure; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/figure/TemplateParameterFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/figure/TemplateParameterFigure.java index 55a151fe4e2..40f1c2470de 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/figure/TemplateParameterFigure.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/figure/TemplateParameterFigure.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2016 CEA LIST and others. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -10,7 +10,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.clazz.custom.figure; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/figure/nodes/InformationItemFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/figure/nodes/InformationItemFigure.java index 9657d03a90b..9fe1416f05f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/figure/nodes/InformationItemFigure.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/figure/nodes/InformationItemFigure.java @@ -22,6 +22,7 @@ import org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigu /** * Figure for Composite representation of InformationItem. + * * @since 3.0 */ public class InformationItemFigure extends RoundedCompartmentFigure { @@ -30,7 +31,7 @@ public class InformationItemFigure extends RoundedCompartmentFigure { private static String TAG_LABEL = "Information"; //$NON-NLS-1$ /** The List of Compartment */ - private final static List<String> NO_COMPARTMENT = new ArrayList<String>(); + private final static List<String> NO_COMPARTMENT = new ArrayList<>(); /** * Creates a new InformationItemFigure. diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/AbstractAssociationEndEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/AbstractAssociationEndEditPart.java index 491facb553b..c102715fca9 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/AbstractAssociationEndEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/AbstractAssociationEndEditPart.java @@ -32,11 +32,11 @@ import org.eclipse.uml2.uml.Property; public abstract class AbstractAssociationEndEditPart extends LabelEditPart { /** - * + * */ private static final String ASSOCIATION_END_LISTENERS_TARGET = "AssociationEndListenersTarget"; //$NON-NLS-1$ /** - * + * */ private static final String ASSOCIATION_END_LISTENERS_SOURCE = "AssociationEndListenersSource";//$NON-NLS-1$ @@ -60,8 +60,8 @@ public abstract class AbstractAssociationEndEditPart extends LabelEditPart { protected void addAssociationEndListeners() { EObject sourceEnd = ((Association) resolveSemanticElement()).getMemberEnds().get(0); EObject targetEnd = ((Association) resolveSemanticElement()).getMemberEnds().get(1); - addListenerFilter(ASSOCIATION_END_LISTENERS_SOURCE, this, sourceEnd); - addListenerFilter(ASSOCIATION_END_LISTENERS_TARGET, this, targetEnd); + addListenerFilter(ASSOCIATION_END_LISTENERS_SOURCE, this, sourceEnd); + addListenerFilter(ASSOCIATION_END_LISTENERS_TARGET, this, targetEnd); addListenerFilter("AssociationEndListenersSourceMultUpper", this, ((Property) sourceEnd).getUpperValue()); //$NON-NLS-1$ addListenerFilter("AssociationEndListenersTargetMultUpper", this, ((Property) targetEnd).getUpperValue()); //$NON-NLS-1$ addListenerFilter("AssociationEndListenersSourceMultLower", this, ((Property) sourceEnd).getLowerValue()); //$NON-NLS-1$ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/AssociationClassHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/AssociationClassHelper.java index 776e939aeee..209ac037fe2 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/AssociationClassHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/AssociationClassHelper.java @@ -162,8 +162,10 @@ public class AssociationClassHelper extends ElementHelper { cc.compose(associationcClassLinkCommand); // creation of the dashedLine ConnectionViewDescriptor dashedLineViewDescriptor = new ConnectionViewDescriptor(UMLElementTypes.AssociationClass_TetherEdge, ((IHintedType) UMLElementTypes.AssociationClass_TetherEdge).getSemanticHint(), diagramPreferencesHint); - CustomDeferredCreateConnectionViewCommand dashedLineCmd = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.AssociationClass_TetherEdge).getSemanticHint(), ((IAdaptable) associationcClassLinkCommand.getCommandResult() - .getReturnValue()), ((IAdaptable) associationClassNodeCreationCommand.getCommandResult().getReturnValue()), viewer, diagramPreferencesHint, dashedLineViewDescriptor, null); + CustomDeferredCreateConnectionViewCommand dashedLineCmd = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.AssociationClass_TetherEdge).getSemanticHint(), + ((IAdaptable) associationcClassLinkCommand.getCommandResult() + .getReturnValue()), + ((IAdaptable) associationClassNodeCreationCommand.getCommandResult().getReturnValue()), viewer, diagramPreferencesHint, dashedLineViewDescriptor, null); dashedLineCmd.setElement(associationClass); cc.compose(dashedLineCmd); return new ICommandProxy(cc); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/ClassLinkMappingHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/ClassLinkMappingHelper.java index 436ca01a9b1..2b26d13a92c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/ClassLinkMappingHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/ClassLinkMappingHelper.java @@ -76,7 +76,7 @@ public class ClassLinkMappingHelper implements ILinkMappingHelper { @Override public java.util.Collection<?> caseElementImport(org.eclipse.uml2.uml.ElementImport object) { - List<Namespace> result = new ArrayList<Namespace>(); + List<Namespace> result = new ArrayList<>(); result.add(object.getImportingNamespace()); return result; }; @@ -88,21 +88,21 @@ public class ClassLinkMappingHelper implements ILinkMappingHelper { @Override public java.util.Collection<?> caseInterfaceRealization(org.eclipse.uml2.uml.InterfaceRealization object) { - List<BehavioredClassifier> result = new ArrayList<BehavioredClassifier>(); + List<BehavioredClassifier> result = new ArrayList<>(); result.add(object.getImplementingClassifier()); return result; }; @Override public java.util.Collection<?> caseProfileApplication(org.eclipse.uml2.uml.ProfileApplication object) { - List<org.eclipse.uml2.uml.Package> result = new ArrayList<org.eclipse.uml2.uml.Package>(); + List<org.eclipse.uml2.uml.Package> result = new ArrayList<>(); result.add(object.getApplyingPackage()); return result; }; @Override public java.util.Collection<?> caseTemplateBinding(org.eclipse.uml2.uml.TemplateBinding object) { - List<org.eclipse.uml2.uml.TemplateableElement> result = new ArrayList<org.eclipse.uml2.uml.TemplateableElement>(); + List<org.eclipse.uml2.uml.TemplateableElement> result = new ArrayList<>(); result.add(object.getBoundElement()); return result; }; @@ -123,7 +123,7 @@ public class ClassLinkMappingHelper implements ILinkMappingHelper { @Override public java.util.Collection<PackageableElement> caseElementImport(org.eclipse.uml2.uml.ElementImport object) { - List<org.eclipse.uml2.uml.PackageableElement> result = new ArrayList<org.eclipse.uml2.uml.PackageableElement>(); + List<org.eclipse.uml2.uml.PackageableElement> result = new ArrayList<>(); result.add(object.getImportedElement()); return result; }; @@ -135,21 +135,21 @@ public class ClassLinkMappingHelper implements ILinkMappingHelper { @Override public java.util.Collection<Interface> caseInterfaceRealization(org.eclipse.uml2.uml.InterfaceRealization object) { - List<org.eclipse.uml2.uml.Interface> result = new ArrayList<org.eclipse.uml2.uml.Interface>(); + List<org.eclipse.uml2.uml.Interface> result = new ArrayList<>(); result.add(object.getContract()); return result; }; @Override public java.util.Collection<Profile> caseProfileApplication(org.eclipse.uml2.uml.ProfileApplication object) { - List<org.eclipse.uml2.uml.Profile> result = new ArrayList<org.eclipse.uml2.uml.Profile>(); + List<org.eclipse.uml2.uml.Profile> result = new ArrayList<>(); result.add(object.getAppliedProfile()); return result; }; @Override public java.util.Collection<Element> caseTemplateBinding(org.eclipse.uml2.uml.TemplateBinding object) { - List<org.eclipse.uml2.uml.Element> result = new ArrayList<org.eclipse.uml2.uml.Element>(); + List<org.eclipse.uml2.uml.Element> result = new ArrayList<>(); result.add(object.getSignature().getOwner()); return result; }; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/InstanceSpecificationLinkHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/InstanceSpecificationLinkHelper.java index fb3466d37f9..361d098cd1b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/InstanceSpecificationLinkHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/InstanceSpecificationLinkHelper.java @@ -33,7 +33,7 @@ public class InstanceSpecificationLinkHelper { * if this is not an instance link : the size of the array list is 0 */ public static List<InstanceSpecification> getEnds(InstanceSpecification instance) { - List<InstanceSpecification> array = new ArrayList<InstanceSpecification>(); + List<InstanceSpecification> array = new ArrayList<>(); EAnnotation endtypes = instance.getEAnnotation(INSTANCE_END); if (endtypes != null) { assert (endtypes.getReferences().size() == 2); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/MultiAssociationHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/MultiAssociationHelper.java index 7eb9e173c83..9f4816b50f9 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/MultiAssociationHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/MultiAssociationHelper.java @@ -53,6 +53,7 @@ import org.eclipse.gmf.runtime.notation.Edge; import org.eclipse.gmf.runtime.notation.Node; import org.eclipse.gmf.runtime.notation.NotationFactory; import org.eclipse.gmf.runtime.notation.View; +import org.eclipse.papyrus.infra.gmfdiag.common.adapter.SemanticAdapter; import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils; import org.eclipse.papyrus.infra.services.edit.service.IElementEditService; import org.eclipse.papyrus.uml.diagram.clazz.custom.command.AssociationDiamonViewCreateCommand; @@ -63,7 +64,6 @@ import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchEditPar import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationNodeEditPart; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; import org.eclipse.papyrus.uml.diagram.common.commands.DeleteLinkDuringCreationCommand; -import org.eclipse.papyrus.infra.gmfdiag.common.adapter.SemanticAdapter; import org.eclipse.papyrus.uml.diagram.common.helper.AssociationEndSourceLabelHelper; import org.eclipse.papyrus.uml.diagram.common.helper.AssociationEndTargetLabelHelper; import org.eclipse.uml2.uml.Association; @@ -110,7 +110,7 @@ public class MultiAssociationHelper extends org.eclipse.papyrus.uml.diagram.comm @SuppressWarnings("unchecked") public static void createSemanticBranchStyles(View view) { org.eclipse.gmf.runtime.notation.EObjectValueStyle semanticbranchStyle = NotationFactory.eINSTANCE.createEObjectValueStyle(); - semanticbranchStyle.setName(MultiAssociationHelper.SEMANTIC_BRANCH); + semanticbranchStyle.setName(org.eclipse.papyrus.uml.diagram.common.helper.MultiAssociationHelper.SEMANTIC_BRANCH); view.getStyles().add(semanticbranchStyle); } @@ -137,7 +137,7 @@ public class MultiAssociationHelper extends org.eclipse.papyrus.uml.diagram.comm Command command = new CompoundCommand(); // 0. Obtain list of property to display Association association = (Association) associationNodeEditPart.resolveSemanticElement(); - List<Property> endToDisplay = new ArrayList<Property>(association.getMemberEnds()); + List<Property> endToDisplay = new ArrayList<>(association.getMemberEnds()); // 1. remove in the list all displayedElement. Iterator<?> iter = associationNodeEditPart.getSourceConnections().iterator(); while (iter.hasNext()) { @@ -158,10 +158,9 @@ public class MultiAssociationHelper extends org.eclipse.papyrus.uml.diagram.comm Property currentEnd = iteratorProp.next(); // look for if an editpart exist for this element Collection<?> values = associationNodeEditPart.getViewer().getEditPartRegistry().values(); - Collection<EditPart> editPartSet = new ArrayList<EditPart>(); + Collection<EditPart> editPartSet = new ArrayList<>(); for (Object object : values) { - if (object instanceof EditPart) - { + if (object instanceof EditPart) { editPartSet.add((EditPart) object); } } @@ -206,7 +205,7 @@ public class MultiAssociationHelper extends org.eclipse.papyrus.uml.diagram.comm public Command dropMutliAssociation(Association association, EditPartViewer viewer, PreferencesHint diagramPreferencesHint, Point location, View containerView) { Command command = new CompoundCommand(); // 0. Obtain list of property to display - List<Property> endToDisplay = new ArrayList<Property>(association.getMemberEnds()); + List<Property> endToDisplay = new ArrayList<>(association.getMemberEnds()); // 1. creatiuon of the diamon of association AssociationDiamonViewCreateCommand nodeCreation = new AssociationDiamonViewCreateCommand(getEditingDomain(), containerView, viewer, diagramPreferencesHint, location, new SemanticAdapter(association, null)); ((CompoundCommand) command).add(new ICommandProxy(nodeCreation)); @@ -222,7 +221,7 @@ public class MultiAssociationHelper extends org.eclipse.papyrus.uml.diagram.comm Property currentEnd = iteratorProp.next(); // look for if an editpart exist for this element Collection<?> values = viewer.getEditPartRegistry().values(); - Collection<EditPart> editPartSet = new ArrayList<EditPart>(); + Collection<EditPart> editPartSet = new ArrayList<>(); for (Object object : values) { editPartSet.add((EditPart) object); } @@ -350,7 +349,7 @@ public class MultiAssociationHelper extends org.eclipse.papyrus.uml.diagram.comm // System.err.println("+-> parentView:" + parentView); // --------------------------------------------------------- // 8 Ensure that all member ends belong to the association - List<Property> ownedProperty = new ArrayList<Property>(); + List<Property> ownedProperty = new ArrayList<>(); ownedProperty.addAll(association.getMemberEnds()); IElementEditService provider = ElementEditServiceUtils.getCommandProvider(association); if (provider != null) { @@ -386,7 +385,8 @@ public class MultiAssociationHelper extends org.eclipse.papyrus.uml.diagram.comm ((CompoundCommand) command).add(new ICommandProxy(nodeCreation)); // 4. reconstruction of the old link by taking in account the old // connection - ConnectionViewDescriptor viewDescriptor = new ConnectionViewDescriptor(UMLElementTypes.Association_BranchEdge, ((IHintedType) UMLElementTypes.Association_BranchEdge).getSemanticHint(), ((IGraphicalEditPart) sourceEditPart).getDiagramPreferencesHint()); + ConnectionViewDescriptor viewDescriptor = new ConnectionViewDescriptor(UMLElementTypes.Association_BranchEdge, ((IHintedType) UMLElementTypes.Association_BranchEdge).getSemanticHint(), + ((IGraphicalEditPart) sourceEditPart).getDiagramPreferencesHint()); // 5. reconstruction of the first branch between old source to node ICommand firstBranchCommand = new GraphicalAssociationBranchViewCommand(getEditingDomain(), (IAdaptable) nodeCreation.getCommandResult().getReturnValue(), new SemanticAdapter(null, associationViewSource), sourceEditPart.getViewer(), ((IGraphicalEditPart) sourceEditPart).getDiagramPreferencesHint(), viewDescriptor, sourceEnd); @@ -407,7 +407,8 @@ public class MultiAssociationHelper extends org.eclipse.papyrus.uml.diagram.comm // third branch node and target thirdBranchCommand = new GraphicalAssociationBranchViewCommand(getEditingDomain(), (IAdaptable) nodeCreation.getCommandResult().getReturnValue(), new SemanticAdapter(null, targetEditPart.getModel()), sourceEditPart.getViewer(), ((IGraphicalEditPart) sourceEditPart).getDiagramPreferencesHint(), viewDescriptor, request); - // thirdBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType)UMLElementTypes.Association_BrachEdge).getSemanticHint(), (IAdaptable)nodeCreation.getCommandResult().getReturnValue(), new SemanticAdapter(null, + // thirdBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType)UMLElementTypes.Association_BrachEdge).getSemanticHint(), (IAdaptable)nodeCreation.getCommandResult().getReturnValue(), new + // SemanticAdapter(null, // targetEditPart.getModel()), sourceEditPart.getViewer(), ((IGraphicalEditPart)sourceEditPart).getDiagramPreferencesHint(), viewDescriptor, null); } else { // third branch source and node @@ -461,10 +462,12 @@ public class MultiAssociationHelper extends org.eclipse.papyrus.uml.diagram.comm ((CompoundCommand) command).add(new ICommandProxy(propertyCreateCommand)); // System.err.println("0. add semantic, can execute?" + command.canExecute()); // 1. add the branch graphically - ConnectionViewDescriptor viewDescriptor = new ConnectionViewDescriptor(UMLElementTypes.Association_BranchEdge, ((IHintedType) UMLElementTypes.Association_BranchEdge).getSemanticHint(), ((IGraphicalEditPart) sourceEditPart).getDiagramPreferencesHint()); + ConnectionViewDescriptor viewDescriptor = new ConnectionViewDescriptor(UMLElementTypes.Association_BranchEdge, ((IHintedType) UMLElementTypes.Association_BranchEdge).getSemanticHint(), + ((IGraphicalEditPart) sourceEditPart).getDiagramPreferencesHint()); GraphicalAssociationBranchViewCommand aBranchCommand = new GraphicalAssociationBranchViewCommand(getEditingDomain(), new SemanticAdapter(null, sourceEditPart.getModel()), new SemanticAdapter(null, targetEditPart.getModel()), sourceEditPart.getViewer(), ((IGraphicalEditPart) sourceEditPart).getDiagramPreferencesHint(), viewDescriptor, request); - // CustomDeferredCreateConnectionViewCommand aBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType)UMLElementTypes.Association_BrachEdge).getSemanticHint(), new SemanticAdapter(null, sourceEditPart.getModel()), + // CustomDeferredCreateConnectionViewCommand aBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType)UMLElementTypes.Association_BrachEdge).getSemanticHint(), new SemanticAdapter(null, + // sourceEditPart.getModel()), // new SemanticAdapter(null, targetEditPart.getModel()), sourceEditPart.getViewer(), ((IGraphicalEditPart)sourceEditPart).getDiagramPreferencesHint(), viewDescriptor, null); aBranchCommand.setElement(association); ((CompoundCommand) command).add(new ICommandProxy(aBranchCommand)); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/MultiDependencyHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/MultiDependencyHelper.java index 77477847741..5f24f2de5ea 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/MultiDependencyHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/MultiDependencyHelper.java @@ -51,13 +51,13 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest; import org.eclipse.gmf.runtime.notation.Edge; import org.eclipse.gmf.runtime.notation.Node; import org.eclipse.gmf.runtime.notation.View; +import org.eclipse.papyrus.infra.gmfdiag.common.adapter.SemanticAdapter; import org.eclipse.papyrus.uml.diagram.clazz.custom.command.CustomDeferredCreateConnectionViewCommand; import org.eclipse.papyrus.uml.diagram.clazz.custom.command.DependencyDiamonViewCreateCommand; import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyBranchEditPart; import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyNodeEditPart; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; import org.eclipse.papyrus.uml.diagram.common.commands.DeleteLinkDuringCreationCommand; -import org.eclipse.papyrus.infra.gmfdiag.common.adapter.SemanticAdapter; import org.eclipse.papyrus.uml.diagram.common.helper.Element2IAdaptableRegistryHelper; import org.eclipse.papyrus.uml.diagram.common.helper.ElementHelper; import org.eclipse.uml2.uml.Dependency; @@ -103,7 +103,7 @@ public class MultiDependencyHelper extends ElementHelper { NamedElement currentEnd = iteratorProp.next(); // look for if an editpart exist for this element Collection<?> values = viewer.getEditPartRegistry().values(); - Collection<EditPart> editPartSet = new ArrayList<EditPart>(); + Collection<EditPart> editPartSet = new ArrayList<>(); for (Object object : values) { editPartSet.add((EditPart) object); } @@ -170,8 +170,8 @@ public class MultiDependencyHelper extends ElementHelper { public Command dropMutliDependency(Dependency dependency, EditPartViewer viewer, PreferencesHint diagramPreferencesHint, Point location, View containerView) { CompoundCommand command = new CompoundCommand(); // 0. Obtain list of property to display - List<NamedElement> endToDisplaySource = new ArrayList<NamedElement>(dependency.getClients()); - List<NamedElement> endToDisplayTarget = new ArrayList<NamedElement>(dependency.getSuppliers()); + List<NamedElement> endToDisplaySource = new ArrayList<>(dependency.getClients()); + List<NamedElement> endToDisplayTarget = new ArrayList<>(dependency.getSuppliers()); // 1. creation of the diamond of the Dependency DependencyDiamonViewCreateCommand nodeCreation = new DependencyDiamonViewCreateCommand(getEditingDomain(), containerView, viewer, diagramPreferencesHint, location, new SemanticAdapter(dependency, null)); command.add(new ICommandProxy(nodeCreation)); @@ -360,23 +360,28 @@ public class MultiDependencyHelper extends ElementHelper { // --------------------------------------------------------- // 4. reconstruction of the old link by taking in account the old // connection - ConnectionViewDescriptor viewDescriptor = new ConnectionViewDescriptor(UMLElementTypes.Dependency_BranchEdge, ((IHintedType) UMLElementTypes.Dependency_BranchEdge).getSemanticHint(), ((IGraphicalEditPart) sourceEditPart).getDiagramPreferencesHint()); + ConnectionViewDescriptor viewDescriptor = new ConnectionViewDescriptor(UMLElementTypes.Dependency_BranchEdge, ((IHintedType) UMLElementTypes.Dependency_BranchEdge).getSemanticHint(), + ((IGraphicalEditPart) sourceEditPart).getDiagramPreferencesHint()); // 5. reconstruction of the first branch between old source to node ICommand firstBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Dependency_BranchEdge).getSemanticHint(), new SemanticAdapter(null, dependencyViewSource), (IAdaptable) nodeCreation .getCommandResult().getReturnValue(), sourceEditPart.getViewer(), ((IGraphicalEditPart) sourceEditPart).getDiagramPreferencesHint(), viewDescriptor, null); ((CustomDeferredCreateConnectionViewCommand) firstBranchCommand).setElement(dependency); ((CompoundCommand) command).add(new ICommandProxy(firstBranchCommand)); // 6. reconstruction of the second branch between node to old target - ICommand secondBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Dependency_BranchEdge).getSemanticHint(), (IAdaptable) nodeCreation.getCommandResult().getReturnValue(), new SemanticAdapter( - null, dependencyViewTarget), sourceEditPart.getViewer(), ((IGraphicalEditPart) sourceEditPart).getDiagramPreferencesHint(), viewDescriptor, null); + ICommand secondBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Dependency_BranchEdge).getSemanticHint(), (IAdaptable) nodeCreation.getCommandResult().getReturnValue(), + new SemanticAdapter( + null, dependencyViewTarget), + sourceEditPart.getViewer(), ((IGraphicalEditPart) sourceEditPart).getDiagramPreferencesHint(), viewDescriptor, null); ((CustomDeferredCreateConnectionViewCommand) secondBranchCommand).setElement(dependency); ((CompoundCommand) command).add(new ICommandProxy(secondBranchCommand)); // 7. Create of the third branch between node and target our source. ICommand thirdBranchCommand = null; if (dependencyView.equals((sourceEditPart.getModel()))) { // third branch node and target - thirdBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Dependency_BranchEdge).getSemanticHint(), (IAdaptable) nodeCreation.getCommandResult().getReturnValue(), new SemanticAdapter(null, - targetEditPart.getModel()), sourceEditPart.getViewer(), ((IGraphicalEditPart) sourceEditPart).getDiagramPreferencesHint(), viewDescriptor, null); + thirdBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Dependency_BranchEdge).getSemanticHint(), (IAdaptable) nodeCreation.getCommandResult().getReturnValue(), + new SemanticAdapter(null, + targetEditPart.getModel()), + sourceEditPart.getViewer(), ((IGraphicalEditPart) sourceEditPart).getDiagramPreferencesHint(), viewDescriptor, null); } else { // // third branch source and node thirdBranchCommand = new CustomDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType) UMLElementTypes.Dependency_BranchEdge).getSemanticHint(), new SemanticAdapter(null, sourceEditPart.getModel()), (IAdaptable) nodeCreation diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/NestedStereotypeLabelHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/NestedStereotypeLabelHelper.java index c0b5cd12c09..a0e57675161 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/NestedStereotypeLabelHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/NestedStereotypeLabelHelper.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2016 CEA LIST and others. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -11,7 +11,7 @@ * Contributors: * CEA LIST - Initial API and implementation * Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905 - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.clazz.custom.helper; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/advice/EnumerationHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/advice/EnumerationHelperAdvice.java index 7ea79b8d394..199bf67d397 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/advice/EnumerationHelperAdvice.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/advice/EnumerationHelperAdvice.java @@ -70,7 +70,7 @@ public class EnumerationHelperAdvice extends AbstractEditHelperAdvice { if (null != elementsToMove) { // After compare - Set<View> viewsToDestroy = new HashSet<View>(); + Set<View> viewsToDestroy = new HashSet<>(); Iterator<EObject> it = elementsToMove.iterator(); @@ -103,7 +103,7 @@ public class EnumerationHelperAdvice extends AbstractEditHelperAdvice { protected ICommand getAfterMoveCommand(final MoveRequest request) { ICommand moveCommand = super.getAfterMoveCommand(request); - Set<View> viewsToDestroy = new HashSet<View>(); + Set<View> viewsToDestroy = new HashSet<>(); Object parameter = request.getParameter(RequestParameterConstants.TYPE_MOVING); @@ -135,7 +135,7 @@ public class EnumerationHelperAdvice extends AbstractEditHelperAdvice { * @return the list of {@link View} to delete */ protected Set<View> getMemberViewsToDestroy(final EObject object) { - Set<View> viewsToDestroy = new HashSet<View>(); + Set<View> viewsToDestroy = new HashSet<>(); // Find Views in Class Diagram that are referencing current member Iterator<View> viewIt = CrossReferencerUtil.getCrossReferencingViews(object, ModelEditPart.MODEL_ID).iterator(); while (viewIt.hasNext()) { @@ -156,14 +156,14 @@ public class EnumerationHelperAdvice extends AbstractEditHelperAdvice { } /** - * + * * @param listOne * @param listTwo * @return */ protected List<EObject> substractLists(final List<EObject> listOne, final List<EObject> listTwo) { - List<EObject> sourceList = new ArrayList<EObject>(listOne); - List<EObject> destinationList = new ArrayList<EObject>(listTwo); + List<EObject> sourceList = new ArrayList<>(listOne); + List<EObject> destinationList = new ArrayList<>(listTwo); sourceList.removeAll(listTwo); destinationList.removeAll(listOne); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/advice/GeneralizationHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/advice/GeneralizationHelperAdvice.java index c0c9a13d4f7..5759b10469c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/advice/GeneralizationHelperAdvice.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/helper/advice/GeneralizationHelperAdvice.java @@ -44,7 +44,7 @@ public class GeneralizationHelperAdvice extends AbstractEditHelperAdvice { @Override protected ICommand getBeforeReorientRelationshipCommand(ReorientRelationshipRequest request) { // The list of member views becoming inconsistent after re-orient that should be deleted. - Set<View> viewsToDestroy = new HashSet<View>(); + Set<View> viewsToDestroy = new HashSet<>(); if (request.getRelationship() instanceof Generalization) { viewsToDestroy.addAll(getMemberViewsToDestroy((Generalization) request.getRelationship())); } @@ -61,7 +61,7 @@ public class GeneralizationHelperAdvice extends AbstractEditHelperAdvice { @Override protected ICommand getBeforeDestroyDependentsCommand(DestroyDependentsRequest request) { EObject destructee = request.getElementToDestroy(); - Set<View> viewsToDestroy = new HashSet<View>(); + Set<View> viewsToDestroy = new HashSet<>(); if (destructee instanceof Generalization) { viewsToDestroy = getMemberViewsToDestroy((Generalization) destructee); } @@ -81,7 +81,7 @@ public class GeneralizationHelperAdvice extends AbstractEditHelperAdvice { * @return the list of {@link View} to delete */ protected Set<View> getMemberViewsToDestroy(Generalization generalization) { - Set<View> viewsToDestroy = new HashSet<View>(); + Set<View> viewsToDestroy = new HashSet<>(); Classifier general = generalization.getGeneral(); if (general != null) { // Parse members diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/hyperlink/InnerClassHyperlinkContributor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/hyperlink/InnerClassHyperlinkContributor.java index 91b1c7fac63..da9d80a2ed7 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/hyperlink/InnerClassHyperlinkContributor.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/hyperlink/InnerClassHyperlinkContributor.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2015 CEA LIST and others. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -10,7 +10,7 @@ * * Contributors: * Shuai Li (CEA LIST) <shuai.li@cea.fr> - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.clazz.custom.hyperlink; @@ -36,7 +36,7 @@ import org.eclipse.uml2.uml.Element; /** * Returns a list of HyperLinkSpecificObjects (view elements) referencing * inner classes of the class - * + * * @author Shuai Li * @since 3.0 * @@ -49,19 +49,20 @@ public class InnerClassHyperlinkContributor implements HyperlinkContributor { * @param fromElement * @return */ + @Override public List<HyperLinkObject> getHyperlinks(Object fromElement) { - ArrayList<HyperLinkObject> hyperlinks = new ArrayList<HyperLinkObject>(); - + ArrayList<HyperLinkObject> hyperlinks = new ArrayList<>(); + if (fromElement instanceof org.eclipse.uml2.uml.Class) { List<Element> elements = ((org.eclipse.uml2.uml.Class) fromElement).getOwnedElements(); - List<org.eclipse.uml2.uml.Class> classes = new LinkedList<org.eclipse.uml2.uml.Class>(); + List<org.eclipse.uml2.uml.Class> classes = new LinkedList<>(); for (Element element : elements) { if ("Class".equals(element.eClass().getName())) { classes.add((org.eclipse.uml2.uml.Class) element); } } - List<Object> objectsInViews = new ArrayList<Object>(); - + List<Object> objectsInViews = new ArrayList<>(); + for (org.eclipse.uml2.uml.Class clazz : classes) { ViewerSearchService viewerSearchService = null; try { @@ -84,15 +85,15 @@ public class InnerClassHyperlinkContributor implements HyperlinkContributor { } } } - + if (viewerSearchService != null) { List<Object> viewerSearchResults = viewerSearchService.getViewersInCurrentModel(clazz, (org.eclipse.uml2.uml.Class) fromElement, false, false); objectsInViews.addAll(viewerSearchResults); } } - + for (Object object : objectsInViews) { - if (object instanceof View && ((View) object).getDiagram()!= null) { + if (object instanceof View && ((View) object).getDiagram() != null) { if (((View) object).getDiagram().getType().equals(ModelEditPart.MODEL_ID)) { HyperLinkSpecificObject hyperlink = new HyperLinkSpecificObject((EObject) object); hyperlinks.add(hyperlink); @@ -100,7 +101,7 @@ public class InnerClassHyperlinkContributor implements HyperlinkContributor { } } } - + return hyperlinks; } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/hyperlink/NestedPackageHyperlinkContributor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/hyperlink/NestedPackageHyperlinkContributor.java index 75787854941..a35780d0bad 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/hyperlink/NestedPackageHyperlinkContributor.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/hyperlink/NestedPackageHyperlinkContributor.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2015, 2016 CEA LIST, Christian W. Damus, and others. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -11,7 +11,7 @@ * Contributors: * Shuai Li (CEA LIST) <shuai.li@cea.fr> - Initial API and implementation * Christian W. Damus - bug 485220 - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.clazz.custom.hyperlink; @@ -39,7 +39,7 @@ import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart; /** * Returns a list of HyperLinkEditor objects referencing views directly owned by * the nested packages of the double-clicked package. - * + * * @author Shuai Li * @since 3.0 * @@ -54,11 +54,11 @@ public class NestedPackageHyperlinkContributor implements HyperlinkContributor { */ @Override public List<HyperLinkObject> getHyperlinks(Object fromElement) { - ArrayList<HyperLinkObject> hyperlinks = new ArrayList<HyperLinkObject>(); + ArrayList<HyperLinkObject> hyperlinks = new ArrayList<>(); if (fromElement instanceof org.eclipse.uml2.uml.Package) { List<org.eclipse.uml2.uml.Package> nestedPackages = ((org.eclipse.uml2.uml.Package) fromElement).getNestedPackages(); - List<Object> pages = new ArrayList<Object>(); + List<Object> pages = new ArrayList<>(); for (org.eclipse.uml2.uml.Package nestedPackage : nestedPackages) { ViewerSearchService viewerSearchService = null; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/hyperlink/NestingPackageHyperlinkContributor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/hyperlink/NestingPackageHyperlinkContributor.java index 7bce6b9458b..a6f47860a08 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/hyperlink/NestingPackageHyperlinkContributor.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/hyperlink/NestingPackageHyperlinkContributor.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2015, 2016 CEA LIST, Christian W. Damus, and others. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -11,7 +11,7 @@ * Contributors: * Shuai Li (CEA LIST) <shuai.li@cea.fr> - Initial API and implementation * Christian W. Damus - bug 485220 - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.clazz.custom.hyperlink; @@ -39,7 +39,7 @@ import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart; /** * Returns a list of HyperLinkEditor objects referencing views directly owned by * the nesting package of the double-clicked package. - * + * * @author Shuai Li * @since 3.0 * @@ -54,11 +54,11 @@ public class NestingPackageHyperlinkContributor implements HyperlinkContributor */ @Override public List<HyperLinkObject> getHyperlinks(Object fromElement) { - ArrayList<HyperLinkObject> hyperlinks = new ArrayList<HyperLinkObject>(); + ArrayList<HyperLinkObject> hyperlinks = new ArrayList<>(); if (fromElement instanceof org.eclipse.uml2.uml.Package) { org.eclipse.uml2.uml.Package nestingPackage = ((org.eclipse.uml2.uml.Package) fromElement).getNestingPackage(); - List<Object> pages = new ArrayList<Object>(); + List<Object> pages = new ArrayList<>(); if (nestingPackage != null) { ViewerSearchService viewerSearchService = null; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/locator/ContainmentCircleOnPackageLocator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/locator/ContainmentCircleOnPackageLocator.java index dcc7a35acd1..56b203ac1be 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/locator/ContainmentCircleOnPackageLocator.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/locator/ContainmentCircleOnPackageLocator.java @@ -25,9 +25,10 @@ import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageNodePlateFigure /** * The Class ContainmentCircleOnPackageLocator. + * * @since 3.0 */ -@Deprecated //Unused: PortPositionLocator used instead +@Deprecated // Unused: PortPositionLocator used instead public class ContainmentCircleOnPackageLocator extends BorderItemLocator { /** The Constant DEFAULT_BORDER_ITEM_OFFSET. */ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/migration/ClassReconcilerForCompartment_1_2_0.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/migration/ClassReconcilerForCompartment_1_2_0.java index dab6f3e5e0b..c85f0f97cfb 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/migration/ClassReconcilerForCompartment_1_2_0.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/migration/ClassReconcilerForCompartment_1_2_0.java @@ -21,6 +21,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.ReconcilerForCompartm /** * Diagram Reconciler for compartment from 1.1.0 to 1.2.0 + * * @since 3.0 */ public class ClassReconcilerForCompartment_1_2_0 extends ReconcilerForCompartment { @@ -66,7 +67,7 @@ public class ClassReconcilerForCompartment_1_2_0 extends ReconcilerForCompartmen private static final String PackagePackageableElementCompartmentEditPartCN_VISUAL_ID = "7010"; //$NON-NLS-1$ private static final String EnumerationEnumerationLiteralCompartmentEditPartCN_VISUAL_ID = "7031"; //$NON-NLS-1$ private static final String InstanceSpecificationSlotCompartmentEditPartCN_VISUAL_ID = "7035"; //$NON-NLS-1$ - + /** The compartments visual id. */ private List<String> compartmentsVisualID = Arrays.asList( ClassAttributeCompartmentEditPart_VISUAL_ID, diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/migration/ClassReconciler_1_1_0.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/migration/ClassReconciler_1_1_0.java index 8c650888c2a..9043b646f60 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/migration/ClassReconciler_1_1_0.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/migration/ClassReconciler_1_1_0.java @@ -36,6 +36,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler; /** * Class Diagram Reconciler from 1.0.0 to 1.1.0 + * * @since 3.0 */ public class ClassReconciler_1_1_0 extends DiagramReconciler { @@ -104,7 +105,7 @@ public class ClassReconciler_1_1_0 extends DiagramReconciler { * @return the floating label map */ private Map<String, String> getFloatingLabelMap() { - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put(ClassEditPart_VISUAL_ID, ClassFloatingNameEditPart_VISUAL_ID); map.put(AssociationClassEditPart_VISUAL_ID, AssociationClassFloatingNameEditPart_VISUAL_ID); map.put(AssociationNodeEditPart_VISUAL_ID, AssociationFloatingNameEditPart_VISUAL_ID); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/migration/ClassReconciler_1_2_0.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/migration/ClassReconciler_1_2_0.java index f50335e1bdf..66ee934beb9 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/migration/ClassReconciler_1_2_0.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/migration/ClassReconciler_1_2_0.java @@ -87,8 +87,8 @@ public class ClassReconciler_1_2_0 extends DiagramReconciler { public static String getNewVisualID(String oldVisualID) { switch (oldVisualID) { - case "1000": //$NON-NLS-1$ //$NON-NLS-1$ - return "Package_ClassDiagram"; //$NON-NLS-1$ //$NON-NLS-1$ + case "1000": //$NON-NLS-1$ + return "Package_ClassDiagram"; //$NON-NLS-1$ case "3012": //$NON-NLS-1$ return "Property_ClassAttributeLabel"; //$NON-NLS-1$ case "3002": //$NON-NLS-1$ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/CustomMessageFormatParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/CustomMessageFormatParser.java index a195dc5a931..b6b82caa9b9 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/CustomMessageFormatParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/CustomMessageFormatParser.java @@ -96,7 +96,7 @@ public class CustomMessageFormatParser extends MessageFormatParser { * @return the associated element */ protected IAdaptable obtainObject(IAdaptable adapter) { - EObject element = (EObject) adapter.getAdapter(EObject.class); + EObject element = adapter.getAdapter(EObject.class); Object result = element.eGet(eRefFeature); // this is a collection if (result instanceof List<?>) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/EndMemberKind.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/EndMemberKind.java index 80dad69f53f..d735ff71ec6 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/EndMemberKind.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/EndMemberKind.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2015 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/GeneralizationSetConstraintParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/GeneralizationSetConstraintParser.java index 7ac3dd90721..0903f163ce3 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/GeneralizationSetConstraintParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/GeneralizationSetConstraintParser.java @@ -74,7 +74,8 @@ public class GeneralizationSetConstraintParser implements IParser { out = out + "overlapping}"; } return out; - }; + } + ; return ""; } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/OperationParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/OperationParser.java index 67c00f792e2..0c5cf3aa353 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/OperationParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/OperationParser.java @@ -97,7 +97,7 @@ public class OperationParser implements IParser { protected void doExecute() { if (InternationalizationPreferencesUtils.getInternationalizationPreference(operation) && null != UMLLabelInternationalization.getInstance().getLabelWithoutUML(operation)) { UMLLabelInternationalization.getInstance().setLabel(operation, result, null); - }else{ + } else { operation.setName(result); } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/PropertyParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/PropertyParser.java index b46d9ef49f8..36f03985070 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/PropertyParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/PropertyParser.java @@ -101,7 +101,7 @@ public class PropertyParser implements IParser { protected void doExecute() { if (InternationalizationPreferencesUtils.getInternationalizationPreference(property) && null != UMLLabelInternationalization.getInstance().getLabelWithoutUML(property)) { UMLLabelInternationalization.getInstance().setLabel(property, result, null); - }else{ + } else { property.setName(result); } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/RoleInstanceSpecificationLinkParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/RoleInstanceSpecificationLinkParser.java index d63d5fa35ca..a71045ad76d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/RoleInstanceSpecificationLinkParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/RoleInstanceSpecificationLinkParser.java @@ -28,7 +28,7 @@ import org.eclipse.uml2.uml.InstanceSpecification; /** * The base class of InstanceSpecification link edge parser - * + * */ public class RoleInstanceSpecificationLinkParser implements IParser { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/TemplateBindingParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/TemplateBindingParser.java index 8d229de614f..aaddb2a5cb3 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/TemplateBindingParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/TemplateBindingParser.java @@ -39,7 +39,7 @@ import org.eclipse.uml2.uml.TemplateParameterSubstitution; public class TemplateBindingParser implements IParser { private static final String EMPTY_STR = ""; //$NON-NLS-1$ - + final ILabelProvider labelProvider = new AdapterFactoryLabelProvider(org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory()); /** @@ -85,7 +85,7 @@ public class TemplateBindingParser implements IParser { final TemplateBinding binding = (TemplateBinding) e; for (TemplateParameterSubstitution substitution : binding.getParameterSubstitutions()) { if (!EMPTY_STR.equals(out)) { - out += ", "; // add separator, if not empty //$NON-NLS-1$ + out += ", "; // add separator, if not empty //$NON-NLS-1$ } if (substitution.getFormal() != null && substitution.getFormal().getParameteredElement() instanceof NamedElement) { out += UMLLabelInternationalization.getInstance().getLabel(((NamedElement) substitution.getFormal().getParameteredElement())); @@ -98,8 +98,7 @@ public class TemplateBindingParser implements IParser { } if (EMPTY_STR.equals(out)) { out = String.format("«bind»\n<No Binding Substitution>", out); //$NON-NLS-1$ - } - else { + } else { out = String.format("«bind»\n<%s>", out); //$NON-NLS-1$ } return out; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/TemplateParameterParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/TemplateParameterParser.java index 83d01b4af0c..3ca8a23abc6 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/TemplateParameterParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/parsers/TemplateParameterParser.java @@ -75,10 +75,10 @@ public class TemplateParameterParser implements IParser { if (templateParam.getParameteredElement() instanceof NamedElement) { NamedElement namedElement = (NamedElement) templateParam.getParameteredElement(); String name = newString.substring(0, newString.indexOf(":")); - if(InternationalizationPreferencesUtils.getInternationalizationPreference(namedElement) && null != UMLLabelInternationalization.getInstance().getLabelWithoutUML(namedElement)){ - final ModelSet modelSet = (ModelSet)namedElement.eResource().getResourceSet(); + if (InternationalizationPreferencesUtils.getInternationalizationPreference(namedElement) && null != UMLLabelInternationalization.getInstance().getLabelWithoutUML(namedElement)) { + final ModelSet modelSet = (ModelSet) namedElement.eResource().getResourceSet(); command = new EMFtoGMFCommandWrapper(UMLLabelInternationalization.getInstance().getSetLabelCommand(modelSet.getTransactionalEditingDomain(), namedElement, name.trim(), null)); - }else{ + } else { SetRequest request = new SetRequest(namedElement, UMLPackage.eINSTANCE.getNamedElement_Name(), name.trim()); command = new SetValueCommand(request); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AppliedStereotypeEnumerationLiteralDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AppliedStereotypeEnumerationLiteralDisplayEditPolicy.java index 98d7a181549..b4bdb8cdc7b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AppliedStereotypeEnumerationLiteralDisplayEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AppliedStereotypeEnumerationLiteralDisplayEditPolicy.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2015 CEA LIST and others. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -11,7 +11,7 @@ * Contributors: * Celine JANSSENS (ALL4TEC) celine.janssens@all4tec.net - Initial API and implementation * Celine JANSSENS (ALL4TEC) celine.janssens@all4tec.net - Bug 472034 - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.clazz.custom.policies; @@ -24,7 +24,7 @@ import org.eclipse.uml2.uml.EnumerationLiteral; /** * This Policy is to be used for Enumeration Literal Edit Part to manage the stereotype display - * + * * @author Céline JANSSENS * */ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AppliedStereotypeNestedLabelDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AppliedStereotypeNestedLabelDisplayEditPolicy.java index b3663079b1c..203e17a61ad 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AppliedStereotypeNestedLabelDisplayEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AppliedStereotypeNestedLabelDisplayEditPolicy.java @@ -5,7 +5,7 @@ import org.eclipse.papyrus.uml.diagram.clazz.custom.helper.NestedStereotypeLabel import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy; /** - * + * * */ public class AppliedStereotypeNestedLabelDisplayEditPolicy extends AppliedStereotypeLabelDisplayEditPolicy { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/CustomContainmentCreationEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/CustomContainmentCreationEditPolicy.java index 2d7e49cbebd..a17017b3d4e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/CustomContainmentCreationEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/CustomContainmentCreationEditPolicy.java @@ -59,7 +59,7 @@ public class CustomContainmentCreationEditPolicy extends DefaultCreationEditPoli @Override protected Command getReparentCommand(ChangeBoundsRequest request) { Iterator<?> editParts = request.getEditParts().iterator(); - View container = (View) getHost().getAdapter(View.class); + View container = getHost().getAdapter(View.class); EObject context = container == null ? null : ViewUtil.resolveSemanticElement(container); CompositeCommand cc = new CompositeCommand(DiagramUIMessages.AddCommand_Label); while (editParts.hasNext()) { @@ -70,7 +70,7 @@ public class CustomContainmentCreationEditPolicy extends DefaultCreationEditPoli if (ep instanceof GroupEditPart) { cc.compose(getReparentGroupCommand((GroupEditPart) ep)); } - View view = (View) ep.getAdapter(View.class); + View view = ep.getAdapter(View.class); if (view == null) { continue; } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/CustomGraphicalNodeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/CustomGraphicalNodeEditPolicy.java index 572f71f0e31..99fdc6ae29c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/CustomGraphicalNodeEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/CustomGraphicalNodeEditPolicy.java @@ -11,7 +11,7 @@ * * Contributors: * Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation - * Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - Bug 506314 + * Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - Bug 506314 *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.clazz.custom.policies; @@ -53,7 +53,7 @@ public class CustomGraphicalNodeEditPolicy extends DefaultGraphicalNodeEditPolic CreateRelationshipRequest createElementRequest = (CreateRelationshipRequest) requestAdapter.getAdapter(CreateRelationshipRequest.class); IElementType elementType = createElementRequest.getElementType(); if (UMLElementTypes.AssociationClass_Edge.equals(elementType) - || (elementType!= null && Arrays.asList(elementType.getAllSuperTypes()).contains(UMLElementTypes.AssociationClass_Edge))) { + || (elementType != null && Arrays.asList(elementType.getAllSuperTypes()).contains(UMLElementTypes.AssociationClass_Edge))) { AssociationClassHelper associationClassHelper = new AssociationClassHelper(getEditingDomain()); return associationClassHelper.getAssociationClassElementCommand(((CreateConnectionViewAndElementRequest) request), c); } else if (UMLElementTypes.Dependency_BranchEdge.equals(elementType)) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/CustomPackageReparentCreationEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/CustomPackageReparentCreationEditPolicy.java index bc5ba627b92..ae3b258105b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/CustomPackageReparentCreationEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/CustomPackageReparentCreationEditPolicy.java @@ -54,7 +54,7 @@ public class CustomPackageReparentCreationEditPolicy extends PapyrusCreationEdit @Override protected Command getReparentCommand(ChangeBoundsRequest request) { Iterator<?> editParts = request.getEditParts().iterator(); - View container = (View) getHost().getAdapter(View.class); + View container = getHost().getAdapter(View.class); EObject context = container == null ? null : ViewUtil.resolveSemanticElement(container); CompositeCommand cc = new CompositeCommand(DiagramUIMessages.AddCommand_Label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/DeleteLinkedAssociationClassViewEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/DeleteLinkedAssociationClassViewEditPolicy.java index 16b80c07236..b092df85d3d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/DeleteLinkedAssociationClassViewEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/DeleteLinkedAssociationClassViewEditPolicy.java @@ -84,7 +84,7 @@ public class DeleteLinkedAssociationClassViewEditPolicy extends ViewComponentEdi private Command getHideCommand(EditPart source, EditPart dashedLink) { GroupRequest hideRequest = new GroupRequest(RequestConstants.REQ_DELETE); - List<EditPart> parts = new ArrayList<EditPart>(); + List<EditPart> parts = new ArrayList<>(); parts.add(dashedLink); parts.add(source); hideRequest.setEditParts(parts); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/GeneralizationSetLabelDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/GeneralizationSetLabelDisplayEditPolicy.java index 3953cc1556a..f004ea55aa5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/GeneralizationSetLabelDisplayEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/GeneralizationSetLabelDisplayEditPolicy.java @@ -87,8 +87,8 @@ public class GeneralizationSetLabelDisplayEditPolicy extends AbstractEditPolicy public Collection<GeneralizationSetEditPart> getAllSameSemanticGeneralizationSet(GeneralizationEditPart editPart) { // look for all Generalization set connected to the source location that reference the same // generalizationSet - List<GeneralizationSetEditPart> result = new ArrayList<GeneralizationSetEditPart>(); - List<Object> linkList = new ArrayList<Object>(); + List<GeneralizationSetEditPart> result = new ArrayList<>(); + List<Object> linkList = new ArrayList<>(); for (Object object : editPart.getSourceConnections()) { linkList.add(object); } @@ -133,7 +133,7 @@ public class GeneralizationSetLabelDisplayEditPolicy extends AbstractEditPolicy if (getHost().getViewer() instanceof DiagramGraphicalViewer) { if (getHost() instanceof GeneralizationSetEditPart) { String elementID = EMFCoreUtil.getProxyID(((GeneralizationSetEditPart) getHost()).resolveSemanticElement()); - List<EditPart> editpartList = new ArrayList<EditPart>(); + List<EditPart> editpartList = new ArrayList<>(); for (Object object : ((DiagramGraphicalViewer) (getHost().getViewer())).findEditPartsForElement(elementID, GeneralizationSetEditPart.class)) { editpartList.add((EditPart) object); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/InstanceSpecificationNameLabelEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/InstanceSpecificationNameLabelEditPolicy.java index 0ec80092682..81cce0f022f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/InstanceSpecificationNameLabelEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/InstanceSpecificationNameLabelEditPolicy.java @@ -37,7 +37,7 @@ import org.eclipse.uml2.uml.UMLPackage; */ public class InstanceSpecificationNameLabelEditPolicy extends AbstractMaskManagedEditPolicy { - protected final Map<String, String> masks = new HashMap<String, String>(); + protected final Map<String, String> masks = new HashMap<>(); public InstanceSpecificationNameLabelEditPolicy() { super(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/InstanceSpecificationRoleDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/InstanceSpecificationRoleDisplayEditPolicy.java index 29ef615988a..256190f2a48 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/InstanceSpecificationRoleDisplayEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/InstanceSpecificationRoleDisplayEditPolicy.java @@ -46,11 +46,11 @@ import org.eclipse.uml2.uml.Property; public abstract class InstanceSpecificationRoleDisplayEditPolicy extends GraphicalEditPolicyEx implements NotificationListener, IPapyrusListener { /** The Constant ACTIVATION_ERROR_MESSAGE. */ - private static final String ACTIVATION_ERROR_MESSAGE = "No semantic element was found during activation of the mask managed label edit policy"; //$NON-NLS-1$ + private static final String ACTIVATION_ERROR_MESSAGE = "No semantic element was found during activation of the mask managed label edit policy"; //$NON-NLS-1$ // FIXME : See #449476 - // Will be fixed AFTER chaos (new generator) release. - // An EditPolicy key should not imply its behavior (MASK) + // Will be fixed AFTER chaos (new generator) release. + // An EditPolicy key should not imply its behavior (MASK) public static String INSTANCE_SPECIFICATION_ROLE_DISPLAY = IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY; /** @@ -157,7 +157,7 @@ public abstract class InstanceSpecificationRoleDisplayEditPolicy extends Graphic return interestingProperty; } if (hostSemanticElement != null) { - List<Property> array = new ArrayList<Property>(); + List<Property> array = new ArrayList<>(); InstanceSpecification instanceSpecification = (InstanceSpecification) hostSemanticElement; if (instanceSpecification.getClassifiers().size() > 0) { if (instanceSpecification.getClassifiers().get(0) instanceof Association) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/NestedLabelMaskManagedEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/NestedLabelMaskManagedEditPolicy.java index e57ec551b38..7e2710a55a9 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/NestedLabelMaskManagedEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/NestedLabelMaskManagedEditPolicy.java @@ -9,7 +9,7 @@ import org.eclipse.papyrus.uml.diagram.clazz.custom.helper.NestedStereotypeLabel import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractMaskManagedEditPolicy; /** - * + * * */ public class NestedLabelMaskManagedEditPolicy extends AbstractMaskManagedEditPolicy { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/RemoveOrphanViewPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/RemoveOrphanViewPolicy.java index d82ee0ab93f..70b6d1e5f1e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/RemoveOrphanViewPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/RemoveOrphanViewPolicy.java @@ -63,51 +63,53 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.OrphanViewPolicy; * connection is more complex. It is dependent of the diagram. see remove OrphanConnectionView * policy in clazzdiagram * + * @deprecated since 3.1 */ +@Deprecated public class RemoveOrphanViewPolicy extends OrphanViewPolicy { - public String[] notOrphanNode = { - AssociationClassAttributeCompartmentEditPart.VISUAL_ID, - AssociationClassNestedClassifierCompartmentEditPart.VISUAL_ID, - AssociationClassOperationCompartmentEditPart.VISUAL_ID, - ClassAttributeCompartmentEditPart.VISUAL_ID, - ClassAttributeCompartmentEditPartCN.VISUAL_ID, - ClassNestedClassifierCompartmentEditPart.VISUAL_ID, - ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID, - ClassOperationCompartmentEditPart.VISUAL_ID, - ClassOperationCompartmentEditPartCN.VISUAL_ID, - ComponentAttributeCompartmentEditPart.VISUAL_ID, - ComponentAttributeCompartmentEditPartCN.VISUAL_ID, - ComponentNestedClassifierCompartmentEditPart.VISUAL_ID, - ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID, - ComponentOperationCompartmentEditPart.VISUAL_ID, - ComponentOperationCompartmentEditPartCN.VISUAL_ID, - DataTypeAttributeCompartmentEditPart.VISUAL_ID, - DataTypeAttributeCompartmentEditPartCN.VISUAL_ID, - DataTypeOperationCompartmentEditPart.VISUAL_ID, - DataTypeOperationCompartmentEditPartCN.VISUAL_ID, - EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID, - EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID, - InstanceSpecificationSlotCompartmentEditPart.VISUAL_ID, - InstanceSpecificationSlotCompartmentEditPartCN.VISUAL_ID, - InterfaceAttributeCompartmentEditPart.VISUAL_ID, - InterfaceAttributeCompartmentEditPartCN.VISUAL_ID, - InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID, - InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID, - InterfaceOperationCompartmentEditPart.VISUAL_ID, - InterfaceOperationCompartmentEditPartCN.VISUAL_ID, - ModelPackageableElementCompartmentEditPartCN.VISUAL_ID, - ModelPackageableElementCompartmentEditPartTN.VISUAL_ID, - PackagePackageableElementCompartmentEditPart.VISUAL_ID, - PackagePackageableElementCompartmentEditPartCN.VISUAL_ID, - PrimitiveTypeAttributeCompartmentEditPart.VISUAL_ID, - PrimitiveTypeAttributeCompartmentEditPartCN.VISUAL_ID, - PrimitiveTypeOperationCompartmentEditPart.VISUAL_ID, - PrimitiveTypeOperationCompartmentEditPartCN.VISUAL_ID, - RedefinableTemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID, - SignalAttributeCompartmentEditPart.VISUAL_ID, - SignalAttributeCompartmentEditPartCN.VISUAL_ID, - TemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID, + public String[] notOrphanNode = { + AssociationClassAttributeCompartmentEditPart.VISUAL_ID, + AssociationClassNestedClassifierCompartmentEditPart.VISUAL_ID, + AssociationClassOperationCompartmentEditPart.VISUAL_ID, + ClassAttributeCompartmentEditPart.VISUAL_ID, + ClassAttributeCompartmentEditPartCN.VISUAL_ID, + ClassNestedClassifierCompartmentEditPart.VISUAL_ID, + ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID, + ClassOperationCompartmentEditPart.VISUAL_ID, + ClassOperationCompartmentEditPartCN.VISUAL_ID, + ComponentAttributeCompartmentEditPart.VISUAL_ID, + ComponentAttributeCompartmentEditPartCN.VISUAL_ID, + ComponentNestedClassifierCompartmentEditPart.VISUAL_ID, + ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID, + ComponentOperationCompartmentEditPart.VISUAL_ID, + ComponentOperationCompartmentEditPartCN.VISUAL_ID, + DataTypeAttributeCompartmentEditPart.VISUAL_ID, + DataTypeAttributeCompartmentEditPartCN.VISUAL_ID, + DataTypeOperationCompartmentEditPart.VISUAL_ID, + DataTypeOperationCompartmentEditPartCN.VISUAL_ID, + EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID, + EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID, + InstanceSpecificationSlotCompartmentEditPart.VISUAL_ID, + InstanceSpecificationSlotCompartmentEditPartCN.VISUAL_ID, + InterfaceAttributeCompartmentEditPart.VISUAL_ID, + InterfaceAttributeCompartmentEditPartCN.VISUAL_ID, + InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID, + InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID, + InterfaceOperationCompartmentEditPart.VISUAL_ID, + InterfaceOperationCompartmentEditPartCN.VISUAL_ID, + ModelPackageableElementCompartmentEditPartCN.VISUAL_ID, + ModelPackageableElementCompartmentEditPartTN.VISUAL_ID, + PackagePackageableElementCompartmentEditPart.VISUAL_ID, + PackagePackageableElementCompartmentEditPartCN.VISUAL_ID, + PrimitiveTypeAttributeCompartmentEditPart.VISUAL_ID, + PrimitiveTypeAttributeCompartmentEditPartCN.VISUAL_ID, + PrimitiveTypeOperationCompartmentEditPart.VISUAL_ID, + PrimitiveTypeOperationCompartmentEditPartCN.VISUAL_ID, + RedefinableTemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID, + SignalAttributeCompartmentEditPart.VISUAL_ID, + SignalAttributeCompartmentEditPartCN.VISUAL_ID, + TemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID, }; public RemoveOrphanViewPolicy() { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/TemplateParamaterDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/TemplateParamaterDisplayEditPolicy.java index d19835d2cbc..b04ef49b1c1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/TemplateParamaterDisplayEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/TemplateParamaterDisplayEditPolicy.java @@ -33,7 +33,7 @@ import org.eclipse.uml2.uml.UMLPackage; */ public class TemplateParamaterDisplayEditPolicy extends GraphicalEditPolicy implements NotificationListener, IPapyrusListener { - public static String TEMPLATE_PARAMETER_DISPLAY = "TEMPLATE_PARAMETER_DISPLAY"; //$NON-NLS-1$ + public static String TEMPLATE_PARAMETER_DISPLAY = "TEMPLATE_PARAMETER_DISPLAY"; //$NON-NLS-1$ /** * Stores the semantic element related to the edit policy. If resolveSemanticElement is used, there are problems when the edit part is getting diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/providers/CustomUMLParserProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/providers/CustomUMLParserProvider.java index d21acc43385..0a7a28a25cd 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/providers/CustomUMLParserProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/providers/CustomUMLParserProvider.java @@ -79,7 +79,7 @@ public class CustomUMLParserProvider extends UMLParserProvider { protected IParser getAppliedStereotypeParser(String defaultPrintString) { return new AppliedStereotypeParser(defaultPrintString); } - + protected IParser getAppliedKeywordParser(String defaultPrintString) { return new AppliedKeywordParser(defaultPrintString); } @@ -181,13 +181,13 @@ public class CustomUMLParserProvider extends UMLParserProvider { case AppliedStereotypeInterfaceRealizationEditPart.VISUAL_ID: return getAppliedStereotypeParser(); case AppliedStereotypeSubstitutionEditPart.VISUAL_ID: - return getAppliedKeywordParser(KeywordLabel.SUBSTITUTE); + return getAppliedKeywordParser(KeywordLabel.SUBSTITUTE); case AppliedStereotypeRealizationEditPart.VISUAL_ID: return getAppliedStereotypeParser(); case AppliedStereotypeAbstractionEditPart.VISUAL_ID: return getAppliedKeywordParser(KeywordLabel.ABSTRACTION); case AppliedStereotypeUsageEditPart.VISUAL_ID: - return getAppliedKeywordParser(KeywordLabel.USE); + return getAppliedKeywordParser(KeywordLabel.USE); case AppliedStereotypeDependencyEditPart.VISUAL_ID: return getAppliedStereotypeParser(); case AppliedStereotypeElementImportEditPart.VISUAL_ID: diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/providers/GraphicalAssociationBranchViewCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/providers/GraphicalAssociationBranchViewCommand.java index 6a3cf293566..b101d7f31f4 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/providers/GraphicalAssociationBranchViewCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/providers/GraphicalAssociationBranchViewCommand.java @@ -27,9 +27,9 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest.C import org.eclipse.gmf.runtime.emf.type.core.IHintedType; import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest; import org.eclipse.gmf.runtime.notation.View; +import org.eclipse.papyrus.infra.gmfdiag.common.commands.CommonDeferredCreateConnectionViewCommand; import org.eclipse.papyrus.uml.diagram.clazz.custom.helper.MultiAssociationHelper; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; -import org.eclipse.papyrus.infra.gmfdiag.common.commands.CommonDeferredCreateConnectionViewCommand; import org.eclipse.uml2.uml.Property; public class GraphicalAssociationBranchViewCommand extends CommonDeferredCreateConnectionViewCommand { @@ -62,7 +62,7 @@ public class GraphicalAssociationBranchViewCommand extends CommonDeferredCreateC associationEnd = (Property) associationEndWrapper; } if (associationEnd != null && associationEnd instanceof Property) { - MultiAssociationHelper.setSemanticBranchEnd(view, (Property) associationEnd); + org.eclipse.papyrus.uml.diagram.common.helper.MultiAssociationHelper.setSemanticBranchEnd(view, (Property) associationEnd); } return commandResult; } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/utils/GeneralizationUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/utils/GeneralizationUtil.java index 3aa0dc45120..99bb9668378 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/utils/GeneralizationUtil.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/utils/GeneralizationUtil.java @@ -36,7 +36,7 @@ public class GeneralizationUtil { * @param el * a {@link Classifier} or a {@link Property} * @return - * <code>true</code> if the classifier has this generalization in its inheritance links (directly or indirectly) <code>false</code> if not + * <code>true</code> if the classifier has this generalization in its inheritance links (directly or indirectly) <code>false</code> if not */ public boolean isConcernedByGeneralizationChanges(Generalization generalization, View view) { boolean isConcerned = false; @@ -70,10 +70,10 @@ public class GeneralizationUtil { * @param el * * @return - * <code>true</code> if another way exists to inherit of this element <code>false</code> if not + * <code>true</code> if another way exists to inherit of this element <code>false</code> if not */ protected boolean existsAnotherInheritanceWay(Element inheritedElement, Generalization forbiddenPath, NamedElement el, Set<Element> ignoredGeneralizations) { - Set<Generalization> generalizations = new HashSet<Generalization>(); + Set<Generalization> generalizations = new HashSet<>(); Classifier _classifier = null; if (el instanceof Property) { Type type = ((Property) el).getType(); @@ -85,7 +85,7 @@ public class GeneralizationUtil { } // List Generalization that have already been tested to avoid loop issues // in case of Generalization cycles (such cycle creation should be avoided) - Set<Element> ignoredGeneralizationsTmp = new HashSet<Element>(); + Set<Element> ignoredGeneralizationsTmp = new HashSet<>(); if (ignoredGeneralizations != null) { ignoredGeneralizationsTmp.addAll(ignoredGeneralizations); } @@ -114,7 +114,7 @@ public class GeneralizationUtil { * @param view * a view * @return - * the Element owning this view + * the Element owning this view * or <code>null</code> if not found */ protected NamedElement getGraphicalOwner(View view) { @@ -134,17 +134,17 @@ public class GeneralizationUtil { * @param classifier * a classifier * @return - * all the generalization (direct and indirect) owning by the classifier + * all the generalization (direct and indirect) owning by the classifier */ protected Set<Generalization> getAllGeneralization(Classifier classifier, Set<Classifier> alreadyParsedClassifiers) { - Set<Generalization> generalizations = new HashSet<Generalization>(); + Set<Generalization> generalizations = new HashSet<>(); // Keep track of already parsed Classifiers to avoid loop in case // of Generalization cycle. - Set<Classifier> parsedClassifiers = new HashSet<Classifier>(); + Set<Classifier> parsedClassifiers = new HashSet<>(); if (alreadyParsedClassifiers != null) { parsedClassifiers.addAll(alreadyParsedClassifiers); } - Set<Generalization> generalizationsTmp = new HashSet<Generalization>(); + Set<Generalization> generalizationsTmp = new HashSet<>(); if (classifier != null) { generalizations.addAll(classifier.getGeneralizations()); if (!parsedClassifiers.contains(classifier)) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen index 9ecedf8f803..11fcbfbbfe0 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<xmi:XMI - xmi:version="2.0" +<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gmfgen="http://www.eclipse.org/gmf/2009/GenModel" @@ -34,10 +33,6 @@ figureQualifiedClassName="org.eclipse.draw2d.FreeformLayer"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> <behaviour @@ -7370,10 +7365,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> </compartments> @@ -7393,10 +7384,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> </compartments> @@ -7416,10 +7403,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> <behaviour @@ -7443,10 +7426,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> </compartments> @@ -7466,10 +7445,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> </compartments> @@ -7489,10 +7464,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> <behaviour @@ -7516,10 +7487,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> </compartments> @@ -7539,10 +7506,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> </compartments> @@ -7562,10 +7525,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> </compartments> @@ -7585,10 +7544,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> <behaviour @@ -7612,10 +7567,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> </compartments> @@ -7635,10 +7586,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> </compartments> @@ -7658,10 +7605,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> </compartments> @@ -7681,10 +7624,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> </compartments> @@ -7705,10 +7644,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> <behaviour @@ -7741,10 +7676,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> <behaviour @@ -7776,10 +7707,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> <behaviour @@ -7803,10 +7730,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> <behaviour @@ -7830,10 +7753,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> </compartments> @@ -7853,10 +7772,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> </compartments> @@ -7876,10 +7791,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> <behaviour @@ -7903,10 +7814,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> </compartments> @@ -7926,10 +7833,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> </compartments> @@ -7949,10 +7852,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedClazzCompartmentCreationEditPolicy"/> <behaviour @@ -7976,10 +7875,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> </compartments> @@ -7999,10 +7894,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> </compartments> @@ -8022,10 +7913,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> <behaviour @@ -8049,10 +7936,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> </compartments> @@ -8072,10 +7955,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> </compartments> @@ -8095,10 +7974,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> </compartments> @@ -8118,10 +7993,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> </compartments> @@ -8141,10 +8012,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> </compartments> @@ -8164,10 +8031,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> <behaviour @@ -8191,10 +8054,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> <behaviour @@ -8219,10 +8078,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> <behaviour @@ -8255,10 +8110,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> <behaviour @@ -8290,10 +8141,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> <behaviour @@ -8317,10 +8164,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> </compartments> @@ -8340,10 +8183,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> <behaviour @@ -8368,10 +8207,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> </compartments> @@ -8392,10 +8227,6 @@ figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/> <behaviour xsi:type="gmfgen:CustomBehaviour" - key=""RemoveOrphanView"" - editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy"/> - <behaviour - xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy"/> </compartments> @@ -8428,7 +8259,7 @@ <plugin iD="org.eclipse.papyrus.uml.diagram.clazz" name="PapyrusUMLClassDiagram" - version="3.0.0.qualifier"/> + version="3.1.0.qualifier"/> <editor/> <navigator/> <diagramUpdater/> @@ -8781,134 +8612,91 @@ <papyrusgmfgenextension:VisualIDOverride genView="/0/@diagram" visualID="Package_ClassDiagram"> - <child - genView="/0/@diagram/@childNodes.0" + <child genView="/0/@diagram/@childNodes.0" visualID="Property_ClassAttributeLabel"/> - <child - genView="/0/@diagram/@childNodes.1" + <child genView="/0/@diagram/@childNodes.1" visualID="Property_ComponentAttributeLabel"/> - <child - genView="/0/@diagram/@childNodes.2" + <child genView="/0/@diagram/@childNodes.2" visualID="Property_SignalAttributeLabel"/> - <child - genView="/0/@diagram/@childNodes.3" + <child genView="/0/@diagram/@childNodes.3" visualID="Property_InterfaceAttributeLabel"/> - <child - genView="/0/@diagram/@childNodes.4" + <child genView="/0/@diagram/@childNodes.4" visualID="Property_PrimitiveTypeAttributeLabel"/> - <child - genView="/0/@diagram/@childNodes.5" + <child genView="/0/@diagram/@childNodes.5" visualID="Property_DataTypeAttributeLabel"/> - <child - genView="/0/@diagram/@childNodes.6" + <child genView="/0/@diagram/@childNodes.6" visualID="Class_ClassNestedClassifierLabel"/> - <child - genView="/0/@diagram/@childNodes.7" + <child genView="/0/@diagram/@childNodes.7" visualID="Class_ComponentNestedClassifierLabel"/> - <child - genView="/0/@diagram/@childNodes.8" + <child genView="/0/@diagram/@childNodes.8" visualID="Class_InterfaceNestedClassifierLabel"/> - <child - genView="/0/@diagram/@childNodes.9" + <child genView="/0/@diagram/@childNodes.9" visualID="Operation_ClassOperationLabel"/> - <child - genView="/0/@diagram/@childNodes.10" + <child genView="/0/@diagram/@childNodes.10" visualID="Operation_ComponentOperationLabel"/> - <child - genView="/0/@diagram/@childNodes.11" + <child genView="/0/@diagram/@childNodes.11" visualID="Operation_InterfaceOperationLabel"/> - <child - genView="/0/@diagram/@childNodes.12" + <child genView="/0/@diagram/@childNodes.12" visualID="Operation_PrimitiveTypeOperationLabel"/> - <child - genView="/0/@diagram/@childNodes.13" + <child genView="/0/@diagram/@childNodes.13" visualID="Operation_DataTypeOperationLabel"/> - <child - genView="/0/@diagram/@childNodes.14" + <child genView="/0/@diagram/@childNodes.14" visualID="ConnectableElementTemplateParameter_TemplateParameterLabel"/> - <child - genView="/0/@diagram/@childNodes.15" + <child genView="/0/@diagram/@childNodes.15" visualID="OperationTemplateParameter_TemplateParameterLabel"/> - <child - genView="/0/@diagram/@childNodes.16" + <child genView="/0/@diagram/@childNodes.16" visualID="ClassifierTemplateParameter_TemplateParameterLabel"/> - <child - genView="/0/@diagram/@childNodes.17" + <child genView="/0/@diagram/@childNodes.17" visualID="TemplateParameter_TemplateParameterLabel"/> - <child - genView="/0/@diagram/@childNodes.18" + <child genView="/0/@diagram/@childNodes.18" visualID="EnumerationLiteral_LiteralLabel"/> - <child - genView="/0/@diagram/@childNodes.19" + <child genView="/0/@diagram/@childNodes.19" visualID="Reception_ReceptionLabel"/> - <child - genView="/0/@diagram/@childNodes.20" + <child genView="/0/@diagram/@childNodes.20" visualID="Reception_InterfaceReceptionLabel"/> - <child - genView="/0/@diagram/@childNodes.21" + <child genView="/0/@diagram/@childNodes.21" visualID="Slot_SlotLabel"/> - <child - genView="/0/@diagram/@childNodes.37" + <child genView="/0/@diagram/@childNodes.37" visualID="Interface_ClassNestedClassifierLabel"/> - <child - genView="/0/@diagram/@childNodes.38" + <child genView="/0/@diagram/@childNodes.38" visualID="Interface_ComponentNestedClassifierLabel"/> - <child - genView="/0/@diagram/@childNodes.39" + <child genView="/0/@diagram/@childNodes.39" visualID="Interface_InterfaceNestedClassifierLabel"/> - <child - genView="/0/@diagram/@childNodes.40" + <child genView="/0/@diagram/@childNodes.40" visualID="Enumeration_ClassNestedClassifierLabel"/> - <child - genView="/0/@diagram/@childNodes.41" + <child genView="/0/@diagram/@childNodes.41" visualID="Enumeration_ComponentNestedClassifierLabel"/> - <child - genView="/0/@diagram/@childNodes.42" + <child genView="/0/@diagram/@childNodes.42" visualID="Enumeration_InterfaceNestedClassifierLabel"/> - <child - genView="/0/@diagram/@childNodes.43" + <child genView="/0/@diagram/@childNodes.43" visualID="PrimitiveType_ClassNestedClassifierLabel"/> - <child - genView="/0/@diagram/@childNodes.44" + <child genView="/0/@diagram/@childNodes.44" visualID="PrimitiveType_ComponentNestedClassifierLabel"/> - <child - genView="/0/@diagram/@childNodes.45" + <child genView="/0/@diagram/@childNodes.45" visualID="PrimitiveType_InterfaceNestedClassifierLabel"/> - <child - genView="/0/@diagram/@childNodes.46" + <child genView="/0/@diagram/@childNodes.46" visualID="DataType_ClassNestedClassifierLabel"/> - <child - genView="/0/@diagram/@childNodes.47" + <child genView="/0/@diagram/@childNodes.47" visualID="DataType_ComponentNestedClassifierLabel"/> - <child - genView="/0/@diagram/@childNodes.48" + <child genView="/0/@diagram/@childNodes.48" visualID="DataType_InterfaceNestedClassifierLabel"/> - <child - genView="/0/@diagram/@childNodes.49" + <child genView="/0/@diagram/@childNodes.49" visualID="Signal_ClassNestedClassifierLabel"/> - <child - genView="/0/@diagram/@childNodes.50" + <child genView="/0/@diagram/@childNodes.50" visualID="Signal_ComponentNestedClassifierLabel"/> - <child - genView="/0/@diagram/@childNodes.51" + <child genView="/0/@diagram/@childNodes.51" visualID="Signal_InterfaceNestedClassifierLabel"/> - <child - genView="/0/@diagram/@childNodes.52" + <child genView="/0/@diagram/@childNodes.52" visualID="Component_ClassNestedClassifierLabel"/> - <child - genView="/0/@diagram/@childNodes.53" + <child genView="/0/@diagram/@childNodes.53" visualID="Component_InterfaceNestedClassifierLabel"/> - <child - genView="/0/@diagram/@childNodes.54" + <child genView="/0/@diagram/@childNodes.54" visualID="Component_ComponentNestedClassifierLabel"/> - <child - genView="/0/@diagram/@childNodes.22" + <child genView="/0/@diagram/@childNodes.22" visualID="RedefinableTemplateSignature_Shape"/> - <child - genView="/0/@diagram/@childNodes.23" + <child genView="/0/@diagram/@childNodes.23" visualID="TemplateSignature_Shape"/> - <child - genView="/0/@diagram/@childNodes.24" + <child genView="/0/@diagram/@childNodes.24" visualID="InstanceSpecification_Shape_CN"> <child genView="/0/@diagram/@childNodes.24/@labels.0" @@ -8917,8 +8705,7 @@ genView="/0/@diagram/@childNodes.24/@labels.1" visualID="InstanceSpecification_FloatingNameLabel_CN"/> </child> - <child - genView="/0/@diagram/@childNodes.25" + <child genView="/0/@diagram/@childNodes.25" visualID="Component_Shape_CN"> <child genView="/0/@diagram/@childNodes.25/@labels.0" @@ -8927,8 +8714,7 @@ genView="/0/@diagram/@childNodes.25/@labels.1" visualID="Component_FloatingNameLabel_CN"/> </child> - <child - genView="/0/@diagram/@childNodes.26" + <child genView="/0/@diagram/@childNodes.26" visualID="Signal_Shape_CN"> <child genView="/0/@diagram/@childNodes.26/@labels.0" @@ -8937,8 +8723,7 @@ genView="/0/@diagram/@childNodes.26/@labels.1" visualID="Signal_FloatingNameLabel_CN"/> </child> - <child - genView="/0/@diagram/@childNodes.27" + <child genView="/0/@diagram/@childNodes.27" visualID="Interface_Shape_CN"> <child genView="/0/@diagram/@childNodes.27/@labels.0" @@ -8947,15 +8732,13 @@ genView="/0/@diagram/@childNodes.27/@labels.1" visualID="Interface_FloatingNameLabel_CN"/> </child> - <child - genView="/0/@diagram/@childNodes.28" + <child genView="/0/@diagram/@childNodes.28" visualID="Model_Shape_CN"> <child genView="/0/@diagram/@childNodes.28/@labels.0" visualID="Model_NameLabel_CN"/> </child> - <child - genView="/0/@diagram/@childNodes.29" + <child genView="/0/@diagram/@childNodes.29" visualID="Enumeration_Shape_CN"> <child genView="/0/@diagram/@childNodes.29/@labels.0" @@ -8964,15 +8747,13 @@ genView="/0/@diagram/@childNodes.29/@labels.1" visualID="Enumeration_FloatingNameLabel_CN"/> </child> - <child - genView="/0/@diagram/@childNodes.30" + <child genView="/0/@diagram/@childNodes.30" visualID="Package_Shape_CN"> <child genView="/0/@diagram/@childNodes.30/@labels.0" visualID="Package_NameLabel_CN"/> </child> - <child - genView="/0/@diagram/@childNodes.31" + <child genView="/0/@diagram/@childNodes.31" visualID="InformationItem_Shape_CN"> <child genView="/0/@diagram/@childNodes.31/@labels.0" @@ -8981,8 +8762,7 @@ genView="/0/@diagram/@childNodes.31/@labels.1" visualID="InformationItem_FloatingNameLabel_CN"/> </child> - <child - genView="/0/@diagram/@childNodes.32" + <child genView="/0/@diagram/@childNodes.32" visualID="Class_Shape_CN"> <child genView="/0/@diagram/@childNodes.32/@labels.0" @@ -8991,8 +8771,7 @@ genView="/0/@diagram/@childNodes.32/@labels.1" visualID="Class_FloatingNameLabel_CN"/> </child> - <child - genView="/0/@diagram/@childNodes.33" + <child genView="/0/@diagram/@childNodes.33" visualID="PrimitiveType_Shape_CN"> <child genView="/0/@diagram/@childNodes.33/@labels.0" @@ -9001,8 +8780,7 @@ genView="/0/@diagram/@childNodes.33/@labels.1" visualID="PrimitiveType_FloatingNameLabel_CN"/> </child> - <child - genView="/0/@diagram/@childNodes.34" + <child genView="/0/@diagram/@childNodes.34" visualID="DataType_Shape_CN"> <child genView="/0/@diagram/@childNodes.34/@labels.0" @@ -9011,15 +8789,13 @@ genView="/0/@diagram/@childNodes.34/@labels.1" visualID="DataType_FloatingNameLabel_CN"/> </child> - <child - genView="/0/@diagram/@childNodes.35" + <child genView="/0/@diagram/@childNodes.35" visualID="Comment_Shape_CN"> <child genView="/0/@diagram/@childNodes.35/@labels.0" visualID="Comment_BodyLabel_CN"/> </child> - <child - genView="/0/@diagram/@childNodes.36" + <child genView="/0/@diagram/@childNodes.36" visualID="Constraint_PackagedElementShape_CN"> <child genView="/0/@diagram/@childNodes.36/@labels.0" @@ -9028,131 +8804,89 @@ genView="/0/@diagram/@childNodes.36/@labels.1" visualID="Constraint_FloatingNameLabel_CN"/> </child> - <child - genView="/0/@diagram/@compartments.0" + <child genView="/0/@diagram/@compartments.0" visualID="Class_AttributeCompartment_CN"/> - <child - genView="/0/@diagram/@compartments.1" + <child genView="/0/@diagram/@compartments.1" visualID="Class_OperationCompartment_CN"/> - <child - genView="/0/@diagram/@compartments.2" + <child genView="/0/@diagram/@compartments.2" visualID="Class_NestedClassifierCompartment_CN"/> - <child - genView="/0/@diagram/@compartments.3" + <child genView="/0/@diagram/@compartments.3" visualID="Component_AttributeCompartment_CN"/> - <child - genView="/0/@diagram/@compartments.4" + <child genView="/0/@diagram/@compartments.4" visualID="Component_OperationCompartment_CN"/> - <child - genView="/0/@diagram/@compartments.5" + <child genView="/0/@diagram/@compartments.5" visualID="Component_NestedClassifierCompartment_CN"/> - <child - genView="/0/@diagram/@compartments.6" + <child genView="/0/@diagram/@compartments.6" visualID="Signal_AttributeCompartment_CN"/> - <child - genView="/0/@diagram/@compartments.7" + <child genView="/0/@diagram/@compartments.7" visualID="Interface_AttributeCompartment_CN"/> - <child - genView="/0/@diagram/@compartments.8" + <child genView="/0/@diagram/@compartments.8" visualID="Interface_OperationCompartment_CN"/> - <child - genView="/0/@diagram/@compartments.9" + <child genView="/0/@diagram/@compartments.9" visualID="Interface_NestedClassifierCompartment_CN"/> - <child - genView="/0/@diagram/@compartments.10" + <child genView="/0/@diagram/@compartments.10" visualID="PrimitiveType_AttributeCompartment_CN"/> - <child - genView="/0/@diagram/@compartments.11" + <child genView="/0/@diagram/@compartments.11" visualID="PrimitiveType_OperationCompartment_CN"/> - <child - genView="/0/@diagram/@compartments.12" + <child genView="/0/@diagram/@compartments.12" visualID="DataType_AttributeCompartment_CN"/> - <child - genView="/0/@diagram/@compartments.13" + <child genView="/0/@diagram/@compartments.13" visualID="DataType_OperationCompartment_CN"/> - <child - genView="/0/@diagram/@compartments.14" + <child genView="/0/@diagram/@compartments.14" visualID="Model_PackagedElementCompartment_CN"/> - <child - genView="/0/@diagram/@compartments.15" + <child genView="/0/@diagram/@compartments.15" visualID="Package_PackagedElementCompartment_CN"/> - <child - genView="/0/@diagram/@compartments.16" + <child genView="/0/@diagram/@compartments.16" visualID="Enumeration_LiteralCompartment_CN"/> - <child - genView="/0/@diagram/@compartments.17" + <child genView="/0/@diagram/@compartments.17" visualID="InstanceSpecification_SlotCompartment_CN"/> - <child - genView="/0/@diagram/@compartments.18" + <child genView="/0/@diagram/@compartments.18" visualID="Class_AttributeCompartment"/> - <child - genView="/0/@diagram/@compartments.19" + <child genView="/0/@diagram/@compartments.19" visualID="Class_OperationCompartment"/> - <child - genView="/0/@diagram/@compartments.20" + <child genView="/0/@diagram/@compartments.20" visualID="Class_NestedClassifierCompartment"/> - <child - genView="/0/@diagram/@compartments.21" + <child genView="/0/@diagram/@compartments.21" visualID="Component_AttributeCompartment"/> - <child - genView="/0/@diagram/@compartments.22" + <child genView="/0/@diagram/@compartments.22" visualID="Component_OperationCompartment"/> - <child - genView="/0/@diagram/@compartments.23" + <child genView="/0/@diagram/@compartments.23" visualID="Component_NestedClassifierCompartment"/> - <child - genView="/0/@diagram/@compartments.24" + <child genView="/0/@diagram/@compartments.24" visualID="Interface_AttributeCompartment"/> - <child - genView="/0/@diagram/@compartments.25" + <child genView="/0/@diagram/@compartments.25" visualID="Interface_OperationCompartment"/> - <child - genView="/0/@diagram/@compartments.26" + <child genView="/0/@diagram/@compartments.26" visualID="Interface_NestedClassifierCompartment"/> - <child - genView="/0/@diagram/@compartments.27" + <child genView="/0/@diagram/@compartments.27" visualID="PrimitiveType_AttributeCompartment"/> - <child - genView="/0/@diagram/@compartments.28" + <child genView="/0/@diagram/@compartments.28" visualID="PrimitiveType_OperationCompartment"/> - <child - genView="/0/@diagram/@compartments.29" + <child genView="/0/@diagram/@compartments.29" visualID="DataType_AttributeCompartment"/> - <child - genView="/0/@diagram/@compartments.30" + <child genView="/0/@diagram/@compartments.30" visualID="DataType_OperationCompartment"/> - <child - genView="/0/@diagram/@compartments.31" + <child genView="/0/@diagram/@compartments.31" visualID="AssociationClass_AttributeCompartment"/> - <child - genView="/0/@diagram/@compartments.32" + <child genView="/0/@diagram/@compartments.32" visualID="InstanceSpecification_SlotCompartment"/> - <child - genView="/0/@diagram/@compartments.33" + <child genView="/0/@diagram/@compartments.33" visualID="Signal_AttributeCompartment"/> - <child - genView="/0/@diagram/@compartments.34" + <child genView="/0/@diagram/@compartments.34" visualID="Model_PackagedElementCompartment"/> - <child - genView="/0/@diagram/@compartments.35" + <child genView="/0/@diagram/@compartments.35" visualID="Package_PackagedElementCompartment"/> - <child - genView="/0/@diagram/@compartments.36" + <child genView="/0/@diagram/@compartments.36" visualID="Enumeration_LiteralCompartment"/> - <child - genView="/0/@diagram/@compartments.37" + <child genView="/0/@diagram/@compartments.37" visualID="AssociationClass_OperationCompartment"/> - <child - genView="/0/@diagram/@compartments.38" + <child genView="/0/@diagram/@compartments.38" visualID="AssociationClass_NestedClassifierCompartment"/> - <child - genView="/0/@diagram/@compartments.39" + <child genView="/0/@diagram/@compartments.39" visualID="RedefinableTemplateSignature_TemplateParameterCompartment"/> - <child - genView="/0/@diagram/@compartments.40" + <child genView="/0/@diagram/@compartments.40" visualID="TemplateSignature_TemplateParameterCompartment"/> - <child - genView="/0/@diagram/@topLevelNodes.0" + <child genView="/0/@diagram/@topLevelNodes.0" visualID="Dependency_Shape"> <child genView="/0/@diagram/@topLevelNodes.0/@labels.0" @@ -9161,8 +8895,7 @@ genView="/0/@diagram/@topLevelNodes.0/@labels.1" visualID="Dependency_FloatingNameLabel"/> </child> - <child - genView="/0/@diagram/@topLevelNodes.1" + <child genView="/0/@diagram/@topLevelNodes.1" visualID="AssociationClass_Shape"> <child genView="/0/@diagram/@topLevelNodes.1/@labels.0" @@ -9171,15 +8904,13 @@ genView="/0/@diagram/@topLevelNodes.1/@labels.1" visualID="AssociationClass_FloatingNameLabel"/> </child> - <child - genView="/0/@diagram/@topLevelNodes.2" + <child genView="/0/@diagram/@topLevelNodes.2" visualID="Association_Shape"> <child genView="/0/@diagram/@topLevelNodes.2/@labels.0" visualID="Association_FloatingNameLabel"/> </child> - <child - genView="/0/@diagram/@topLevelNodes.3" + <child genView="/0/@diagram/@topLevelNodes.3" visualID="InstanceSpecification_Shape"> <child genView="/0/@diagram/@topLevelNodes.3/@labels.0" @@ -9188,8 +8919,7 @@ genView="/0/@diagram/@topLevelNodes.3/@labels.1" visualID="InstanceSpecification_FloatingNameLabel"/> </child> - <child - genView="/0/@diagram/@topLevelNodes.4" + <child genView="/0/@diagram/@topLevelNodes.4" visualID="Component_Shape"> <child genView="/0/@diagram/@topLevelNodes.4/@labels.0" @@ -9198,8 +8928,7 @@ genView="/0/@diagram/@topLevelNodes.4/@labels.1" visualID="Component_FloatingNameLabel"/> </child> - <child - genView="/0/@diagram/@topLevelNodes.5" + <child genView="/0/@diagram/@topLevelNodes.5" visualID="Signal_Shape"> <child genView="/0/@diagram/@topLevelNodes.5/@labels.0" @@ -9208,8 +8937,7 @@ genView="/0/@diagram/@topLevelNodes.5/@labels.1" visualID="Signal_FloatingNameLabel"/> </child> - <child - genView="/0/@diagram/@topLevelNodes.6" + <child genView="/0/@diagram/@topLevelNodes.6" visualID="Interface_Shape"> <child genView="/0/@diagram/@topLevelNodes.6/@labels.0" @@ -9218,15 +8946,13 @@ genView="/0/@diagram/@topLevelNodes.6/@labels.1" visualID="Interface_FloatingNameLabel"/> </child> - <child - genView="/0/@diagram/@topLevelNodes.7" + <child genView="/0/@diagram/@topLevelNodes.7" visualID="Model_Shape"> <child genView="/0/@diagram/@topLevelNodes.7/@labels.0" visualID="Model_NameLabel"/> </child> - <child - genView="/0/@diagram/@topLevelNodes.8" + <child genView="/0/@diagram/@topLevelNodes.8" visualID="Enumeration_Shape"> <child genView="/0/@diagram/@topLevelNodes.8/@labels.0" @@ -9235,15 +8961,13 @@ genView="/0/@diagram/@topLevelNodes.8/@labels.1" visualID="Enumeration_FloatingNameLabel"/> </child> - <child - genView="/0/@diagram/@topLevelNodes.9" + <child genView="/0/@diagram/@topLevelNodes.9" visualID="Package_Shape"> <child genView="/0/@diagram/@topLevelNodes.9/@labels.0" visualID="Package_NameLabel"/> </child> - <child - genView="/0/@diagram/@topLevelNodes.10" + <child genView="/0/@diagram/@topLevelNodes.10" visualID="InformationItem_Shape"> <child genView="/0/@diagram/@topLevelNodes.10/@labels.0" @@ -9252,8 +8976,7 @@ genView="/0/@diagram/@topLevelNodes.10/@labels.1" visualID="InformationItem_FloatingNameLabel"/> </child> - <child - genView="/0/@diagram/@topLevelNodes.11" + <child genView="/0/@diagram/@topLevelNodes.11" visualID="Class_Shape"> <child genView="/0/@diagram/@topLevelNodes.11/@labels.0" @@ -9262,8 +8985,7 @@ genView="/0/@diagram/@topLevelNodes.11/@labels.1" visualID="Class_FloatingNameLabel"/> </child> - <child - genView="/0/@diagram/@topLevelNodes.12" + <child genView="/0/@diagram/@topLevelNodes.12" visualID="PrimitiveType_Shape"> <child genView="/0/@diagram/@topLevelNodes.12/@labels.0" @@ -9272,8 +8994,7 @@ genView="/0/@diagram/@topLevelNodes.12/@labels.1" visualID="PrimitiveType_FloatingNameLabel"/> </child> - <child - genView="/0/@diagram/@topLevelNodes.13" + <child genView="/0/@diagram/@topLevelNodes.13" visualID="DataType_Shape"> <child genView="/0/@diagram/@topLevelNodes.13/@labels.0" @@ -9282,8 +9003,7 @@ genView="/0/@diagram/@topLevelNodes.13/@labels.1" visualID="DataType_FloatingNameLabel"/> </child> - <child - genView="/0/@diagram/@topLevelNodes.14" + <child genView="/0/@diagram/@topLevelNodes.14" visualID="Constraint_PackagedElementShape"> <child genView="/0/@diagram/@topLevelNodes.14/@labels.0" @@ -9292,22 +9012,19 @@ genView="/0/@diagram/@topLevelNodes.14/@labels.1" visualID="Constraint_BodyLabel"/> </child> - <child - genView="/0/@diagram/@topLevelNodes.15" + <child genView="/0/@diagram/@topLevelNodes.15" visualID="Comment_Shape"> <child genView="/0/@diagram/@topLevelNodes.15/@labels.0" visualID="Comment_BodyLabel"/> </child> - <child - genView="/0/@diagram/@topLevelNodes.16" + <child genView="/0/@diagram/@topLevelNodes.16" visualID="Diagram_ShortcutShape"> <child genView="/0/@diagram/@topLevelNodes.16/@labels.0" visualID="Diagram_NameLabel"/> </child> - <child - genView="/0/@diagram/@topLevelNodes.17" + <child genView="/0/@diagram/@topLevelNodes.17" visualID="DurationObservation_Shape"> <child genView="/0/@diagram/@topLevelNodes.17/@labels.0" @@ -9316,8 +9033,7 @@ genView="/0/@diagram/@topLevelNodes.17/@labels.1" visualID="DurationObservation_StereotypeLabel"/> </child> - <child - genView="/0/@diagram/@topLevelNodes.18" + <child genView="/0/@diagram/@topLevelNodes.18" visualID="TimeObservation_Shape"> <child genView="/0/@diagram/@topLevelNodes.18/@labels.0" @@ -9326,18 +9042,15 @@ genView="/0/@diagram/@topLevelNodes.18/@labels.1" visualID="TimeObservation_StereotypeLabel"/> </child> - <child - genView="/0/@diagram/@topLevelNodes.19" + <child genView="/0/@diagram/@topLevelNodes.19" visualID="NamedElement_DefaultShape"> <child genView="/0/@diagram/@topLevelNodes.19/@labels.0" visualID="NamedElement_NameLabel"/> </child> - <child - genView="/0/@diagram/@links.0" + <child genView="/0/@diagram/@links.0" visualID="AssociationClass_TetherEdge"/> - <child - genView="/0/@diagram/@links.1" + <child genView="/0/@diagram/@links.1" visualID="AssociationClass_Edge"> <child genView="/0/@diagram/@links.1/@labels.0" @@ -9346,8 +9059,7 @@ genView="/0/@diagram/@links.1/@labels.1" visualID="AssociationClass_TargetRoleLabel"/> </child> - <child - genView="/0/@diagram/@links.2" + <child genView="/0/@diagram/@links.2" visualID="Association_Edge"> <child genView="/0/@diagram/@links.2/@labels.0" @@ -9368,8 +9080,7 @@ genView="/0/@diagram/@links.2/@labels.5" visualID="Association_TargetMultiplicityLabel"/> </child> - <child - genView="/0/@diagram/@links.3" + <child genView="/0/@diagram/@links.3" visualID="Association_BranchEdge"> <child genView="/0/@diagram/@links.3/@labels.0" @@ -9378,15 +9089,13 @@ genView="/0/@diagram/@links.3/@labels.1" visualID="Association_BranchMultiplicityLabel"/> </child> - <child - genView="/0/@diagram/@links.4" + <child genView="/0/@diagram/@links.4" visualID="Generalization_Edge"> <child genView="/0/@diagram/@links.4/@labels.0" visualID="Generalization_StereotypeLabel"/> </child> - <child - genView="/0/@diagram/@links.5" + <child genView="/0/@diagram/@links.5" visualID="InterfaceRealization_Edge"> <child genView="/0/@diagram/@links.5/@labels.0" @@ -9395,8 +9104,7 @@ genView="/0/@diagram/@links.5/@labels.1" visualID="InterfaceRealization_NameLabel"/> </child> - <child - genView="/0/@diagram/@links.6" + <child genView="/0/@diagram/@links.6" visualID="Substitution_Edge"> <child genView="/0/@diagram/@links.6/@labels.0" @@ -9405,8 +9113,7 @@ genView="/0/@diagram/@links.6/@labels.1" visualID="Substitution_NameLabel"/> </child> - <child - genView="/0/@diagram/@links.7" + <child genView="/0/@diagram/@links.7" visualID="Realization_Edge"> <child genView="/0/@diagram/@links.7/@labels.0" @@ -9415,8 +9122,7 @@ genView="/0/@diagram/@links.7/@labels.1" visualID="Realization_NameLabel"/> </child> - <child - genView="/0/@diagram/@links.8" + <child genView="/0/@diagram/@links.8" visualID="Abstraction_Edge"> <child genView="/0/@diagram/@links.8/@labels.0" @@ -9425,8 +9131,7 @@ genView="/0/@diagram/@links.8/@labels.1" visualID="Abstraction_StereotypeLabel"/> </child> - <child - genView="/0/@diagram/@links.9" + <child genView="/0/@diagram/@links.9" visualID="Usage_Edge"> <child genView="/0/@diagram/@links.9/@labels.0" @@ -9435,8 +9140,7 @@ genView="/0/@diagram/@links.9/@labels.1" visualID="Usage_StereotypeLabel"/> </child> - <child - genView="/0/@diagram/@links.10" + <child genView="/0/@diagram/@links.10" visualID="Dependency_Edge"> <child genView="/0/@diagram/@links.10/@labels.0" @@ -9445,11 +9149,9 @@ genView="/0/@diagram/@links.10/@labels.1" visualID="Dependency_StereotypeLabel"/> </child> - <child - genView="/0/@diagram/@links.11" + <child genView="/0/@diagram/@links.11" visualID="Dependency_BranchEdge"/> - <child - genView="/0/@diagram/@links.12" + <child genView="/0/@diagram/@links.12" visualID="ElementImport_Edge"> <child genView="/0/@diagram/@links.12/@labels.0" @@ -9458,31 +9160,25 @@ genView="/0/@diagram/@links.12/@labels.1" visualID="ElementImport_StereotypeLabel"/> </child> - <child - genView="/0/@diagram/@links.13" + <child genView="/0/@diagram/@links.13" visualID="PackageImport_Edge"> <child genView="/0/@diagram/@links.13/@labels.0" visualID="PackageImport_StereotypeLabel"/> </child> - <child - genView="/0/@diagram/@links.14" + <child genView="/0/@diagram/@links.14" visualID="PackageMerge_Edge"> <child genView="/0/@diagram/@links.14/@labels.0" visualID="PackageMerge_StereotypeLabel"/> </child> - <child - genView="/0/@diagram/@links.15" + <child genView="/0/@diagram/@links.15" visualID="ProfileApplication_Edge"/> - <child - genView="/0/@diagram/@links.16" + <child genView="/0/@diagram/@links.16" visualID="Comment_AnnotatedElementEdge"/> - <child - genView="/0/@diagram/@links.17" + <child genView="/0/@diagram/@links.17" visualID="Constraint_ConstrainedElementEdge"/> - <child - genView="/0/@diagram/@links.18" + <child genView="/0/@diagram/@links.18" visualID="TemplateBinding_Edge"> <child genView="/0/@diagram/@links.18/@labels.0" @@ -9491,8 +9187,7 @@ genView="/0/@diagram/@links.18/@labels.1" visualID="TemplateBinding_StereotypeLabel"/> </child> - <child - genView="/0/@diagram/@links.19" + <child genView="/0/@diagram/@links.19" visualID="GeneralizationSet_Edge"> <child genView="/0/@diagram/@links.19/@labels.0" @@ -9501,8 +9196,7 @@ genView="/0/@diagram/@links.19/@labels.1" visualID="GeneralizationSet_StereotypeLabel"/> </child> - <child - genView="/0/@diagram/@links.20" + <child genView="/0/@diagram/@links.20" visualID="InstanceSpecification_Edge"> <child genView="/0/@diagram/@links.20/@labels.0" @@ -9511,17 +9205,13 @@ genView="/0/@diagram/@links.20/@labels.1" visualID="InstanceSpecification_TargetRoleLabel"/> </child> - <child - genView="/0/@diagram/@links.21" + <child genView="/0/@diagram/@links.21" visualID="Element_ContainmentEdge"/> - <child - genView="/0/@diagram/@links.22" + <child genView="/0/@diagram/@links.22" visualID="TimeObservation_EventEdge"/> - <child - genView="/0/@diagram/@links.23" + <child genView="/0/@diagram/@links.23" visualID="DurationObservation_EventEdge"/> - <child - genView="/0/@diagram/@links.24" + <child genView="/0/@diagram/@links.24" visualID="InformationFlow_Edge"> <child genView="/0/@diagram/@links.24/@labels.0" @@ -9533,8 +9223,7 @@ genView="/0/@diagram/@links.24/@labels.2" visualID="InformationFlow_NameLabel"/> </child> - <child - genView="/0/@diagram/@links.25" + <child genView="/0/@diagram/@links.25" visualID="Constraint_ContextEdge"> <child genView="/0/@diagram/@links.25/@labels.0" diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/pom.xml index 3135d25cab7..f715225e9d0 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/pom.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/pom.xml @@ -8,6 +8,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.diagram.clazz</artifactId> - <version>3.0.200-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/UMLBaseEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/UMLBaseEditHelper.java index b36bd37ab11..1dc4b0f4553 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/UMLBaseEditHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/helpers/UMLBaseEditHelper.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AbstractionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AbstractionEditPart.java index 58a01a50ec8..b1e24e0b33c 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AbstractionEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AbstractionEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -27,8 +27,8 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLink import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure; /** - * @generated - */ + * @generated + */ public class AbstractionEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart { /** @@ -46,11 +46,11 @@ public class AbstractionEditPart extends UMLConnectionNodeEditPart implements IT /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeLinkLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); } @@ -59,11 +59,12 @@ public class AbstractionEditPart extends UMLConnectionNodeEditPart implements IT */ protected boolean addFixedChild(EditPart childEditPart) { if (childEditPart instanceof AbstractionNameEditPart) { - ((AbstractionNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel()); + ((AbstractionNameEditPart) childEditPart).setLabel( + getPrimaryShape().getNameLabel()); } if (childEditPart instanceof AppliedStereotypeAbstractionEditPart) { - ((AppliedStereotypeAbstractionEditPart) childEditPart) - .setLabel(getPrimaryShape().getAppliedStereotypeLabel()); + ((AppliedStereotypeAbstractionEditPart) childEditPart).setLabel( + getPrimaryShape().getAppliedStereotypeLabel()); } return false; } @@ -71,6 +72,7 @@ public class AbstractionEditPart extends UMLConnectionNodeEditPart implements IT /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -94,6 +96,7 @@ public class AbstractionEditPart extends UMLConnectionNodeEditPart implements IT /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -103,12 +106,13 @@ public class AbstractionEditPart extends UMLConnectionNodeEditPart implements IT /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected Connection createConnectionFigure() { return new DashedEdgeFigure(); } @@ -116,6 +120,7 @@ public class AbstractionEditPart extends UMLConnectionNodeEditPart implements IT /** * @generated */ + @Override public DashedEdgeFigure getPrimaryShape() { return (DashedEdgeFigure) getFigure(); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AbstractionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AbstractionNameEditPart.java index d634b30f479..b452f3f5ea0 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AbstractionNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AbstractionNameEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,12 +64,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -114,12 +114,14 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -128,10 +130,7 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry - .getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionNameEditPart.VISUAL_ID), - new Point(0, 40)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AbstractionNameEditPart.VISUAL_ID), new Point(0, 40)); } /** @@ -155,6 +154,7 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public int getKeyPoint() { return ConnectionLocator.MIDDLE; } @@ -225,6 +225,7 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -232,6 +233,7 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -239,6 +241,7 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -264,7 +267,8 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -276,6 +280,7 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -291,11 +296,13 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -309,6 +316,7 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -318,13 +326,12 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), AbstractionNameEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), AbstractionNameEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -342,6 +349,7 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -352,6 +360,7 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -359,6 +368,7 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Abstraction_Edge, getParserElement(), this, VISUAL_ID); @@ -421,6 +431,7 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -448,18 +459,13 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -471,8 +477,7 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -498,10 +503,9 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -517,6 +521,7 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -558,7 +563,8 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -575,7 +581,8 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -584,11 +591,15 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -596,6 +607,7 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -603,6 +615,7 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -618,6 +631,7 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -631,6 +645,7 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -653,7 +668,7 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -672,7 +687,7 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -685,7 +700,7 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -695,43 +710,42 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -740,13 +754,11 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -763,6 +775,7 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -772,10 +785,10 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -799,6 +812,7 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -807,6 +821,7 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getLabelRole() { return "Name";//$NON-NLS-1$ } @@ -814,6 +829,7 @@ public class AbstractionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getIconPathRole() { return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png";//$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeAbstractionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeAbstractionEditPart.java index 52209124400..2d375984f59 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeAbstractionEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeAbstractionEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,12 +64,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -114,12 +114,14 @@ public class AppliedStereotypeAbstractionEditPart extends PapyrusLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -128,9 +130,7 @@ public class AppliedStereotypeAbstractionEditPart extends PapyrusLabelEditPart * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeAbstractionEditPart.VISUAL_ID), - new Point(0, 60)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeAbstractionEditPart.VISUAL_ID), new Point(0, 60)); } /** @@ -154,6 +154,7 @@ public class AppliedStereotypeAbstractionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public int getKeyPoint() { return ConnectionLocator.MIDDLE; } @@ -224,6 +225,7 @@ public class AppliedStereotypeAbstractionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -231,6 +233,7 @@ public class AppliedStereotypeAbstractionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -238,6 +241,7 @@ public class AppliedStereotypeAbstractionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -263,7 +267,8 @@ public class AppliedStereotypeAbstractionEditPart extends PapyrusLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -275,6 +280,7 @@ public class AppliedStereotypeAbstractionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -290,11 +296,13 @@ public class AppliedStereotypeAbstractionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -308,6 +316,7 @@ public class AppliedStereotypeAbstractionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -317,16 +326,12 @@ public class AppliedStereotypeAbstractionEditPart extends PapyrusLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - AppliedStereotypeAbstractionEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), AppliedStereotypeAbstractionEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -344,6 +349,7 @@ public class AppliedStereotypeAbstractionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -354,6 +360,7 @@ public class AppliedStereotypeAbstractionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -361,6 +368,7 @@ public class AppliedStereotypeAbstractionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Abstraction_Edge, getParserElement(), this, VISUAL_ID); @@ -423,6 +431,7 @@ public class AppliedStereotypeAbstractionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -450,18 +459,13 @@ public class AppliedStereotypeAbstractionEditPart extends PapyrusLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -473,8 +477,7 @@ public class AppliedStereotypeAbstractionEditPart extends PapyrusLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -500,10 +503,9 @@ public class AppliedStereotypeAbstractionEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -519,6 +521,7 @@ public class AppliedStereotypeAbstractionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -560,7 +563,8 @@ public class AppliedStereotypeAbstractionEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -577,7 +581,8 @@ public class AppliedStereotypeAbstractionEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -586,11 +591,15 @@ public class AppliedStereotypeAbstractionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -598,6 +607,7 @@ public class AppliedStereotypeAbstractionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -605,6 +615,7 @@ public class AppliedStereotypeAbstractionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -620,6 +631,7 @@ public class AppliedStereotypeAbstractionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -633,6 +645,7 @@ public class AppliedStereotypeAbstractionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -655,7 +668,7 @@ public class AppliedStereotypeAbstractionEditPart extends PapyrusLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -666,7 +679,7 @@ public class AppliedStereotypeAbstractionEditPart extends PapyrusLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -679,7 +692,7 @@ public class AppliedStereotypeAbstractionEditPart extends PapyrusLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -689,43 +702,42 @@ public class AppliedStereotypeAbstractionEditPart extends PapyrusLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -734,13 +746,11 @@ public class AppliedStereotypeAbstractionEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -757,6 +767,7 @@ public class AppliedStereotypeAbstractionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -766,10 +777,10 @@ public class AppliedStereotypeAbstractionEditPart extends PapyrusLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -793,6 +804,7 @@ public class AppliedStereotypeAbstractionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -801,6 +813,7 @@ public class AppliedStereotypeAbstractionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getLabelRole() { return "Stereotype";//$NON-NLS-1$ } @@ -808,6 +821,7 @@ public class AppliedStereotypeAbstractionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getIconPathRole() { return "platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Stereotype.gif";//$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeAssociationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeAssociationEditPart.java index 0759e95212d..309d938803b 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeAssociationEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeAssociationEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,12 +64,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -114,12 +114,14 @@ public class AppliedStereotypeAssociationEditPart extends PapyrusLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -128,9 +130,7 @@ public class AppliedStereotypeAssociationEditPart extends PapyrusLabelEditPart * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeAssociationEditPart.VISUAL_ID), - new Point(0, -20)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeAssociationEditPart.VISUAL_ID), new Point(0, -20)); } /** @@ -154,6 +154,7 @@ public class AppliedStereotypeAssociationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public int getKeyPoint() { return ConnectionLocator.MIDDLE; } @@ -224,6 +225,7 @@ public class AppliedStereotypeAssociationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -231,6 +233,7 @@ public class AppliedStereotypeAssociationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -238,6 +241,7 @@ public class AppliedStereotypeAssociationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -263,7 +267,8 @@ public class AppliedStereotypeAssociationEditPart extends PapyrusLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -275,6 +280,7 @@ public class AppliedStereotypeAssociationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -290,11 +296,13 @@ public class AppliedStereotypeAssociationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -308,6 +316,7 @@ public class AppliedStereotypeAssociationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -317,16 +326,12 @@ public class AppliedStereotypeAssociationEditPart extends PapyrusLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - AppliedStereotypeAssociationEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), AppliedStereotypeAssociationEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -344,6 +349,7 @@ public class AppliedStereotypeAssociationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -354,6 +360,7 @@ public class AppliedStereotypeAssociationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -361,6 +368,7 @@ public class AppliedStereotypeAssociationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Association_Edge, getParserElement(), this, VISUAL_ID); @@ -423,6 +431,7 @@ public class AppliedStereotypeAssociationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -450,18 +459,13 @@ public class AppliedStereotypeAssociationEditPart extends PapyrusLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -473,8 +477,7 @@ public class AppliedStereotypeAssociationEditPart extends PapyrusLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -500,10 +503,9 @@ public class AppliedStereotypeAssociationEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -519,6 +521,7 @@ public class AppliedStereotypeAssociationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -560,7 +563,8 @@ public class AppliedStereotypeAssociationEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -577,7 +581,8 @@ public class AppliedStereotypeAssociationEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -586,11 +591,15 @@ public class AppliedStereotypeAssociationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -598,6 +607,7 @@ public class AppliedStereotypeAssociationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -605,6 +615,7 @@ public class AppliedStereotypeAssociationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -620,6 +631,7 @@ public class AppliedStereotypeAssociationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -633,6 +645,7 @@ public class AppliedStereotypeAssociationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -655,7 +668,7 @@ public class AppliedStereotypeAssociationEditPart extends PapyrusLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -666,7 +679,7 @@ public class AppliedStereotypeAssociationEditPart extends PapyrusLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -679,7 +692,7 @@ public class AppliedStereotypeAssociationEditPart extends PapyrusLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -689,43 +702,42 @@ public class AppliedStereotypeAssociationEditPart extends PapyrusLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -734,13 +746,11 @@ public class AppliedStereotypeAssociationEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -757,6 +767,7 @@ public class AppliedStereotypeAssociationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -766,10 +777,10 @@ public class AppliedStereotypeAssociationEditPart extends PapyrusLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -793,6 +804,7 @@ public class AppliedStereotypeAssociationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -801,6 +813,7 @@ public class AppliedStereotypeAssociationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getLabelRole() { return "Stereotype";//$NON-NLS-1$ } @@ -808,6 +821,7 @@ public class AppliedStereotypeAssociationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getIconPathRole() { return "platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Stereotype.gif";//$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeDependencyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeDependencyEditPart.java index 3ddbc7cf2ad..d3a40807e82 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeDependencyEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeDependencyEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,12 +64,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -114,12 +114,14 @@ public class AppliedStereotypeDependencyEditPart extends PapyrusLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -128,10 +130,7 @@ public class AppliedStereotypeDependencyEditPart extends PapyrusLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeDependencyEditPart.VISUAL_ID), - new Point(0, 60)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeDependencyEditPart.VISUAL_ID), new Point(0, 60)); } /** @@ -155,6 +154,7 @@ public class AppliedStereotypeDependencyEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public int getKeyPoint() { return ConnectionLocator.MIDDLE; } @@ -225,6 +225,7 @@ public class AppliedStereotypeDependencyEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -232,6 +233,7 @@ public class AppliedStereotypeDependencyEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -239,6 +241,7 @@ public class AppliedStereotypeDependencyEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -264,7 +267,8 @@ public class AppliedStereotypeDependencyEditPart extends PapyrusLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -276,6 +280,7 @@ public class AppliedStereotypeDependencyEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -291,11 +296,13 @@ public class AppliedStereotypeDependencyEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -309,6 +316,7 @@ public class AppliedStereotypeDependencyEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -318,16 +326,12 @@ public class AppliedStereotypeDependencyEditPart extends PapyrusLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - AppliedStereotypeDependencyEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), AppliedStereotypeDependencyEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -345,6 +349,7 @@ public class AppliedStereotypeDependencyEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -355,6 +360,7 @@ public class AppliedStereotypeDependencyEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -362,6 +368,7 @@ public class AppliedStereotypeDependencyEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Dependency_Edge, getParserElement(), this, VISUAL_ID); @@ -424,6 +431,7 @@ public class AppliedStereotypeDependencyEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -451,18 +459,13 @@ public class AppliedStereotypeDependencyEditPart extends PapyrusLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -474,8 +477,7 @@ public class AppliedStereotypeDependencyEditPart extends PapyrusLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -501,10 +503,9 @@ public class AppliedStereotypeDependencyEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -520,6 +521,7 @@ public class AppliedStereotypeDependencyEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -561,7 +563,8 @@ public class AppliedStereotypeDependencyEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -578,7 +581,8 @@ public class AppliedStereotypeDependencyEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -587,11 +591,15 @@ public class AppliedStereotypeDependencyEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -599,6 +607,7 @@ public class AppliedStereotypeDependencyEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -606,6 +615,7 @@ public class AppliedStereotypeDependencyEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -621,6 +631,7 @@ public class AppliedStereotypeDependencyEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -634,6 +645,7 @@ public class AppliedStereotypeDependencyEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -656,7 +668,7 @@ public class AppliedStereotypeDependencyEditPart extends PapyrusLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -667,7 +679,7 @@ public class AppliedStereotypeDependencyEditPart extends PapyrusLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -680,7 +692,7 @@ public class AppliedStereotypeDependencyEditPart extends PapyrusLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -690,43 +702,42 @@ public class AppliedStereotypeDependencyEditPart extends PapyrusLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -735,13 +746,11 @@ public class AppliedStereotypeDependencyEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -758,6 +767,7 @@ public class AppliedStereotypeDependencyEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -767,10 +777,10 @@ public class AppliedStereotypeDependencyEditPart extends PapyrusLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -794,6 +804,7 @@ public class AppliedStereotypeDependencyEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -802,6 +813,7 @@ public class AppliedStereotypeDependencyEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getLabelRole() { return "Stereotype";//$NON-NLS-1$ } @@ -809,6 +821,7 @@ public class AppliedStereotypeDependencyEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getIconPathRole() { return "platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Stereotype.gif";//$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeElementImportEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeElementImportEditPart.java index d7f775a63bd..629d1719cf2 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeElementImportEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeElementImportEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,12 +64,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -114,12 +114,14 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -128,9 +130,7 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeElementImportEditPart.VISUAL_ID), - new Point(0, 60)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeElementImportEditPart.VISUAL_ID), new Point(0, 60)); } /** @@ -154,6 +154,7 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public int getKeyPoint() { return ConnectionLocator.MIDDLE; } @@ -224,6 +225,7 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -231,6 +233,7 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -238,6 +241,7 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -263,7 +267,8 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -275,6 +280,7 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -290,11 +296,13 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -308,6 +316,7 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -317,16 +326,12 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - AppliedStereotypeElementImportEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), AppliedStereotypeElementImportEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -344,6 +349,7 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -354,6 +360,7 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -361,6 +368,7 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.ElementImport_Edge, getParserElement(), this, VISUAL_ID); @@ -423,6 +431,7 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -450,18 +459,13 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -473,8 +477,7 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -500,10 +503,9 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -519,6 +521,7 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -560,7 +563,8 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -577,7 +581,8 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -586,11 +591,15 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -598,6 +607,7 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -605,6 +615,7 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -620,6 +631,7 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -633,6 +645,7 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -655,7 +668,7 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -666,7 +679,7 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -679,7 +692,7 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -689,43 +702,42 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -734,13 +746,11 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -757,6 +767,7 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -766,10 +777,10 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -793,6 +804,7 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -801,6 +813,7 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getLabelRole() { return "Stereotype";//$NON-NLS-1$ } @@ -808,6 +821,7 @@ public class AppliedStereotypeElementImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getIconPathRole() { return "platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Stereotype.gif";//$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeGeneralizationSetLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeGeneralizationSetLabelEditPart.java index dc24ae7a3c6..5c2cd220854 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeGeneralizationSetLabelEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeGeneralizationSetLabelEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,12 +64,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -114,12 +114,14 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends PapyrusLabe /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -128,9 +130,7 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends PapyrusLabe * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeGeneralizationSetLabelEditPart.VISUAL_ID), - new Point(0, 40)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeGeneralizationSetLabelEditPart.VISUAL_ID), new Point(0, 40)); } /** @@ -154,6 +154,7 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends PapyrusLabe /** * @generated */ + @Override public int getKeyPoint() { return ConnectionLocator.MIDDLE; } @@ -224,6 +225,7 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends PapyrusLabe /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -231,6 +233,7 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends PapyrusLabe /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -238,6 +241,7 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends PapyrusLabe /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -263,7 +267,8 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends PapyrusLabe String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -275,6 +280,7 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends PapyrusLabe /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -290,11 +296,13 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends PapyrusLabe /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -308,6 +316,7 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends PapyrusLabe /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -317,15 +326,12 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends PapyrusLabe final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - AppliedStereotypeGeneralizationSetLabelEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), AppliedStereotypeGeneralizationSetLabelEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -343,6 +349,7 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends PapyrusLabe /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -353,6 +360,7 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends PapyrusLabe /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -360,6 +368,7 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends PapyrusLabe /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.GeneralizationSet_Edge, getParserElement(), this, VISUAL_ID); @@ -422,6 +431,7 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends PapyrusLabe /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -449,18 +459,13 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends PapyrusLabe initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -472,8 +477,7 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends PapyrusLabe @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -499,10 +503,9 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends PapyrusLabe @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -518,6 +521,7 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends PapyrusLabe /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -559,7 +563,8 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends PapyrusLabe * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -576,7 +581,8 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends PapyrusLabe * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -585,11 +591,15 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends PapyrusLabe /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -597,6 +607,7 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends PapyrusLabe /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -604,6 +615,7 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends PapyrusLabe /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -619,6 +631,7 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends PapyrusLabe /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -632,6 +645,7 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends PapyrusLabe /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -654,7 +668,7 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends PapyrusLabe /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -673,7 +687,7 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends PapyrusLabe /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -686,7 +700,7 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends PapyrusLabe /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -696,43 +710,42 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends PapyrusLabe /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -741,13 +754,11 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends PapyrusLabe @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -764,6 +775,7 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends PapyrusLabe /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -773,10 +785,10 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends PapyrusLabe refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -800,6 +812,7 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends PapyrusLabe /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -808,6 +821,7 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends PapyrusLabe /** * @generated */ + @Override public String getLabelRole() { return "Stereotype";//$NON-NLS-1$ } @@ -815,6 +829,7 @@ public class AppliedStereotypeGeneralizationSetLabelEditPart extends PapyrusLabe /** * @generated */ + @Override public String getIconPathRole() { return "platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Stereotype.gif";//$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeInterfaceRealizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeInterfaceRealizationEditPart.java index d1ceb3d41ed..1fd828709d2 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeInterfaceRealizationEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeInterfaceRealizationEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,12 +64,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -114,12 +114,14 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends PapyrusLabelE /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -128,9 +130,7 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends PapyrusLabelE * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeInterfaceRealizationEditPart.VISUAL_ID), - new Point(0, 40)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeInterfaceRealizationEditPart.VISUAL_ID), new Point(0, 40)); } /** @@ -154,6 +154,7 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends PapyrusLabelE /** * @generated */ + @Override public int getKeyPoint() { return ConnectionLocator.MIDDLE; } @@ -224,6 +225,7 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends PapyrusLabelE /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -231,6 +233,7 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends PapyrusLabelE /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -238,6 +241,7 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends PapyrusLabelE /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -263,7 +267,8 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends PapyrusLabelE String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -275,6 +280,7 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends PapyrusLabelE /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -290,11 +296,13 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends PapyrusLabelE /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -308,6 +316,7 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends PapyrusLabelE /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -317,15 +326,12 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends PapyrusLabelE final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - AppliedStereotypeInterfaceRealizationEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), AppliedStereotypeInterfaceRealizationEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -343,6 +349,7 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends PapyrusLabelE /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -353,6 +360,7 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends PapyrusLabelE /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -360,10 +368,10 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends PapyrusLabelE /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.InterfaceRealization_Edge, getParserElement(), this, - VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.InterfaceRealization_Edge, getParserElement(), this, VISUAL_ID); } return parser; } @@ -423,6 +431,7 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends PapyrusLabelE /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -450,18 +459,13 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends PapyrusLabelE initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -473,8 +477,7 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends PapyrusLabelE @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -500,10 +503,9 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends PapyrusLabelE @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -519,6 +521,7 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends PapyrusLabelE /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -560,7 +563,8 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends PapyrusLabelE * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -577,7 +581,8 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends PapyrusLabelE * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -586,11 +591,15 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends PapyrusLabelE /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -598,6 +607,7 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends PapyrusLabelE /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -605,6 +615,7 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends PapyrusLabelE /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -620,6 +631,7 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends PapyrusLabelE /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -633,6 +645,7 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends PapyrusLabelE /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -655,7 +668,7 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends PapyrusLabelE /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -666,7 +679,7 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends PapyrusLabelE /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -679,7 +692,7 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends PapyrusLabelE /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -689,43 +702,42 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends PapyrusLabelE /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -734,13 +746,11 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends PapyrusLabelE @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -757,6 +767,7 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends PapyrusLabelE /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -766,10 +777,10 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends PapyrusLabelE refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -793,6 +804,7 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends PapyrusLabelE /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -801,6 +813,7 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends PapyrusLabelE /** * @generated */ + @Override public String getLabelRole() { return "Stereotype";//$NON-NLS-1$ } @@ -808,6 +821,7 @@ public class AppliedStereotypeInterfaceRealizationEditPart extends PapyrusLabelE /** * @generated */ + @Override public String getIconPathRole() { return "platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Stereotype.gif";//$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypePackageImportEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypePackageImportEditPart.java index f61b9de82f1..efa0a4b08ce 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypePackageImportEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypePackageImportEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,12 +64,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -114,12 +114,14 @@ public class AppliedStereotypePackageImportEditPart extends PapyrusLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -128,9 +130,7 @@ public class AppliedStereotypePackageImportEditPart extends PapyrusLabelEditPart * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypePackageImportEditPart.VISUAL_ID), - new Point(0, 40)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypePackageImportEditPart.VISUAL_ID), new Point(0, 40)); } /** @@ -154,6 +154,7 @@ public class AppliedStereotypePackageImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public int getKeyPoint() { return ConnectionLocator.MIDDLE; } @@ -224,6 +225,7 @@ public class AppliedStereotypePackageImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -231,6 +233,7 @@ public class AppliedStereotypePackageImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -238,6 +241,7 @@ public class AppliedStereotypePackageImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -263,7 +267,8 @@ public class AppliedStereotypePackageImportEditPart extends PapyrusLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -275,6 +280,7 @@ public class AppliedStereotypePackageImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -290,11 +296,13 @@ public class AppliedStereotypePackageImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -308,6 +316,7 @@ public class AppliedStereotypePackageImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -317,16 +326,12 @@ public class AppliedStereotypePackageImportEditPart extends PapyrusLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - AppliedStereotypePackageImportEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), AppliedStereotypePackageImportEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -344,6 +349,7 @@ public class AppliedStereotypePackageImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -354,6 +360,7 @@ public class AppliedStereotypePackageImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -361,6 +368,7 @@ public class AppliedStereotypePackageImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.PackageImport_Edge, getParserElement(), this, VISUAL_ID); @@ -423,6 +431,7 @@ public class AppliedStereotypePackageImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -450,18 +459,13 @@ public class AppliedStereotypePackageImportEditPart extends PapyrusLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -473,8 +477,7 @@ public class AppliedStereotypePackageImportEditPart extends PapyrusLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -500,10 +503,9 @@ public class AppliedStereotypePackageImportEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -519,6 +521,7 @@ public class AppliedStereotypePackageImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -560,7 +563,8 @@ public class AppliedStereotypePackageImportEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -577,7 +581,8 @@ public class AppliedStereotypePackageImportEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -586,11 +591,15 @@ public class AppliedStereotypePackageImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -598,6 +607,7 @@ public class AppliedStereotypePackageImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -605,6 +615,7 @@ public class AppliedStereotypePackageImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -620,6 +631,7 @@ public class AppliedStereotypePackageImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -633,6 +645,7 @@ public class AppliedStereotypePackageImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -655,7 +668,7 @@ public class AppliedStereotypePackageImportEditPart extends PapyrusLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -666,7 +679,7 @@ public class AppliedStereotypePackageImportEditPart extends PapyrusLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -679,7 +692,7 @@ public class AppliedStereotypePackageImportEditPart extends PapyrusLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -689,43 +702,42 @@ public class AppliedStereotypePackageImportEditPart extends PapyrusLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -734,13 +746,11 @@ public class AppliedStereotypePackageImportEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -757,6 +767,7 @@ public class AppliedStereotypePackageImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -766,10 +777,10 @@ public class AppliedStereotypePackageImportEditPart extends PapyrusLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -793,6 +804,7 @@ public class AppliedStereotypePackageImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -801,6 +813,7 @@ public class AppliedStereotypePackageImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getLabelRole() { return "Stereotype";//$NON-NLS-1$ } @@ -808,6 +821,7 @@ public class AppliedStereotypePackageImportEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getIconPathRole() { return "platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Stereotype.gif";//$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypePackageMergeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypePackageMergeEditPart.java index 9ee9a18717c..c023e5e65ec 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypePackageMergeEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypePackageMergeEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,12 +64,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -114,12 +114,14 @@ public class AppliedStereotypePackageMergeEditPart extends PapyrusLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -128,9 +130,7 @@ public class AppliedStereotypePackageMergeEditPart extends PapyrusLabelEditPart * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypePackageMergeEditPart.VISUAL_ID), - new Point(0, 40)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypePackageMergeEditPart.VISUAL_ID), new Point(0, 40)); } /** @@ -154,6 +154,7 @@ public class AppliedStereotypePackageMergeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public int getKeyPoint() { return ConnectionLocator.MIDDLE; } @@ -224,6 +225,7 @@ public class AppliedStereotypePackageMergeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -231,6 +233,7 @@ public class AppliedStereotypePackageMergeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -238,6 +241,7 @@ public class AppliedStereotypePackageMergeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -263,7 +267,8 @@ public class AppliedStereotypePackageMergeEditPart extends PapyrusLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -275,6 +280,7 @@ public class AppliedStereotypePackageMergeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -290,11 +296,13 @@ public class AppliedStereotypePackageMergeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -308,6 +316,7 @@ public class AppliedStereotypePackageMergeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -317,16 +326,12 @@ public class AppliedStereotypePackageMergeEditPart extends PapyrusLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - AppliedStereotypePackageMergeEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), AppliedStereotypePackageMergeEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -344,6 +349,7 @@ public class AppliedStereotypePackageMergeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -354,6 +360,7 @@ public class AppliedStereotypePackageMergeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -361,6 +368,7 @@ public class AppliedStereotypePackageMergeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.PackageMerge_Edge, getParserElement(), this, VISUAL_ID); @@ -423,6 +431,7 @@ public class AppliedStereotypePackageMergeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -450,18 +459,13 @@ public class AppliedStereotypePackageMergeEditPart extends PapyrusLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -473,8 +477,7 @@ public class AppliedStereotypePackageMergeEditPart extends PapyrusLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -500,10 +503,9 @@ public class AppliedStereotypePackageMergeEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -519,6 +521,7 @@ public class AppliedStereotypePackageMergeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -560,7 +563,8 @@ public class AppliedStereotypePackageMergeEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -577,7 +581,8 @@ public class AppliedStereotypePackageMergeEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -586,11 +591,15 @@ public class AppliedStereotypePackageMergeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -598,6 +607,7 @@ public class AppliedStereotypePackageMergeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -605,6 +615,7 @@ public class AppliedStereotypePackageMergeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -620,6 +631,7 @@ public class AppliedStereotypePackageMergeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -633,6 +645,7 @@ public class AppliedStereotypePackageMergeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -655,7 +668,7 @@ public class AppliedStereotypePackageMergeEditPart extends PapyrusLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -666,7 +679,7 @@ public class AppliedStereotypePackageMergeEditPart extends PapyrusLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -679,7 +692,7 @@ public class AppliedStereotypePackageMergeEditPart extends PapyrusLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -689,43 +702,42 @@ public class AppliedStereotypePackageMergeEditPart extends PapyrusLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -734,13 +746,11 @@ public class AppliedStereotypePackageMergeEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -757,6 +767,7 @@ public class AppliedStereotypePackageMergeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -766,10 +777,10 @@ public class AppliedStereotypePackageMergeEditPart extends PapyrusLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -793,6 +804,7 @@ public class AppliedStereotypePackageMergeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -801,6 +813,7 @@ public class AppliedStereotypePackageMergeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getLabelRole() { return "Stereotype";//$NON-NLS-1$ } @@ -808,6 +821,7 @@ public class AppliedStereotypePackageMergeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getIconPathRole() { return "platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Stereotype.gif";//$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeRealizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeRealizationEditPart.java index 6de3828924e..f9d4f31ec45 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeRealizationEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeRealizationEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,12 +64,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -114,12 +114,14 @@ public class AppliedStereotypeRealizationEditPart extends PapyrusLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -128,9 +130,7 @@ public class AppliedStereotypeRealizationEditPart extends PapyrusLabelEditPart * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeRealizationEditPart.VISUAL_ID), - new Point(0, 40)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeRealizationEditPart.VISUAL_ID), new Point(0, 40)); } /** @@ -154,6 +154,7 @@ public class AppliedStereotypeRealizationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public int getKeyPoint() { return ConnectionLocator.MIDDLE; } @@ -224,6 +225,7 @@ public class AppliedStereotypeRealizationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -231,6 +233,7 @@ public class AppliedStereotypeRealizationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -238,6 +241,7 @@ public class AppliedStereotypeRealizationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -263,7 +267,8 @@ public class AppliedStereotypeRealizationEditPart extends PapyrusLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -275,6 +280,7 @@ public class AppliedStereotypeRealizationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -290,11 +296,13 @@ public class AppliedStereotypeRealizationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -308,6 +316,7 @@ public class AppliedStereotypeRealizationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -317,16 +326,12 @@ public class AppliedStereotypeRealizationEditPart extends PapyrusLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - AppliedStereotypeRealizationEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), AppliedStereotypeRealizationEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -344,6 +349,7 @@ public class AppliedStereotypeRealizationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -354,6 +360,7 @@ public class AppliedStereotypeRealizationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -361,6 +368,7 @@ public class AppliedStereotypeRealizationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Realization_Edge, getParserElement(), this, VISUAL_ID); @@ -423,6 +431,7 @@ public class AppliedStereotypeRealizationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -450,18 +459,13 @@ public class AppliedStereotypeRealizationEditPart extends PapyrusLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -473,8 +477,7 @@ public class AppliedStereotypeRealizationEditPart extends PapyrusLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -500,10 +503,9 @@ public class AppliedStereotypeRealizationEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -519,6 +521,7 @@ public class AppliedStereotypeRealizationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -560,7 +563,8 @@ public class AppliedStereotypeRealizationEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -577,7 +581,8 @@ public class AppliedStereotypeRealizationEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -586,11 +591,15 @@ public class AppliedStereotypeRealizationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -598,6 +607,7 @@ public class AppliedStereotypeRealizationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -605,6 +615,7 @@ public class AppliedStereotypeRealizationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -620,6 +631,7 @@ public class AppliedStereotypeRealizationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -633,6 +645,7 @@ public class AppliedStereotypeRealizationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -655,7 +668,7 @@ public class AppliedStereotypeRealizationEditPart extends PapyrusLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -666,7 +679,7 @@ public class AppliedStereotypeRealizationEditPart extends PapyrusLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -679,7 +692,7 @@ public class AppliedStereotypeRealizationEditPart extends PapyrusLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -689,43 +702,42 @@ public class AppliedStereotypeRealizationEditPart extends PapyrusLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -734,13 +746,11 @@ public class AppliedStereotypeRealizationEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -757,6 +767,7 @@ public class AppliedStereotypeRealizationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -766,10 +777,10 @@ public class AppliedStereotypeRealizationEditPart extends PapyrusLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -793,6 +804,7 @@ public class AppliedStereotypeRealizationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -801,6 +813,7 @@ public class AppliedStereotypeRealizationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getLabelRole() { return "Stereotype";//$NON-NLS-1$ } @@ -808,6 +821,7 @@ public class AppliedStereotypeRealizationEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getIconPathRole() { return "platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Stereotype.gif";//$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeSubstitutionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeSubstitutionEditPart.java index a986284f05e..2829d1a4e42 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeSubstitutionEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeSubstitutionEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,12 +64,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -114,12 +114,14 @@ public class AppliedStereotypeSubstitutionEditPart extends PapyrusLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -128,9 +130,7 @@ public class AppliedStereotypeSubstitutionEditPart extends PapyrusLabelEditPart * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeSubstitutionEditPart.VISUAL_ID), - new Point(0, 40)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeSubstitutionEditPart.VISUAL_ID), new Point(0, 40)); } /** @@ -154,6 +154,7 @@ public class AppliedStereotypeSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public int getKeyPoint() { return ConnectionLocator.MIDDLE; } @@ -224,6 +225,7 @@ public class AppliedStereotypeSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -231,6 +233,7 @@ public class AppliedStereotypeSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -238,6 +241,7 @@ public class AppliedStereotypeSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -263,7 +267,8 @@ public class AppliedStereotypeSubstitutionEditPart extends PapyrusLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -275,6 +280,7 @@ public class AppliedStereotypeSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -290,11 +296,13 @@ public class AppliedStereotypeSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -308,6 +316,7 @@ public class AppliedStereotypeSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -317,16 +326,12 @@ public class AppliedStereotypeSubstitutionEditPart extends PapyrusLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - AppliedStereotypeSubstitutionEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), AppliedStereotypeSubstitutionEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -344,6 +349,7 @@ public class AppliedStereotypeSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -354,6 +360,7 @@ public class AppliedStereotypeSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -361,6 +368,7 @@ public class AppliedStereotypeSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Substitution_Edge, getParserElement(), this, VISUAL_ID); @@ -423,6 +431,7 @@ public class AppliedStereotypeSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -450,18 +459,13 @@ public class AppliedStereotypeSubstitutionEditPart extends PapyrusLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -473,8 +477,7 @@ public class AppliedStereotypeSubstitutionEditPart extends PapyrusLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -500,10 +503,9 @@ public class AppliedStereotypeSubstitutionEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -519,6 +521,7 @@ public class AppliedStereotypeSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -560,7 +563,8 @@ public class AppliedStereotypeSubstitutionEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -577,7 +581,8 @@ public class AppliedStereotypeSubstitutionEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -586,11 +591,15 @@ public class AppliedStereotypeSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -598,6 +607,7 @@ public class AppliedStereotypeSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -605,6 +615,7 @@ public class AppliedStereotypeSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -620,6 +631,7 @@ public class AppliedStereotypeSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -633,6 +645,7 @@ public class AppliedStereotypeSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -655,7 +668,7 @@ public class AppliedStereotypeSubstitutionEditPart extends PapyrusLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -666,7 +679,7 @@ public class AppliedStereotypeSubstitutionEditPart extends PapyrusLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -679,7 +692,7 @@ public class AppliedStereotypeSubstitutionEditPart extends PapyrusLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -689,43 +702,42 @@ public class AppliedStereotypeSubstitutionEditPart extends PapyrusLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -734,13 +746,11 @@ public class AppliedStereotypeSubstitutionEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -757,6 +767,7 @@ public class AppliedStereotypeSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -766,10 +777,10 @@ public class AppliedStereotypeSubstitutionEditPart extends PapyrusLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -793,6 +804,7 @@ public class AppliedStereotypeSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -801,6 +813,7 @@ public class AppliedStereotypeSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getLabelRole() { return "Stereotype";//$NON-NLS-1$ } @@ -808,6 +821,7 @@ public class AppliedStereotypeSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getIconPathRole() { return "platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Stereotype.gif";//$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeTemplateBindingEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeTemplateBindingEditPart.java index 971ddea759c..c2df47574fc 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeTemplateBindingEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeTemplateBindingEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,12 +64,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -114,12 +114,14 @@ public class AppliedStereotypeTemplateBindingEditPart extends PapyrusLabelEditPa /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -128,9 +130,7 @@ public class AppliedStereotypeTemplateBindingEditPart extends PapyrusLabelEditPa * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeTemplateBindingEditPart.VISUAL_ID), - new Point(0, 20)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeTemplateBindingEditPart.VISUAL_ID), new Point(0, 20)); } /** @@ -154,6 +154,7 @@ public class AppliedStereotypeTemplateBindingEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override public int getKeyPoint() { return ConnectionLocator.MIDDLE; } @@ -224,6 +225,7 @@ public class AppliedStereotypeTemplateBindingEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -231,6 +233,7 @@ public class AppliedStereotypeTemplateBindingEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -238,6 +241,7 @@ public class AppliedStereotypeTemplateBindingEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -263,7 +267,8 @@ public class AppliedStereotypeTemplateBindingEditPart extends PapyrusLabelEditPa String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -275,6 +280,7 @@ public class AppliedStereotypeTemplateBindingEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -290,11 +296,13 @@ public class AppliedStereotypeTemplateBindingEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -308,6 +316,7 @@ public class AppliedStereotypeTemplateBindingEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -317,15 +326,12 @@ public class AppliedStereotypeTemplateBindingEditPart extends PapyrusLabelEditPa final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - AppliedStereotypeTemplateBindingEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), AppliedStereotypeTemplateBindingEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -343,6 +349,7 @@ public class AppliedStereotypeTemplateBindingEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -353,6 +360,7 @@ public class AppliedStereotypeTemplateBindingEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -360,6 +368,7 @@ public class AppliedStereotypeTemplateBindingEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.TemplateBinding_Edge, getParserElement(), this, VISUAL_ID); @@ -422,6 +431,7 @@ public class AppliedStereotypeTemplateBindingEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -449,18 +459,13 @@ public class AppliedStereotypeTemplateBindingEditPart extends PapyrusLabelEditPa initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -472,8 +477,7 @@ public class AppliedStereotypeTemplateBindingEditPart extends PapyrusLabelEditPa @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -499,10 +503,9 @@ public class AppliedStereotypeTemplateBindingEditPart extends PapyrusLabelEditPa @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -518,6 +521,7 @@ public class AppliedStereotypeTemplateBindingEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -559,7 +563,8 @@ public class AppliedStereotypeTemplateBindingEditPart extends PapyrusLabelEditPa * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -576,7 +581,8 @@ public class AppliedStereotypeTemplateBindingEditPart extends PapyrusLabelEditPa * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -585,11 +591,15 @@ public class AppliedStereotypeTemplateBindingEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -597,6 +607,7 @@ public class AppliedStereotypeTemplateBindingEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -604,6 +615,7 @@ public class AppliedStereotypeTemplateBindingEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -619,6 +631,7 @@ public class AppliedStereotypeTemplateBindingEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -632,6 +645,7 @@ public class AppliedStereotypeTemplateBindingEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -654,7 +668,7 @@ public class AppliedStereotypeTemplateBindingEditPart extends PapyrusLabelEditPa /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -665,7 +679,7 @@ public class AppliedStereotypeTemplateBindingEditPart extends PapyrusLabelEditPa /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -678,7 +692,7 @@ public class AppliedStereotypeTemplateBindingEditPart extends PapyrusLabelEditPa /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -688,43 +702,42 @@ public class AppliedStereotypeTemplateBindingEditPart extends PapyrusLabelEditPa /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -733,13 +746,11 @@ public class AppliedStereotypeTemplateBindingEditPart extends PapyrusLabelEditPa @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -756,6 +767,7 @@ public class AppliedStereotypeTemplateBindingEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -765,10 +777,10 @@ public class AppliedStereotypeTemplateBindingEditPart extends PapyrusLabelEditPa refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -792,6 +804,7 @@ public class AppliedStereotypeTemplateBindingEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -800,6 +813,7 @@ public class AppliedStereotypeTemplateBindingEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override public String getLabelRole() { return "Stereotype";//$NON-NLS-1$ } @@ -807,6 +821,7 @@ public class AppliedStereotypeTemplateBindingEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override public String getIconPathRole() { return "platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Stereotype.gif";//$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeUsageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeUsageEditPart.java index e71b400da14..09fd19ce596 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeUsageEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotypeUsageEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,12 +64,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -114,12 +114,14 @@ public class AppliedStereotypeUsageEditPart extends PapyrusLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -128,10 +130,7 @@ public class AppliedStereotypeUsageEditPart extends PapyrusLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeUsageEditPart.VISUAL_ID), - new Point(0, 60)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotypeUsageEditPart.VISUAL_ID), new Point(0, 60)); } /** @@ -155,6 +154,7 @@ public class AppliedStereotypeUsageEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public int getKeyPoint() { return ConnectionLocator.MIDDLE; } @@ -225,6 +225,7 @@ public class AppliedStereotypeUsageEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -232,6 +233,7 @@ public class AppliedStereotypeUsageEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -239,6 +241,7 @@ public class AppliedStereotypeUsageEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -264,7 +267,8 @@ public class AppliedStereotypeUsageEditPart extends PapyrusLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -276,6 +280,7 @@ public class AppliedStereotypeUsageEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -291,11 +296,13 @@ public class AppliedStereotypeUsageEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -309,6 +316,7 @@ public class AppliedStereotypeUsageEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -318,14 +326,12 @@ public class AppliedStereotypeUsageEditPart extends PapyrusLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), - AppliedStereotypeUsageEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), AppliedStereotypeUsageEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -343,6 +349,7 @@ public class AppliedStereotypeUsageEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -353,6 +360,7 @@ public class AppliedStereotypeUsageEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -360,6 +368,7 @@ public class AppliedStereotypeUsageEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Usage_Edge, getParserElement(), this, VISUAL_ID); @@ -422,6 +431,7 @@ public class AppliedStereotypeUsageEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -449,18 +459,13 @@ public class AppliedStereotypeUsageEditPart extends PapyrusLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -472,8 +477,7 @@ public class AppliedStereotypeUsageEditPart extends PapyrusLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -499,10 +503,9 @@ public class AppliedStereotypeUsageEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -518,6 +521,7 @@ public class AppliedStereotypeUsageEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -559,7 +563,8 @@ public class AppliedStereotypeUsageEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -576,7 +581,8 @@ public class AppliedStereotypeUsageEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -585,11 +591,15 @@ public class AppliedStereotypeUsageEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -597,6 +607,7 @@ public class AppliedStereotypeUsageEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -604,6 +615,7 @@ public class AppliedStereotypeUsageEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -619,6 +631,7 @@ public class AppliedStereotypeUsageEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -632,6 +645,7 @@ public class AppliedStereotypeUsageEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -654,7 +668,7 @@ public class AppliedStereotypeUsageEditPart extends PapyrusLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -665,7 +679,7 @@ public class AppliedStereotypeUsageEditPart extends PapyrusLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -678,7 +692,7 @@ public class AppliedStereotypeUsageEditPart extends PapyrusLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -688,43 +702,42 @@ public class AppliedStereotypeUsageEditPart extends PapyrusLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -733,13 +746,11 @@ public class AppliedStereotypeUsageEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -756,6 +767,7 @@ public class AppliedStereotypeUsageEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -765,10 +777,10 @@ public class AppliedStereotypeUsageEditPart extends PapyrusLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -792,6 +804,7 @@ public class AppliedStereotypeUsageEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -800,6 +813,7 @@ public class AppliedStereotypeUsageEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getLabelRole() { return "Stereotype";//$NON-NLS-1$ } @@ -807,6 +821,7 @@ public class AppliedStereotypeUsageEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getIconPathRole() { return "platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Stereotype.gif";//$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotyperGeneralizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotyperGeneralizationEditPart.java index 29f49c6c882..a3f81742a23 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotyperGeneralizationEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AppliedStereotyperGeneralizationEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,12 +64,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -114,12 +114,14 @@ public class AppliedStereotyperGeneralizationEditPart extends PapyrusLabelEditPa /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -128,9 +130,7 @@ public class AppliedStereotyperGeneralizationEditPart extends PapyrusLabelEditPa * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotyperGeneralizationEditPart.VISUAL_ID), - new Point(0, 40)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AppliedStereotyperGeneralizationEditPart.VISUAL_ID), new Point(0, 40)); } /** @@ -154,6 +154,7 @@ public class AppliedStereotyperGeneralizationEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override public int getKeyPoint() { return ConnectionLocator.MIDDLE; } @@ -224,6 +225,7 @@ public class AppliedStereotyperGeneralizationEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -231,6 +233,7 @@ public class AppliedStereotyperGeneralizationEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -238,6 +241,7 @@ public class AppliedStereotyperGeneralizationEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -263,7 +267,8 @@ public class AppliedStereotyperGeneralizationEditPart extends PapyrusLabelEditPa String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -275,6 +280,7 @@ public class AppliedStereotyperGeneralizationEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -290,11 +296,13 @@ public class AppliedStereotyperGeneralizationEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -308,6 +316,7 @@ public class AppliedStereotyperGeneralizationEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -317,15 +326,12 @@ public class AppliedStereotyperGeneralizationEditPart extends PapyrusLabelEditPa final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - AppliedStereotyperGeneralizationEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), AppliedStereotyperGeneralizationEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -343,6 +349,7 @@ public class AppliedStereotyperGeneralizationEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -353,6 +360,7 @@ public class AppliedStereotyperGeneralizationEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -360,6 +368,7 @@ public class AppliedStereotyperGeneralizationEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Generalization_Edge, getParserElement(), this, VISUAL_ID); @@ -422,6 +431,7 @@ public class AppliedStereotyperGeneralizationEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -449,18 +459,13 @@ public class AppliedStereotyperGeneralizationEditPart extends PapyrusLabelEditPa initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -472,8 +477,7 @@ public class AppliedStereotyperGeneralizationEditPart extends PapyrusLabelEditPa @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -499,10 +503,9 @@ public class AppliedStereotyperGeneralizationEditPart extends PapyrusLabelEditPa @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -518,6 +521,7 @@ public class AppliedStereotyperGeneralizationEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -559,7 +563,8 @@ public class AppliedStereotyperGeneralizationEditPart extends PapyrusLabelEditPa * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -576,7 +581,8 @@ public class AppliedStereotyperGeneralizationEditPart extends PapyrusLabelEditPa * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -585,11 +591,15 @@ public class AppliedStereotyperGeneralizationEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -597,6 +607,7 @@ public class AppliedStereotyperGeneralizationEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -604,6 +615,7 @@ public class AppliedStereotyperGeneralizationEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -619,6 +631,7 @@ public class AppliedStereotyperGeneralizationEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -632,6 +645,7 @@ public class AppliedStereotyperGeneralizationEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -654,7 +668,7 @@ public class AppliedStereotyperGeneralizationEditPart extends PapyrusLabelEditPa /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -665,7 +679,7 @@ public class AppliedStereotyperGeneralizationEditPart extends PapyrusLabelEditPa /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -678,7 +692,7 @@ public class AppliedStereotyperGeneralizationEditPart extends PapyrusLabelEditPa /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -688,43 +702,42 @@ public class AppliedStereotyperGeneralizationEditPart extends PapyrusLabelEditPa /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -733,13 +746,11 @@ public class AppliedStereotyperGeneralizationEditPart extends PapyrusLabelEditPa @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -756,6 +767,7 @@ public class AppliedStereotyperGeneralizationEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -765,10 +777,10 @@ public class AppliedStereotyperGeneralizationEditPart extends PapyrusLabelEditPa refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -792,6 +804,7 @@ public class AppliedStereotyperGeneralizationEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -800,6 +813,7 @@ public class AppliedStereotyperGeneralizationEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override public String getLabelRole() { return "Stereotype";//$NON-NLS-1$ } @@ -807,6 +821,7 @@ public class AppliedStereotyperGeneralizationEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override public String getIconPathRole() { return "platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Stereotype.gif";//$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationBranchEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationBranchEditPart.java index 9c454bacd9a..d7de37f091b 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationBranchEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationBranchEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -25,8 +25,8 @@ import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNode import org.eclipse.papyrus.uml.diagram.common.figure.edge.AssociationFigure; /** - * @generated - */ + * @generated + */ public class AssociationBranchEditPart extends AbstractAssociationBranchEditPart implements ITreeBranchEditPart { /** @@ -44,6 +44,7 @@ public class AssociationBranchEditPart extends AbstractAssociationBranchEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); @@ -55,11 +56,12 @@ public class AssociationBranchEditPart extends AbstractAssociationBranchEditPart */ protected boolean addFixedChild(EditPart childEditPart) { if (childEditPart instanceof AssociationBranchRoleEditPart) { - ((AssociationBranchRoleEditPart) childEditPart).setLabel(getPrimaryShape().getRoleSourceLabel()); + ((AssociationBranchRoleEditPart) childEditPart).setLabel( + getPrimaryShape().getRoleSourceLabel()); } if (childEditPart instanceof AssociationBranchMutliplicityEditPart) { - ((AssociationBranchMutliplicityEditPart) childEditPart) - .setLabel(getPrimaryShape().getMultiplicitySourceLabel()); + ((AssociationBranchMutliplicityEditPart) childEditPart).setLabel( + getPrimaryShape().getMultiplicitySourceLabel()); } return false; } @@ -67,6 +69,7 @@ public class AssociationBranchEditPart extends AbstractAssociationBranchEditPart /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -90,6 +93,7 @@ public class AssociationBranchEditPart extends AbstractAssociationBranchEditPart /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -99,12 +103,13 @@ public class AssociationBranchEditPart extends AbstractAssociationBranchEditPart /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected Connection createConnectionFigure() { return new AssociationFigure(); } @@ -112,6 +117,7 @@ public class AssociationBranchEditPart extends AbstractAssociationBranchEditPart /** * @generated */ + @Override public AssociationFigure getPrimaryShape() { return (AssociationFigure) getFigure(); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationBranchMutliplicityEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationBranchMutliplicityEditPart.java index a00e8f2fab6..8c0d01b3c75 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationBranchMutliplicityEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationBranchMutliplicityEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,12 +64,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -115,12 +115,14 @@ public class AssociationBranchMutliplicityEditPart extends PapyrusLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -129,9 +131,7 @@ public class AssociationBranchMutliplicityEditPart extends PapyrusLabelEditPart * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchMutliplicityEditPart.VISUAL_ID), - new Point(0, 20)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchMutliplicityEditPart.VISUAL_ID), new Point(0, 20)); } /** @@ -157,6 +157,7 @@ public class AssociationBranchMutliplicityEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public int getKeyPoint() { return ConnectionLocator.SOURCE; } @@ -227,6 +228,7 @@ public class AssociationBranchMutliplicityEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -234,6 +236,7 @@ public class AssociationBranchMutliplicityEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -241,6 +244,7 @@ public class AssociationBranchMutliplicityEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -266,7 +270,8 @@ public class AssociationBranchMutliplicityEditPart extends PapyrusLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -278,6 +283,7 @@ public class AssociationBranchMutliplicityEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -293,11 +299,13 @@ public class AssociationBranchMutliplicityEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -311,6 +319,7 @@ public class AssociationBranchMutliplicityEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -320,16 +329,12 @@ public class AssociationBranchMutliplicityEditPart extends PapyrusLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - AssociationBranchMutliplicityEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), AssociationBranchMutliplicityEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -347,6 +352,7 @@ public class AssociationBranchMutliplicityEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -357,6 +363,7 @@ public class AssociationBranchMutliplicityEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -364,6 +371,7 @@ public class AssociationBranchMutliplicityEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Association_BranchEdge, getParserElement(), this, VISUAL_ID); @@ -426,6 +434,7 @@ public class AssociationBranchMutliplicityEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -453,18 +462,13 @@ public class AssociationBranchMutliplicityEditPart extends PapyrusLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -476,8 +480,7 @@ public class AssociationBranchMutliplicityEditPart extends PapyrusLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -503,10 +506,9 @@ public class AssociationBranchMutliplicityEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -522,6 +524,7 @@ public class AssociationBranchMutliplicityEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -563,7 +566,8 @@ public class AssociationBranchMutliplicityEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -580,7 +584,8 @@ public class AssociationBranchMutliplicityEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -589,11 +594,15 @@ public class AssociationBranchMutliplicityEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -601,6 +610,7 @@ public class AssociationBranchMutliplicityEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -608,6 +618,7 @@ public class AssociationBranchMutliplicityEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -623,6 +634,7 @@ public class AssociationBranchMutliplicityEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -636,6 +648,7 @@ public class AssociationBranchMutliplicityEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -658,7 +671,7 @@ public class AssociationBranchMutliplicityEditPart extends PapyrusLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -669,7 +682,7 @@ public class AssociationBranchMutliplicityEditPart extends PapyrusLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -682,7 +695,7 @@ public class AssociationBranchMutliplicityEditPart extends PapyrusLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -692,43 +705,42 @@ public class AssociationBranchMutliplicityEditPart extends PapyrusLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -737,13 +749,11 @@ public class AssociationBranchMutliplicityEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -760,6 +770,7 @@ public class AssociationBranchMutliplicityEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -769,10 +780,10 @@ public class AssociationBranchMutliplicityEditPart extends PapyrusLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -796,6 +807,7 @@ public class AssociationBranchMutliplicityEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -804,6 +816,7 @@ public class AssociationBranchMutliplicityEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getLabelRole() { return "TargetMultiplicity";//$NON-NLS-1$ } @@ -811,6 +824,7 @@ public class AssociationBranchMutliplicityEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getIconPathRole() { return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/MultiplicityHandler.gif";//$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationBranchRoleEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationBranchRoleEditPart.java index d105dfb903d..64820d3b8ca 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationBranchRoleEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationBranchRoleEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,12 +64,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -115,12 +115,14 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -129,10 +131,7 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchRoleEditPart.VISUAL_ID), - new Point(0, -20)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationBranchRoleEditPart.VISUAL_ID), new Point(0, -20)); } /** @@ -158,6 +157,7 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public int getKeyPoint() { return ConnectionLocator.SOURCE; } @@ -228,6 +228,7 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -235,6 +236,7 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -242,6 +244,7 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -267,7 +270,8 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -279,6 +283,7 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -294,11 +299,13 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -312,6 +319,7 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -321,14 +329,12 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), - AssociationBranchRoleEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), AssociationBranchRoleEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -346,6 +352,7 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -356,6 +363,7 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -363,6 +371,7 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Association_BranchEdge, getParserElement(), this, VISUAL_ID); @@ -425,6 +434,7 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -452,18 +462,13 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -475,8 +480,7 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -502,10 +506,9 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -521,6 +524,7 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -562,7 +566,8 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -579,7 +584,8 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -588,11 +594,15 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -600,6 +610,7 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -607,6 +618,7 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -622,6 +634,7 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -635,6 +648,7 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -657,7 +671,7 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -668,7 +682,7 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -681,7 +695,7 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -691,43 +705,42 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -736,13 +749,11 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -759,6 +770,7 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -768,10 +780,10 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -795,6 +807,7 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -803,6 +816,7 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getLabelRole() { return "TargetRole";//$NON-NLS-1$ } @@ -810,6 +824,7 @@ public class AssociationBranchRoleEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getIconPathRole() { return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/role.gif";//$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassAttributeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassAttributeCompartmentEditPart.java index beea6c6acba..7f4bed822b8 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassAttributeCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassAttributeCompartmentEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -31,7 +31,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartme import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -55,6 +54,7 @@ public class AssociationClassAttributeCompartmentEditPart extends ResizeableList /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; } @@ -62,6 +62,7 @@ public class AssociationClassAttributeCompartmentEditPart extends ResizeableList /** * @generated */ + @Override public String getCompartmentName() { return Messages.AssociationClassAttributeCompartmentEditPart_title; } @@ -69,6 +70,7 @@ public class AssociationClassAttributeCompartmentEditPart extends ResizeableList /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -76,16 +78,16 @@ public class AssociationClassAttributeCompartmentEditPart extends ResizeableList installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.AssociationClassAttributeCompartmentCanonicalEditPolicy()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.AssociationClassAttributeCompartmentCanonicalEditPolicy()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); } /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -95,6 +97,7 @@ public class AssociationClassAttributeCompartmentEditPart extends ResizeableList /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -103,6 +106,7 @@ public class AssociationClassAttributeCompartmentEditPart extends ResizeableList /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -117,6 +121,7 @@ public class AssociationClassAttributeCompartmentEditPart extends ResizeableList /** * @generated */ + @Override protected void refreshBounds() { int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); @@ -124,12 +129,16 @@ public class AssociationClassAttributeCompartmentEditPart extends ResizeableList int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassDashedLinkEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassDashedLinkEditPart.java index 59d8f0275af..15ca52f3fc9 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassDashedLinkEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassDashedLinkEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -24,8 +24,8 @@ import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNode import org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure; /** - * @generated - */ + * @generated + */ public class AssociationClassDashedLinkEditPart extends ConnectionEditPart implements ITreeBranchEditPart { /** @@ -43,6 +43,7 @@ public class AssociationClassDashedLinkEditPart extends ConnectionEditPart imple /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.COMPONENT_ROLE, new ViewComponentEditPolicy()); @@ -52,12 +53,13 @@ public class AssociationClassDashedLinkEditPart extends ConnectionEditPart imple /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected Connection createConnectionFigure() { return new SimpleDashedEdgeFigure(); } @@ -65,6 +67,7 @@ public class AssociationClassDashedLinkEditPart extends ConnectionEditPart imple /** * @generated */ + @Override public SimpleDashedEdgeFigure getPrimaryShape() { return (SimpleDashedEdgeFigure) getFigure(); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassEditPart.java index 9f7ec30f89c..aacc2067254 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -92,6 +92,7 @@ public class AssociationClassEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void createDefaultEditPolicies() { installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); super.createDefaultEditPolicies(); @@ -101,16 +102,12 @@ public class AssociationClassEditPart extends ClassifierEditPart { installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); - installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, - new ShowHideCompartmentEditPolicy()); - installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, - new ShowHideClassifierContentsEditPolicy()); + installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy()); + installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy()); installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy()); - installEditPolicy(DeleteLinkedAssociationClassViewEditPolicy.HIDE_ROLE, - new DeleteLinkedAssociationClassViewEditPolicy()); + installEditPolicy(DeleteLinkedAssociationClassViewEditPolicy.HIDE_ROLE, new DeleteLinkedAssociationClassViewEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE); } @@ -160,9 +157,11 @@ public class AssociationClassEditPart extends ClassifierEditPart { } /** - *Papyrus codeGen - *@generated - **/ + * Papyrus codeGen + * + * @generated + **/ + @Override protected void handleNotificationEvent(Notification event) { /* * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart @@ -171,7 +170,8 @@ public class AssociationClassEditPart extends ClassifierEditPart { if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) { Object notifier = event.getNotifier(); List<?> modelChildren = ((View) getModel()).getChildren(); - if (false == notifier instanceof Edge && false == notifier instanceof BasicCompartment) { + if (false == notifier instanceof Edge + && false == notifier instanceof BasicCompartment) { if (modelChildren.contains(event.getNotifier())) { return; } @@ -184,14 +184,17 @@ public class AssociationClassEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected IFigure createNodeShape() { return primaryShape = new ClassifierFigure(); } /** * org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure + * * @generated */ + @Override public ClassifierFigure getPrimaryShape() { return (ClassifierFigure) primaryShape; } @@ -205,23 +208,24 @@ public class AssociationClassEditPart extends ClassifierEditPart { return true; } + if (childEditPart instanceof AssociationClassAttributeCompartmentEditPart) { IFigure pane = getPrimaryShape().getAttributeCompartmentFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((AssociationClassAttributeCompartmentEditPart) childEditPart).getFigure()); return true; } if (childEditPart instanceof AssociationClassOperationCompartmentEditPart) { IFigure pane = getPrimaryShape().getOperationCompartmentFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((AssociationClassOperationCompartmentEditPart) childEditPart).getFigure()); return true; } if (childEditPart instanceof AssociationClassNestedClassifierCompartmentEditPart) { IFigure pane = getPrimaryShape().getNestedClassifierFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((AssociationClassNestedClassifierCompartmentEditPart) childEditPart).getFigure()); return true; } @@ -257,6 +261,7 @@ public class AssociationClassEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -267,6 +272,7 @@ public class AssociationClassEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -277,6 +283,7 @@ public class AssociationClassEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { if (editPart instanceof AssociationClassAttributeCompartmentEditPart) { return getPrimaryShape().getAttributeCompartmentFigure(); @@ -296,6 +303,7 @@ public class AssociationClassEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) { if (borderItemEditPart instanceof AssociationClassFloatingNameEditPart) { IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure()); @@ -308,6 +316,7 @@ public class AssociationClassEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected NodeFigure createNodePlate() { RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(100, 100); return result; @@ -315,12 +324,13 @@ public class AssociationClassEditPart extends ClassifierEditPart { /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected NodeFigure createMainFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); @@ -329,9 +339,12 @@ public class AssociationClassEditPart extends ClassifierEditPart { /** * Default implementation treats passed figure as content pane. * Respects layout one may have set for generated figure. - * @param nodeShape instance of generated figure class + * + * @param nodeShape + * instance of generated figure class * @generated */ + @Override protected IFigure setupContentPane(IFigure nodeShape) { if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); @@ -344,6 +357,7 @@ public class AssociationClassEditPart extends ClassifierEditPart { /** * @generated */ + @Override public IFigure getContentPane() { if (contentPane != null) { return contentPane; @@ -354,6 +368,7 @@ public class AssociationClassEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void setForegroundColor(Color color) { if (primaryShape != null) { primaryShape.setForegroundColor(color); @@ -363,6 +378,7 @@ public class AssociationClassEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void setLineWidth(int width) { super.setLineWidth(width); } @@ -370,6 +386,7 @@ public class AssociationClassEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void setLineType(int style) { if (primaryShape instanceof IPapyrusNodeFigure) { ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); @@ -379,6 +396,7 @@ public class AssociationClassEditPart extends ClassifierEditPart { /** * @generated */ + @Override public EditPart getPrimaryChildEditPart() { return getChildBySemanticHint(UMLVisualIDRegistry.getType(AssociationClassNameEditPart.VISUAL_ID)); } @@ -386,22 +404,19 @@ public class AssociationClassEditPart extends ClassifierEditPart { /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { if (request instanceof CreateViewAndElementRequest) { - CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor() - .getCreateElementRequestAdapter(); + CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter(); IElementType type = (IElementType) adapter.getAdapter(IElementType.class); if (UMLElementTypes.isKindOf(type, UMLElementTypes.Property_ComponentAttributeLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(AssociationClassAttributeCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(AssociationClassAttributeCompartmentEditPart.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Operation_ComponentOperationLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(AssociationClassOperationCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(AssociationClassOperationCompartmentEditPart.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Class_ComponentNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(AssociationClassNestedClassifierCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(AssociationClassNestedClassifierCompartmentEditPart.VISUAL_ID)); } } return super.getTargetEditPart(request); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassFloatingNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassFloatingNameEditPart.java index d20cbd3a541..bc231e34ac5 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassFloatingNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassFloatingNameEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -50,6 +50,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -60,11 +65,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -115,12 +115,14 @@ public class AssociationClassFloatingNameEditPart extends FloatingLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -129,9 +131,7 @@ public class AssociationClassFloatingNameEditPart extends FloatingLabelEditPart * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassFloatingNameEditPart.VISUAL_ID), - new Point(0, 0)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassFloatingNameEditPart.VISUAL_ID), new Point(0, 0)); } /** @@ -144,6 +144,7 @@ public class AssociationClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); @@ -155,6 +156,7 @@ public class AssociationClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IBorderItemLocator getBorderItemLocator() { IFigure parentFigure = getFigure().getParent(); if (parentFigure != null && parentFigure.getLayoutManager() != null) { @@ -167,6 +169,7 @@ public class AssociationClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public void refreshBounds() { int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); @@ -241,6 +244,7 @@ public class AssociationClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -248,6 +252,7 @@ public class AssociationClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -280,7 +285,8 @@ public class AssociationClassFloatingNameEditPart extends FloatingLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -292,6 +298,7 @@ public class AssociationClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -307,11 +314,13 @@ public class AssociationClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -325,6 +334,7 @@ public class AssociationClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -334,16 +344,12 @@ public class AssociationClassFloatingNameEditPart extends FloatingLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - AssociationClassFloatingNameEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), AssociationClassFloatingNameEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -361,6 +367,7 @@ public class AssociationClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -371,6 +378,7 @@ public class AssociationClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -378,6 +386,7 @@ public class AssociationClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.AssociationClass_Shape, getParserElement(), this, VISUAL_ID); @@ -440,6 +449,7 @@ public class AssociationClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -467,18 +477,13 @@ public class AssociationClassFloatingNameEditPart extends FloatingLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -490,8 +495,7 @@ public class AssociationClassFloatingNameEditPart extends FloatingLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -517,10 +521,9 @@ public class AssociationClassFloatingNameEditPart extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -536,6 +539,7 @@ public class AssociationClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -577,7 +581,8 @@ public class AssociationClassFloatingNameEditPart extends FloatingLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -594,7 +599,8 @@ public class AssociationClassFloatingNameEditPart extends FloatingLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -603,11 +609,15 @@ public class AssociationClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -615,6 +625,7 @@ public class AssociationClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -622,6 +633,7 @@ public class AssociationClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -637,6 +649,7 @@ public class AssociationClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -650,6 +663,7 @@ public class AssociationClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -672,7 +686,7 @@ public class AssociationClassFloatingNameEditPart extends FloatingLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -691,7 +705,7 @@ public class AssociationClassFloatingNameEditPart extends FloatingLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -704,7 +718,7 @@ public class AssociationClassFloatingNameEditPart extends FloatingLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -714,43 +728,42 @@ public class AssociationClassFloatingNameEditPart extends FloatingLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -759,13 +772,11 @@ public class AssociationClassFloatingNameEditPart extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -782,6 +793,7 @@ public class AssociationClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -791,10 +803,10 @@ public class AssociationClassFloatingNameEditPart extends FloatingLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -817,6 +829,7 @@ public class AssociationClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassLinkEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassLinkEditPart.java index 37c98c13e20..dcaa5aea021 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassLinkEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassLinkEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -26,8 +26,8 @@ import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.DeleteLinkedAssocia import org.eclipse.papyrus.uml.diagram.common.figure.edge.AssociationFigure; /** - * @generated - */ + * @generated + */ public class AssociationClassLinkEditPart extends AbstractAssociationEditPart implements ITreeBranchEditPart { /** @@ -45,12 +45,12 @@ public class AssociationClassLinkEditPart extends AbstractAssociationEditPart im /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(DeleteLinkedAssociationClassViewEditPolicy.HIDE_ROLE, - new DeleteLinkedAssociationClassViewEditPolicy()); + installEditPolicy(DeleteLinkedAssociationClassViewEditPolicy.HIDE_ROLE, new DeleteLinkedAssociationClassViewEditPolicy()); } /** @@ -58,10 +58,12 @@ public class AssociationClassLinkEditPart extends AbstractAssociationEditPart im */ protected boolean addFixedChild(EditPart childEditPart) { if (childEditPart instanceof AssociationClassRoleSourceEditPart) { - ((AssociationClassRoleSourceEditPart) childEditPart).setLabel(getPrimaryShape().getRoleSourceLabel()); + ((AssociationClassRoleSourceEditPart) childEditPart).setLabel( + getPrimaryShape().getRoleSourceLabel()); } if (childEditPart instanceof AssociationClassRoleTargetEditPart) { - ((AssociationClassRoleTargetEditPart) childEditPart).setLabel(getPrimaryShape().getRoleTargetLabel()); + ((AssociationClassRoleTargetEditPart) childEditPart).setLabel( + getPrimaryShape().getRoleTargetLabel()); } return false; } @@ -69,6 +71,7 @@ public class AssociationClassLinkEditPart extends AbstractAssociationEditPart im /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -92,6 +95,7 @@ public class AssociationClassLinkEditPart extends AbstractAssociationEditPart im /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -101,12 +105,13 @@ public class AssociationClassLinkEditPart extends AbstractAssociationEditPart im /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected Connection createConnectionFigure() { return new AssociationFigure(); } @@ -114,6 +119,7 @@ public class AssociationClassLinkEditPart extends AbstractAssociationEditPart im /** * @generated */ + @Override public AssociationFigure getPrimaryShape() { return (AssociationFigure) getFigure(); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassNameEditPart.java index 9cb4735ea19..426b64be8dc 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassNameEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,20 +64,12 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -115,12 +113,14 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -135,6 +135,7 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy()); @@ -208,6 +209,7 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -215,6 +217,7 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -222,6 +225,7 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -237,8 +241,7 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -248,7 +251,8 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -260,6 +264,7 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -275,11 +280,13 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -293,6 +300,7 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -302,14 +310,12 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), - AssociationClassNameEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), AssociationClassNameEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -327,6 +333,7 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -337,6 +344,7 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -344,6 +352,7 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.AssociationClass_Shape, getParserElement(), this, VISUAL_ID); @@ -406,6 +415,7 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -433,18 +443,13 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -456,8 +461,7 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -483,10 +487,9 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -502,6 +505,7 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -543,7 +547,8 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -560,7 +565,8 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -569,11 +575,15 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -581,6 +591,7 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -588,6 +599,7 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -603,6 +615,7 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -616,6 +629,7 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -638,7 +652,7 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -657,7 +671,7 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -670,7 +684,7 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -680,43 +694,42 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -725,13 +738,11 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -748,6 +759,7 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -756,6 +768,7 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -764,6 +777,7 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); @@ -774,10 +788,10 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -794,8 +808,7 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } super.handleNotificationEvent(event); @@ -804,6 +817,7 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -817,6 +831,7 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void activate() { super.activate(); addOwnerElementListeners(); @@ -833,6 +848,7 @@ public class AssociationClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void deactivate() { removeOwnerElementListeners(); super.deactivate(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassNestedClassifierCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassNestedClassifierCompartmentEditPart.java index 269b03ab54a..a4133242375 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassNestedClassifierCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassNestedClassifierCompartmentEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -32,7 +32,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentS import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedClazzCompartmentCreationEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -56,6 +55,7 @@ public class AssociationClassNestedClassifierCompartmentEditPart extends ListCom /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; } @@ -63,6 +63,7 @@ public class AssociationClassNestedClassifierCompartmentEditPart extends ListCom /** * @generated */ + @Override public String getCompartmentName() { return Messages.AssociationClassNestedClassifierCompartmentEditPart_title; } @@ -70,6 +71,7 @@ public class AssociationClassNestedClassifierCompartmentEditPart extends ListCom /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -77,10 +79,9 @@ public class AssociationClassNestedClassifierCompartmentEditPart extends ListCom installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.AssociationClassNestedClassifierCompartmentCanonicalEditPolicy()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.AssociationClassNestedClassifierCompartmentCanonicalEditPolicy()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); installEditPolicy(EditPolicyRoles.CREATION_ROLE, new NestedClazzCompartmentCreationEditPolicy()); } @@ -88,6 +89,7 @@ public class AssociationClassNestedClassifierCompartmentEditPart extends ListCom /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -97,6 +99,7 @@ public class AssociationClassNestedClassifierCompartmentEditPart extends ListCom /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -105,6 +108,7 @@ public class AssociationClassNestedClassifierCompartmentEditPart extends ListCom /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -126,12 +130,16 @@ public class AssociationClassNestedClassifierCompartmentEditPart extends ListCom int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassOperationCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassOperationCompartmentEditPart.java index ac6aa82ea41..4b16b62f241 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassOperationCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassOperationCompartmentEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -31,7 +31,6 @@ import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -55,6 +54,7 @@ public class AssociationClassOperationCompartmentEditPart extends ListCompartmen /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; } @@ -62,6 +62,7 @@ public class AssociationClassOperationCompartmentEditPart extends ListCompartmen /** * @generated */ + @Override public String getCompartmentName() { return Messages.AssociationClassOperationCompartmentEditPart_title; } @@ -69,6 +70,7 @@ public class AssociationClassOperationCompartmentEditPart extends ListCompartmen /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -76,16 +78,16 @@ public class AssociationClassOperationCompartmentEditPart extends ListCompartmen installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.AssociationClassOperationCompartmentCanonicalEditPolicy()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.AssociationClassOperationCompartmentCanonicalEditPolicy()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); } /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -95,6 +97,7 @@ public class AssociationClassOperationCompartmentEditPart extends ListCompartmen /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -103,6 +106,7 @@ public class AssociationClassOperationCompartmentEditPart extends ListCompartmen /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -124,12 +128,16 @@ public class AssociationClassOperationCompartmentEditPart extends ListCompartmen int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassRoleSourceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassRoleSourceEditPart.java index 98f445211f6..16c55beb1e7 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassRoleSourceEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassRoleSourceEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,12 +64,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -115,12 +115,14 @@ public class AssociationClassRoleSourceEditPart extends PapyrusLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -129,10 +131,7 @@ public class AssociationClassRoleSourceEditPart extends PapyrusLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassRoleSourceEditPart.VISUAL_ID), - new Point(0, -20)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassRoleSourceEditPart.VISUAL_ID), new Point(0, -20)); } /** @@ -158,6 +157,7 @@ public class AssociationClassRoleSourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public int getKeyPoint() { return ConnectionLocator.SOURCE; } @@ -228,6 +228,7 @@ public class AssociationClassRoleSourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -235,6 +236,7 @@ public class AssociationClassRoleSourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -242,6 +244,7 @@ public class AssociationClassRoleSourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -267,7 +270,8 @@ public class AssociationClassRoleSourceEditPart extends PapyrusLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -279,6 +283,7 @@ public class AssociationClassRoleSourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -294,11 +299,13 @@ public class AssociationClassRoleSourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -312,6 +319,7 @@ public class AssociationClassRoleSourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -321,16 +329,12 @@ public class AssociationClassRoleSourceEditPart extends PapyrusLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - AssociationClassRoleSourceEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), AssociationClassRoleSourceEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -348,6 +352,7 @@ public class AssociationClassRoleSourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -358,6 +363,7 @@ public class AssociationClassRoleSourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -365,6 +371,7 @@ public class AssociationClassRoleSourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.AssociationClass_Edge, getParserElement(), this, VISUAL_ID); @@ -427,6 +434,7 @@ public class AssociationClassRoleSourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -454,18 +462,13 @@ public class AssociationClassRoleSourceEditPart extends PapyrusLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -477,8 +480,7 @@ public class AssociationClassRoleSourceEditPart extends PapyrusLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -504,10 +506,9 @@ public class AssociationClassRoleSourceEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -523,6 +524,7 @@ public class AssociationClassRoleSourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -564,7 +566,8 @@ public class AssociationClassRoleSourceEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -581,7 +584,8 @@ public class AssociationClassRoleSourceEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -590,11 +594,15 @@ public class AssociationClassRoleSourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -602,6 +610,7 @@ public class AssociationClassRoleSourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -609,6 +618,7 @@ public class AssociationClassRoleSourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -624,6 +634,7 @@ public class AssociationClassRoleSourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -637,6 +648,7 @@ public class AssociationClassRoleSourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -659,7 +671,7 @@ public class AssociationClassRoleSourceEditPart extends PapyrusLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -670,7 +682,7 @@ public class AssociationClassRoleSourceEditPart extends PapyrusLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -683,7 +695,7 @@ public class AssociationClassRoleSourceEditPart extends PapyrusLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -693,43 +705,42 @@ public class AssociationClassRoleSourceEditPart extends PapyrusLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -738,13 +749,11 @@ public class AssociationClassRoleSourceEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -761,6 +770,7 @@ public class AssociationClassRoleSourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -770,10 +780,10 @@ public class AssociationClassRoleSourceEditPart extends PapyrusLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -797,6 +807,7 @@ public class AssociationClassRoleSourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -805,6 +816,7 @@ public class AssociationClassRoleSourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getLabelRole() { return "SourceRole";//$NON-NLS-1$ } @@ -812,6 +824,7 @@ public class AssociationClassRoleSourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getIconPathRole() { return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/role.gif";//$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassRoleTargetEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassRoleTargetEditPart.java index 55f05f08650..ccbac242b19 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassRoleTargetEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassRoleTargetEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,12 +64,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -115,12 +115,14 @@ public class AssociationClassRoleTargetEditPart extends PapyrusLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -129,10 +131,7 @@ public class AssociationClassRoleTargetEditPart extends PapyrusLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassRoleTargetEditPart.VISUAL_ID), - new Point(0, 20)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationClassRoleTargetEditPart.VISUAL_ID), new Point(0, 20)); } /** @@ -158,6 +157,7 @@ public class AssociationClassRoleTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public int getKeyPoint() { return ConnectionLocator.TARGET; } @@ -228,6 +228,7 @@ public class AssociationClassRoleTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -235,6 +236,7 @@ public class AssociationClassRoleTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -242,6 +244,7 @@ public class AssociationClassRoleTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -267,7 +270,8 @@ public class AssociationClassRoleTargetEditPart extends PapyrusLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -279,6 +283,7 @@ public class AssociationClassRoleTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -294,11 +299,13 @@ public class AssociationClassRoleTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -312,6 +319,7 @@ public class AssociationClassRoleTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -321,16 +329,12 @@ public class AssociationClassRoleTargetEditPart extends PapyrusLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - AssociationClassRoleTargetEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), AssociationClassRoleTargetEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -348,6 +352,7 @@ public class AssociationClassRoleTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -358,6 +363,7 @@ public class AssociationClassRoleTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -365,6 +371,7 @@ public class AssociationClassRoleTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.AssociationClass_Edge, getParserElement(), this, VISUAL_ID); @@ -427,6 +434,7 @@ public class AssociationClassRoleTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -454,18 +462,13 @@ public class AssociationClassRoleTargetEditPart extends PapyrusLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -477,8 +480,7 @@ public class AssociationClassRoleTargetEditPart extends PapyrusLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -504,10 +506,9 @@ public class AssociationClassRoleTargetEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -523,6 +524,7 @@ public class AssociationClassRoleTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -564,7 +566,8 @@ public class AssociationClassRoleTargetEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -581,7 +584,8 @@ public class AssociationClassRoleTargetEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -590,11 +594,15 @@ public class AssociationClassRoleTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -602,6 +610,7 @@ public class AssociationClassRoleTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -609,6 +618,7 @@ public class AssociationClassRoleTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -624,6 +634,7 @@ public class AssociationClassRoleTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -637,6 +648,7 @@ public class AssociationClassRoleTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -659,7 +671,7 @@ public class AssociationClassRoleTargetEditPart extends PapyrusLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -670,7 +682,7 @@ public class AssociationClassRoleTargetEditPart extends PapyrusLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -683,7 +695,7 @@ public class AssociationClassRoleTargetEditPart extends PapyrusLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -693,43 +705,42 @@ public class AssociationClassRoleTargetEditPart extends PapyrusLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -738,13 +749,11 @@ public class AssociationClassRoleTargetEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -761,6 +770,7 @@ public class AssociationClassRoleTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -770,10 +780,10 @@ public class AssociationClassRoleTargetEditPart extends PapyrusLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -797,6 +807,7 @@ public class AssociationClassRoleTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -805,6 +816,7 @@ public class AssociationClassRoleTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getLabelRole() { return "TargetRole";//$NON-NLS-1$ } @@ -812,6 +824,7 @@ public class AssociationClassRoleTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getIconPathRole() { return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/role.gif";//$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationEditPart.java index 8e1eacce2c2..d98505d9dc4 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -27,8 +27,8 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLink import org.eclipse.papyrus.uml.diagram.common.figure.edge.AssociationFigure; /** - * @generated - */ + * @generated + */ public class AssociationEditPart extends AbstractAssociationEditPart implements ITreeBranchEditPart { /** @@ -46,11 +46,11 @@ public class AssociationEditPart extends AbstractAssociationEditPart implements /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeLinkLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); } @@ -59,25 +59,28 @@ public class AssociationEditPart extends AbstractAssociationEditPart implements */ protected boolean addFixedChild(EditPart childEditPart) { if (childEditPart instanceof AppliedStereotypeAssociationEditPart) { - ((AppliedStereotypeAssociationEditPart) childEditPart) - .setLabel(getPrimaryShape().getAppliedStereotypeAssociationLabel()); + ((AppliedStereotypeAssociationEditPart) childEditPart).setLabel( + getPrimaryShape().getAppliedStereotypeAssociationLabel()); } if (childEditPart instanceof AssociationNameEditPart) { - ((AssociationNameEditPart) childEditPart).setLabel(getPrimaryShape().getAssociationNameLabel()); + ((AssociationNameEditPart) childEditPart).setLabel( + getPrimaryShape().getAssociationNameLabel()); } if (childEditPart instanceof AssociationTargetNameEditPart) { - ((AssociationTargetNameEditPart) childEditPart).setLabel(getPrimaryShape().getRoleTargetLabel()); + ((AssociationTargetNameEditPart) childEditPart).setLabel( + getPrimaryShape().getRoleTargetLabel()); } if (childEditPart instanceof AssociationSourceNameEditPart) { - ((AssociationSourceNameEditPart) childEditPart).setLabel(getPrimaryShape().getRoleSourceLabel()); + ((AssociationSourceNameEditPart) childEditPart).setLabel( + getPrimaryShape().getRoleSourceLabel()); } if (childEditPart instanceof AssociationMultiplicitySourceEditPart) { - ((AssociationMultiplicitySourceEditPart) childEditPart) - .setLabel(getPrimaryShape().getMultiplicitySourceLabel()); + ((AssociationMultiplicitySourceEditPart) childEditPart).setLabel( + getPrimaryShape().getMultiplicitySourceLabel()); } if (childEditPart instanceof AssociationMultiplicityTargetEditPart) { - ((AssociationMultiplicityTargetEditPart) childEditPart) - .setLabel(getPrimaryShape().getMultiplicityTargetLabel()); + ((AssociationMultiplicityTargetEditPart) childEditPart).setLabel( + getPrimaryShape().getMultiplicityTargetLabel()); } return false; } @@ -85,6 +88,7 @@ public class AssociationEditPart extends AbstractAssociationEditPart implements /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -120,6 +124,7 @@ public class AssociationEditPart extends AbstractAssociationEditPart implements /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -129,12 +134,13 @@ public class AssociationEditPart extends AbstractAssociationEditPart implements /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected Connection createConnectionFigure() { return new AssociationFigure(); } @@ -142,6 +148,7 @@ public class AssociationEditPart extends AbstractAssociationEditPart implements /** * @generated */ + @Override public AssociationFigure getPrimaryShape() { return (AssociationFigure) getFigure(); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationFloatingNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationFloatingNameEditPart.java index 25b6d7fe58b..3b813c06132 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationFloatingNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationFloatingNameEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -50,6 +50,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -60,11 +65,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -115,12 +115,14 @@ public class AssociationFloatingNameEditPart extends FloatingLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -129,10 +131,7 @@ public class AssociationFloatingNameEditPart extends FloatingLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationFloatingNameEditPart.VISUAL_ID), - new Point(0, 0)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationFloatingNameEditPart.VISUAL_ID), new Point(0, 0)); } /** @@ -145,6 +144,7 @@ public class AssociationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); @@ -156,6 +156,7 @@ public class AssociationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IBorderItemLocator getBorderItemLocator() { IFigure parentFigure = getFigure().getParent(); if (parentFigure != null && parentFigure.getLayoutManager() != null) { @@ -168,6 +169,7 @@ public class AssociationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public void refreshBounds() { int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); @@ -242,6 +244,7 @@ public class AssociationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -249,6 +252,7 @@ public class AssociationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -281,7 +285,8 @@ public class AssociationFloatingNameEditPart extends FloatingLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -293,6 +298,7 @@ public class AssociationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -308,11 +314,13 @@ public class AssociationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -326,6 +334,7 @@ public class AssociationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -335,14 +344,12 @@ public class AssociationFloatingNameEditPart extends FloatingLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), - AssociationFloatingNameEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), AssociationFloatingNameEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -360,6 +367,7 @@ public class AssociationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -370,6 +378,7 @@ public class AssociationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -377,6 +386,7 @@ public class AssociationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Association_Shape, getParserElement(), this, VISUAL_ID); @@ -439,6 +449,7 @@ public class AssociationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -466,18 +477,13 @@ public class AssociationFloatingNameEditPart extends FloatingLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -489,8 +495,7 @@ public class AssociationFloatingNameEditPart extends FloatingLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -516,10 +521,9 @@ public class AssociationFloatingNameEditPart extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -535,6 +539,7 @@ public class AssociationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -576,7 +581,8 @@ public class AssociationFloatingNameEditPart extends FloatingLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -593,7 +599,8 @@ public class AssociationFloatingNameEditPart extends FloatingLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -602,11 +609,15 @@ public class AssociationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -614,6 +625,7 @@ public class AssociationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -621,6 +633,7 @@ public class AssociationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -636,6 +649,7 @@ public class AssociationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -649,6 +663,7 @@ public class AssociationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -671,7 +686,7 @@ public class AssociationFloatingNameEditPart extends FloatingLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -690,7 +705,7 @@ public class AssociationFloatingNameEditPart extends FloatingLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -703,7 +718,7 @@ public class AssociationFloatingNameEditPart extends FloatingLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -713,43 +728,42 @@ public class AssociationFloatingNameEditPart extends FloatingLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -758,13 +772,11 @@ public class AssociationFloatingNameEditPart extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -781,6 +793,7 @@ public class AssociationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -790,10 +803,10 @@ public class AssociationFloatingNameEditPart extends FloatingLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -816,6 +829,7 @@ public class AssociationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationMultiplicitySourceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationMultiplicitySourceEditPart.java index 3baa0945654..e89049488c2 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationMultiplicitySourceEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationMultiplicitySourceEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,12 +64,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -115,12 +115,14 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -129,9 +131,7 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationMultiplicitySourceEditPart.VISUAL_ID), - new Point(0, 20)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationMultiplicitySourceEditPart.VISUAL_ID), new Point(0, 20)); } /** @@ -157,6 +157,7 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public int getKeyPoint() { return ConnectionLocator.TARGET; } @@ -227,6 +228,7 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -234,6 +236,7 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -241,6 +244,7 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -266,7 +270,8 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -278,6 +283,7 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -293,11 +299,13 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -311,6 +319,7 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -320,16 +329,12 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - AssociationMultiplicitySourceEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), AssociationMultiplicitySourceEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -347,6 +352,7 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -357,6 +363,7 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -364,6 +371,7 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Association_Edge, getParserElement(), this, VISUAL_ID); @@ -426,6 +434,7 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -453,18 +462,13 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -476,8 +480,7 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -503,10 +506,9 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -522,6 +524,7 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -563,7 +566,8 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -580,7 +584,8 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -589,11 +594,15 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -601,6 +610,7 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -608,6 +618,7 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -623,6 +634,7 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -636,6 +648,7 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -658,7 +671,7 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -669,7 +682,7 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -682,7 +695,7 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -692,43 +705,42 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -737,13 +749,11 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -760,6 +770,7 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -769,10 +780,10 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -796,6 +807,7 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -804,6 +816,7 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getLabelRole() { return "SourceMultiplicity";//$NON-NLS-1$ } @@ -811,6 +824,7 @@ public class AssociationMultiplicitySourceEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getIconPathRole() { return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/MultiplicityHandler.gif";//$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationMultiplicityTargetEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationMultiplicityTargetEditPart.java index 46498022841..74f998164cf 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationMultiplicityTargetEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationMultiplicityTargetEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,12 +64,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -115,12 +115,14 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -129,9 +131,7 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationMultiplicityTargetEditPart.VISUAL_ID), - new Point(0, -20)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationMultiplicityTargetEditPart.VISUAL_ID), new Point(0, -20)); } /** @@ -157,6 +157,7 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public int getKeyPoint() { return ConnectionLocator.SOURCE; } @@ -227,6 +228,7 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -234,6 +236,7 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -241,6 +244,7 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -266,7 +270,8 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -278,6 +283,7 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -293,11 +299,13 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -311,6 +319,7 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -320,16 +329,12 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - AssociationMultiplicityTargetEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), AssociationMultiplicityTargetEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -347,6 +352,7 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -357,6 +363,7 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -364,6 +371,7 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Association_Edge, getParserElement(), this, VISUAL_ID); @@ -426,6 +434,7 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -453,18 +462,13 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -476,8 +480,7 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -503,10 +506,9 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -522,6 +524,7 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -563,7 +566,8 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -580,7 +584,8 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -589,11 +594,15 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -601,6 +610,7 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -608,6 +618,7 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -623,6 +634,7 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -636,6 +648,7 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -658,7 +671,7 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -669,7 +682,7 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -682,7 +695,7 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -692,43 +705,42 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -737,13 +749,11 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -760,6 +770,7 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -769,10 +780,10 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -796,6 +807,7 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -804,6 +816,7 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getLabelRole() { return "TargetMultiplicity";//$NON-NLS-1$ } @@ -811,6 +824,7 @@ public class AssociationMultiplicityTargetEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getIconPathRole() { return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/MultiplicityHandler.gif";//$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationNameEditPart.java index a413f60ff0e..978d5183e18 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationNameEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -49,6 +49,13 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -59,14 +66,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -74,7 +73,6 @@ import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEdi import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -118,12 +116,14 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -132,10 +132,7 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry - .getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationNameEditPart.VISUAL_ID), - new Point(0, 20)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationNameEditPart.VISUAL_ID), new Point(0, 20)); } /** @@ -159,6 +156,7 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public int getKeyPoint() { return ConnectionLocator.MIDDLE; } @@ -229,6 +227,7 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -236,6 +235,7 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -243,6 +243,7 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -258,8 +259,7 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -269,7 +269,8 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -281,6 +282,7 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -296,11 +298,13 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -314,6 +318,7 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -323,13 +328,12 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), AssociationNameEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), AssociationNameEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -347,6 +351,7 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -357,6 +362,7 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -364,6 +370,7 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Association_Edge, getParserElement(), this, VISUAL_ID); @@ -426,6 +433,7 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -453,18 +461,13 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -476,8 +479,7 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -503,10 +505,9 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -522,6 +523,7 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -563,7 +565,8 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -580,7 +583,8 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -589,11 +593,15 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -601,6 +609,7 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -608,6 +617,7 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -623,6 +633,7 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -636,6 +647,7 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -658,7 +670,7 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -677,7 +689,7 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -690,7 +702,7 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -700,43 +712,42 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -745,13 +756,11 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -768,6 +777,7 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -777,10 +787,10 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -798,8 +808,7 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } super.handleNotificationEvent(event); @@ -808,6 +817,7 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -816,6 +826,7 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getLabelRole() { return "Name";//$NON-NLS-1$ } @@ -823,6 +834,7 @@ public class AssociationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getIconPathRole() { return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png";//$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationNodeEditPart.java index 8d86b78e6f7..b4578d5c580 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationNodeEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationNodeEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -79,6 +79,7 @@ public class AssociationNodeEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); @@ -137,9 +138,11 @@ public class AssociationNodeEditPart extends RoundedCompartmentEditPart { } /** - *Papyrus codeGen - *@generated - **/ + * Papyrus codeGen + * + * @generated + **/ + @Override protected void handleNotificationEvent(Notification event) { /* * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart @@ -148,7 +151,8 @@ public class AssociationNodeEditPart extends RoundedCompartmentEditPart { if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) { Object notifier = event.getNotifier(); List<?> modelChildren = ((View) getModel()).getChildren(); - if (false == notifier instanceof Edge && false == notifier instanceof BasicCompartment) { + if (false == notifier instanceof Edge + && false == notifier instanceof BasicCompartment) { if (modelChildren.contains(event.getNotifier())) { return; } @@ -161,14 +165,17 @@ public class AssociationNodeEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected IFigure createNodeShape() { return primaryShape = new RoundedCompartmentFigure(); } /** * org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure + * * @generated */ + @Override public RoundedCompartmentFigure getPrimaryShape() { return (RoundedCompartmentFigure) primaryShape; } @@ -176,6 +183,7 @@ public class AssociationNodeEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) { if (borderItemEditPart instanceof AssociationFloatingNameEditPart) { IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure()); @@ -188,6 +196,7 @@ public class AssociationNodeEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected NodeFigure createNodePlate() { RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(20, 20); return result; @@ -195,12 +204,13 @@ public class AssociationNodeEditPart extends RoundedCompartmentEditPart { /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected NodeFigure createMainFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); @@ -209,9 +219,12 @@ public class AssociationNodeEditPart extends RoundedCompartmentEditPart { /** * Default implementation treats passed figure as content pane. * Respects layout one may have set for generated figure. - * @param nodeShape instance of generated figure class + * + * @param nodeShape + * instance of generated figure class * @generated */ + @Override protected IFigure setupContentPane(IFigure nodeShape) { return nodeShape; // use nodeShape itself as contentPane } @@ -219,6 +232,7 @@ public class AssociationNodeEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override public IFigure getContentPane() { if (contentPane != null) { return contentPane; @@ -229,6 +243,7 @@ public class AssociationNodeEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected void setForegroundColor(Color color) { if (primaryShape != null) { primaryShape.setForegroundColor(color); @@ -238,6 +253,7 @@ public class AssociationNodeEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected void setLineWidth(int width) { super.setLineWidth(width); } @@ -245,6 +261,7 @@ public class AssociationNodeEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected void setLineType(int style) { if (primaryShape instanceof IPapyrusNodeFigure) { ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); @@ -254,6 +271,7 @@ public class AssociationNodeEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override public EditPart getPrimaryChildEditPart() { return getChildBySemanticHint(UMLVisualIDRegistry.getType(AssociationFloatingNameEditPart.VISUAL_ID)); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationSourceNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationSourceNameEditPart.java index f33b7b9663a..8bd650c4d3c 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationSourceNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationSourceNameEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,12 +64,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -115,12 +115,14 @@ public class AssociationSourceNameEditPart extends PapyrusLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -129,10 +131,7 @@ public class AssociationSourceNameEditPart extends PapyrusLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationSourceNameEditPart.VISUAL_ID), - new Point(0, 20)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationSourceNameEditPart.VISUAL_ID), new Point(0, 20)); } /** @@ -158,6 +157,7 @@ public class AssociationSourceNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public int getKeyPoint() { return ConnectionLocator.TARGET; } @@ -228,6 +228,7 @@ public class AssociationSourceNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -235,6 +236,7 @@ public class AssociationSourceNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -242,6 +244,7 @@ public class AssociationSourceNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -267,7 +270,8 @@ public class AssociationSourceNameEditPart extends PapyrusLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -279,6 +283,7 @@ public class AssociationSourceNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -294,11 +299,13 @@ public class AssociationSourceNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -312,6 +319,7 @@ public class AssociationSourceNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -321,14 +329,12 @@ public class AssociationSourceNameEditPart extends PapyrusLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), - AssociationSourceNameEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), AssociationSourceNameEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -346,6 +352,7 @@ public class AssociationSourceNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -356,6 +363,7 @@ public class AssociationSourceNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -363,6 +371,7 @@ public class AssociationSourceNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Association_Edge, getParserElement(), this, VISUAL_ID); @@ -425,6 +434,7 @@ public class AssociationSourceNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -452,18 +462,13 @@ public class AssociationSourceNameEditPart extends PapyrusLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -475,8 +480,7 @@ public class AssociationSourceNameEditPart extends PapyrusLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -502,10 +506,9 @@ public class AssociationSourceNameEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -521,6 +524,7 @@ public class AssociationSourceNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -562,7 +566,8 @@ public class AssociationSourceNameEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -579,7 +584,8 @@ public class AssociationSourceNameEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -588,11 +594,15 @@ public class AssociationSourceNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -600,6 +610,7 @@ public class AssociationSourceNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -607,6 +618,7 @@ public class AssociationSourceNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -622,6 +634,7 @@ public class AssociationSourceNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -635,6 +648,7 @@ public class AssociationSourceNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -657,7 +671,7 @@ public class AssociationSourceNameEditPart extends PapyrusLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -668,7 +682,7 @@ public class AssociationSourceNameEditPart extends PapyrusLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -681,7 +695,7 @@ public class AssociationSourceNameEditPart extends PapyrusLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -691,43 +705,42 @@ public class AssociationSourceNameEditPart extends PapyrusLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -736,13 +749,11 @@ public class AssociationSourceNameEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -759,6 +770,7 @@ public class AssociationSourceNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -768,10 +780,10 @@ public class AssociationSourceNameEditPart extends PapyrusLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -795,6 +807,7 @@ public class AssociationSourceNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -803,6 +816,7 @@ public class AssociationSourceNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getLabelRole() { return "SourceRole";//$NON-NLS-1$ } @@ -810,6 +824,7 @@ public class AssociationSourceNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getIconPathRole() { return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/role.gif";//$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationTargetNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationTargetNameEditPart.java index fabbb1d55cd..94be5c9dd6e 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationTargetNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationTargetNameEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,12 +64,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -115,12 +115,14 @@ public class AssociationTargetNameEditPart extends PapyrusLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -129,10 +131,7 @@ public class AssociationTargetNameEditPart extends PapyrusLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationTargetNameEditPart.VISUAL_ID), - new Point(0, -20)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.AssociationTargetNameEditPart.VISUAL_ID), new Point(0, -20)); } /** @@ -158,6 +157,7 @@ public class AssociationTargetNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public int getKeyPoint() { return ConnectionLocator.SOURCE; } @@ -228,6 +228,7 @@ public class AssociationTargetNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -235,6 +236,7 @@ public class AssociationTargetNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -242,6 +244,7 @@ public class AssociationTargetNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -267,7 +270,8 @@ public class AssociationTargetNameEditPart extends PapyrusLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -279,6 +283,7 @@ public class AssociationTargetNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -294,11 +299,13 @@ public class AssociationTargetNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -312,6 +319,7 @@ public class AssociationTargetNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -321,14 +329,12 @@ public class AssociationTargetNameEditPart extends PapyrusLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), - AssociationTargetNameEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), AssociationTargetNameEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -346,6 +352,7 @@ public class AssociationTargetNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -356,6 +363,7 @@ public class AssociationTargetNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -363,6 +371,7 @@ public class AssociationTargetNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Association_Edge, getParserElement(), this, VISUAL_ID); @@ -425,6 +434,7 @@ public class AssociationTargetNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -452,18 +462,13 @@ public class AssociationTargetNameEditPart extends PapyrusLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -475,8 +480,7 @@ public class AssociationTargetNameEditPart extends PapyrusLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -502,10 +506,9 @@ public class AssociationTargetNameEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -521,6 +524,7 @@ public class AssociationTargetNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -562,7 +566,8 @@ public class AssociationTargetNameEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -579,7 +584,8 @@ public class AssociationTargetNameEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -588,11 +594,15 @@ public class AssociationTargetNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -600,6 +610,7 @@ public class AssociationTargetNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -607,6 +618,7 @@ public class AssociationTargetNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -622,6 +634,7 @@ public class AssociationTargetNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -635,6 +648,7 @@ public class AssociationTargetNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -657,7 +671,7 @@ public class AssociationTargetNameEditPart extends PapyrusLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -668,7 +682,7 @@ public class AssociationTargetNameEditPart extends PapyrusLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -681,7 +695,7 @@ public class AssociationTargetNameEditPart extends PapyrusLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -691,43 +705,42 @@ public class AssociationTargetNameEditPart extends PapyrusLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -736,13 +749,11 @@ public class AssociationTargetNameEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -759,6 +770,7 @@ public class AssociationTargetNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -768,10 +780,10 @@ public class AssociationTargetNameEditPart extends PapyrusLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -795,6 +807,7 @@ public class AssociationTargetNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -803,6 +816,7 @@ public class AssociationTargetNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getLabelRole() { return "TargetRole";//$NON-NLS-1$ } @@ -810,6 +824,7 @@ public class AssociationTargetNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getIconPathRole() { return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/role.gif";//$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/BindingSubstitutionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/BindingSubstitutionEditPart.java index e52bda42d6a..723d655a630 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/BindingSubstitutionEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/BindingSubstitutionEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,12 +64,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.TemplateBindingDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; @@ -115,12 +115,14 @@ public class BindingSubstitutionEditPart extends PapyrusLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -129,10 +131,7 @@ public class BindingSubstitutionEditPart extends PapyrusLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.BindingSubstitutionEditPart.VISUAL_ID), - new Point(0, 40)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.BindingSubstitutionEditPart.VISUAL_ID), new Point(0, 40)); } /** @@ -158,6 +157,7 @@ public class BindingSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public int getKeyPoint() { return ConnectionLocator.MIDDLE; } @@ -228,6 +228,7 @@ public class BindingSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -235,6 +236,7 @@ public class BindingSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -242,6 +244,7 @@ public class BindingSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -267,7 +270,8 @@ public class BindingSubstitutionEditPart extends PapyrusLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -279,6 +283,7 @@ public class BindingSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -294,11 +299,13 @@ public class BindingSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -312,6 +319,7 @@ public class BindingSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -321,13 +329,12 @@ public class BindingSubstitutionEditPart extends PapyrusLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), BindingSubstitutionEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), BindingSubstitutionEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -345,6 +352,7 @@ public class BindingSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -355,6 +363,7 @@ public class BindingSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -362,6 +371,7 @@ public class BindingSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.TemplateBinding_Edge, getParserElement(), this, VISUAL_ID); @@ -424,6 +434,7 @@ public class BindingSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -451,18 +462,13 @@ public class BindingSubstitutionEditPart extends PapyrusLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -474,8 +480,7 @@ public class BindingSubstitutionEditPart extends PapyrusLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -501,10 +506,9 @@ public class BindingSubstitutionEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -520,6 +524,7 @@ public class BindingSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -561,7 +566,8 @@ public class BindingSubstitutionEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -578,7 +584,8 @@ public class BindingSubstitutionEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -587,11 +594,15 @@ public class BindingSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -599,6 +610,7 @@ public class BindingSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -606,6 +618,7 @@ public class BindingSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -621,6 +634,7 @@ public class BindingSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -634,6 +648,7 @@ public class BindingSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -656,7 +671,7 @@ public class BindingSubstitutionEditPart extends PapyrusLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -675,7 +690,7 @@ public class BindingSubstitutionEditPart extends PapyrusLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -688,7 +703,7 @@ public class BindingSubstitutionEditPart extends PapyrusLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -698,43 +713,42 @@ public class BindingSubstitutionEditPart extends PapyrusLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -743,13 +757,11 @@ public class BindingSubstitutionEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -766,6 +778,7 @@ public class BindingSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -775,10 +788,10 @@ public class BindingSubstitutionEditPart extends PapyrusLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -802,6 +815,7 @@ public class BindingSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -810,6 +824,7 @@ public class BindingSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getLabelRole() { return "TemplateParameterSubstitution";//$NON-NLS-1$ } @@ -817,6 +832,7 @@ public class BindingSubstitutionEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getIconPathRole() { return "platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TemplateParameterSubstitution.gif";//$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassAttributeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassAttributeCompartmentEditPart.java index 61944b6b560..4129535c7e8 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassAttributeCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassAttributeCompartmentEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -31,7 +31,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartme import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -55,6 +54,7 @@ public class ClassAttributeCompartmentEditPart extends ResizeableListCompartment /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; } @@ -62,6 +62,7 @@ public class ClassAttributeCompartmentEditPart extends ResizeableListCompartment /** * @generated */ + @Override public String getCompartmentName() { return Messages.ClassAttributeCompartmentEditPart_title; } @@ -69,6 +70,7 @@ public class ClassAttributeCompartmentEditPart extends ResizeableListCompartment /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -76,16 +78,16 @@ public class ClassAttributeCompartmentEditPart extends ResizeableListCompartment installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassAttributeCompartmentCanonicalEditPolicy()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassAttributeCompartmentCanonicalEditPolicy()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); } /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -95,6 +97,7 @@ public class ClassAttributeCompartmentEditPart extends ResizeableListCompartment /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -103,6 +106,7 @@ public class ClassAttributeCompartmentEditPart extends ResizeableListCompartment /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -117,6 +121,7 @@ public class ClassAttributeCompartmentEditPart extends ResizeableListCompartment /** * @generated */ + @Override protected void refreshBounds() { int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); @@ -124,12 +129,16 @@ public class ClassAttributeCompartmentEditPart extends ResizeableListCompartment int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassAttributeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassAttributeCompartmentEditPartCN.java index 027c96a7f26..ce3b18b96b0 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassAttributeCompartmentEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassAttributeCompartmentEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -31,7 +31,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartme import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -55,6 +54,7 @@ public class ClassAttributeCompartmentEditPartCN extends ResizeableListCompartme /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; } @@ -62,6 +62,7 @@ public class ClassAttributeCompartmentEditPartCN extends ResizeableListCompartme /** * @generated */ + @Override public String getCompartmentName() { return Messages.ClassAttributeCompartmentEditPartCN_title; } @@ -69,6 +70,7 @@ public class ClassAttributeCompartmentEditPartCN extends ResizeableListCompartme /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -76,16 +78,16 @@ public class ClassAttributeCompartmentEditPartCN extends ResizeableListCompartme installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassAttributeCompartmentCanonicalEditPolicyCN()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassAttributeCompartmentCanonicalEditPolicyCN()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); } /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -95,6 +97,7 @@ public class ClassAttributeCompartmentEditPartCN extends ResizeableListCompartme /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -103,6 +106,7 @@ public class ClassAttributeCompartmentEditPartCN extends ResizeableListCompartme /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -117,6 +121,7 @@ public class ClassAttributeCompartmentEditPartCN extends ResizeableListCompartme /** * @generated */ + @Override protected void refreshBounds() { int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); @@ -124,12 +129,16 @@ public class ClassAttributeCompartmentEditPartCN extends ResizeableListCompartme int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassEditPart.java index af98e43a7ac..e2e7a0b8eec 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -96,6 +96,7 @@ public class ClassEditPart extends org.eclipse.papyrus.uml.diagram.common.editpa /** * @generated */ + @Override protected void createDefaultEditPolicies() { installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); super.createDefaultEditPolicies(); @@ -104,18 +105,15 @@ public class ClassEditPart extends org.eclipse.papyrus.uml.diagram.common.editpa installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassCanonicalEditPolicy()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassCanonicalEditPolicy()); installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); - installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, - new ShowHideCompartmentEditPolicy()); - installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, - new ShowHideClassifierContentsEditPolicy()); + installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy()); + installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies @@ -169,9 +167,11 @@ public class ClassEditPart extends org.eclipse.papyrus.uml.diagram.common.editpa } /** - *Papyrus codeGen - *@generated - **/ + * Papyrus codeGen + * + * @generated + **/ + @Override protected void handleNotificationEvent(Notification event) { /* * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart @@ -180,18 +180,18 @@ public class ClassEditPart extends org.eclipse.papyrus.uml.diagram.common.editpa if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) { Object notifier = event.getNotifier(); List<?> modelChildren = ((View) getModel()).getChildren(); - if (false == notifier instanceof Edge && false == notifier instanceof BasicCompartment) { + if (false == notifier instanceof Edge + && false == notifier instanceof BasicCompartment) { if (modelChildren.contains(event.getNotifier())) { return; } } } super.handleNotificationEvent(event); - //set the figure active when the feature of the of a class is true + // set the figure active when the feature of the of a class is true if (resolveSemanticElement() != null) { - if (resolveSemanticElement().equals(event.getNotifier()) && (event.getFeature() instanceof EAttribute) - && ((EAttribute) (event.getFeature())).getName().equals("isActive")) { - ((ClassFigure) getPrimaryShape()).setActive(event.getNewBooleanValue()); + if (resolveSemanticElement().equals(event.getNotifier()) && (event.getFeature() instanceof EAttribute) && ((EAttribute) (event.getFeature())).getName().equals("isActive")) { + getPrimaryShape().setActive(event.getNewBooleanValue()); refreshVisuals(); } } @@ -201,14 +201,17 @@ public class ClassEditPart extends org.eclipse.papyrus.uml.diagram.common.editpa /** * @generated */ + @Override protected IFigure createNodeShape() { return primaryShape = new ClassFigure(); } /** * org.eclipse.papyrus.uml.diagram.common.figure.node.ClassFigure + * * @generated */ + @Override public ClassFigure getPrimaryShape() { return (ClassFigure) primaryShape; } @@ -222,35 +225,38 @@ public class ClassEditPart extends org.eclipse.papyrus.uml.diagram.common.editpa return true; } + if (childEditPart instanceof ClassAttributeCompartmentEditPart) { IFigure pane = getPrimaryShape().getAttributeCompartmentFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((ClassAttributeCompartmentEditPart) childEditPart).getFigure()); return true; } if (childEditPart instanceof ClassOperationCompartmentEditPart) { IFigure pane = getPrimaryShape().getOperationCompartmentFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((ClassOperationCompartmentEditPart) childEditPart).getFigure()); return true; } if (childEditPart instanceof ClassNestedClassifierCompartmentEditPart) { IFigure pane = getPrimaryShape().getNestedClassifierFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((ClassNestedClassifierCompartmentEditPart) childEditPart).getFigure()); return true; } - //Papyrus Gencode :precise the locator for a template signature + + + // Papyrus Gencode :precise the locator for a template signature if (childEditPart instanceof RedefinableTemplateSignatureEditPart) { IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST); - getBorderedFigure().getBorderItemContainer() - .add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator); + getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator); return true; } + return false; } @@ -277,8 +283,7 @@ public class ClassEditPart extends org.eclipse.papyrus.uml.diagram.common.editpa return true; } if (childEditPart instanceof RedefinableTemplateSignatureEditPart) { - getBorderedFigure().getBorderItemContainer() - .remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure()); + getBorderedFigure().getBorderItemContainer().remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure()); return true; } return false; @@ -287,6 +292,7 @@ public class ClassEditPart extends org.eclipse.papyrus.uml.diagram.common.editpa /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -297,6 +303,7 @@ public class ClassEditPart extends org.eclipse.papyrus.uml.diagram.common.editpa /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -307,6 +314,7 @@ public class ClassEditPart extends org.eclipse.papyrus.uml.diagram.common.editpa /** * @generated */ + @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { if (editPart instanceof ClassAttributeCompartmentEditPart) { return getPrimaryShape().getAttributeCompartmentFigure(); @@ -326,6 +334,7 @@ public class ClassEditPart extends org.eclipse.papyrus.uml.diagram.common.editpa /** * @generated */ + @Override protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) { if (borderItemEditPart instanceof ClassFloatingNameEditPart) { IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure()); @@ -338,6 +347,7 @@ public class ClassEditPart extends org.eclipse.papyrus.uml.diagram.common.editpa /** * @generated */ + @Override protected NodeFigure createNodePlate() { RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(100, 100); return result; @@ -345,12 +355,13 @@ public class ClassEditPart extends org.eclipse.papyrus.uml.diagram.common.editpa /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected NodeFigure createMainFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); @@ -359,9 +370,12 @@ public class ClassEditPart extends org.eclipse.papyrus.uml.diagram.common.editpa /** * Default implementation treats passed figure as content pane. * Respects layout one may have set for generated figure. - * @param nodeShape instance of generated figure class + * + * @param nodeShape + * instance of generated figure class * @generated */ + @Override protected IFigure setupContentPane(IFigure nodeShape) { if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); @@ -374,6 +388,7 @@ public class ClassEditPart extends org.eclipse.papyrus.uml.diagram.common.editpa /** * @generated */ + @Override public IFigure getContentPane() { if (contentPane != null) { return contentPane; @@ -384,6 +399,7 @@ public class ClassEditPart extends org.eclipse.papyrus.uml.diagram.common.editpa /** * @generated */ + @Override protected void setForegroundColor(Color color) { if (primaryShape != null) { primaryShape.setForegroundColor(color); @@ -393,6 +409,7 @@ public class ClassEditPart extends org.eclipse.papyrus.uml.diagram.common.editpa /** * @generated */ + @Override protected void setLineWidth(int width) { super.setLineWidth(width); } @@ -400,6 +417,7 @@ public class ClassEditPart extends org.eclipse.papyrus.uml.diagram.common.editpa /** * @generated */ + @Override protected void setLineType(int style) { if (primaryShape instanceof IPapyrusNodeFigure) { ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); @@ -409,6 +427,7 @@ public class ClassEditPart extends org.eclipse.papyrus.uml.diagram.common.editpa /** * @generated */ + @Override public EditPart getPrimaryChildEditPart() { return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassNameEditPart.VISUAL_ID)); } @@ -416,10 +435,10 @@ public class ClassEditPart extends org.eclipse.papyrus.uml.diagram.common.editpa /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { if (request instanceof CreateViewAndElementRequest) { - CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor() - .getCreateElementRequestAdapter(); + CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter(); IElementType type = (IElementType) adapter.getAdapter(IElementType.class); if (UMLElementTypes.isKindOf(type, UMLElementTypes.Property_ClassAttributeLabel)) { return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassAttributeCompartmentEditPart.VISUAL_ID)); @@ -431,32 +450,25 @@ public class ClassEditPart extends org.eclipse.papyrus.uml.diagram.common.editpa return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassOperationCompartmentEditPart.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Class_ClassNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPart.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Interface_ClassNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPart.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Enumeration_ClassNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPart.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.PrimitiveType_ClassNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPart.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.DataType_ClassNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPart.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Signal_ClassNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPart.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Component_ClassNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPart.VISUAL_ID)); } } return super.getTargetEditPart(request); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassEditPartCN.java index eb6bd3cc08a..083259160a9 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -98,6 +98,7 @@ public class ClassEditPartCN extends ClassEditPart { /** * @generated */ + @Override protected void createDefaultEditPolicies() { installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); super.createDefaultEditPolicies(); @@ -106,19 +107,16 @@ public class ClassEditPartCN extends ClassEditPart { installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassCanonicalEditPolicyCN()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassCanonicalEditPolicyCN()); installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); - installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, - new ShowHideCompartmentEditPolicy()); - installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, - new ShowHideClassifierContentsEditPolicy()); + installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy()); + installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies @@ -172,9 +170,11 @@ public class ClassEditPartCN extends ClassEditPart { } /** - *Papyrus codeGen - *@generated - **/ + * Papyrus codeGen + * + * @generated + **/ + @Override protected void handleNotificationEvent(Notification event) { /* * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart @@ -183,18 +183,18 @@ public class ClassEditPartCN extends ClassEditPart { if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) { Object notifier = event.getNotifier(); List<?> modelChildren = ((View) getModel()).getChildren(); - if (false == notifier instanceof Edge && false == notifier instanceof BasicCompartment) { + if (false == notifier instanceof Edge + && false == notifier instanceof BasicCompartment) { if (modelChildren.contains(event.getNotifier())) { return; } } } super.handleNotificationEvent(event); - //set the figure active when the feature of the of a class is true + // set the figure active when the feature of the of a class is true if (resolveSemanticElement() != null) { - if (resolveSemanticElement().equals(event.getNotifier()) && (event.getFeature() instanceof EAttribute) - && ((EAttribute) (event.getFeature())).getName().equals("isActive")) { - ((ClassFigure) getPrimaryShape()).setActive(event.getNewBooleanValue()); + if (resolveSemanticElement().equals(event.getNotifier()) && (event.getFeature() instanceof EAttribute) && ((EAttribute) (event.getFeature())).getName().equals("isActive")) { + getPrimaryShape().setActive(event.getNewBooleanValue()); refreshVisuals(); } } @@ -204,14 +204,17 @@ public class ClassEditPartCN extends ClassEditPart { /** * @generated */ + @Override protected IFigure createNodeShape() { return primaryShape = new ClassFigure(); } /** * org.eclipse.papyrus.uml.diagram.common.figure.node.ClassFigure + * * @generated */ + @Override public ClassFigure getPrimaryShape() { return (ClassFigure) primaryShape; } @@ -225,35 +228,38 @@ public class ClassEditPartCN extends ClassEditPart { return true; } + if (childEditPart instanceof ClassAttributeCompartmentEditPartCN) { IFigure pane = getPrimaryShape().getAttributeCompartmentFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((ClassAttributeCompartmentEditPartCN) childEditPart).getFigure()); return true; } if (childEditPart instanceof ClassOperationCompartmentEditPartCN) { IFigure pane = getPrimaryShape().getOperationCompartmentFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((ClassOperationCompartmentEditPartCN) childEditPart).getFigure()); return true; } if (childEditPart instanceof ClassNestedClassifierCompartmentEditPartCN) { IFigure pane = getPrimaryShape().getNestedClassifierFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((ClassNestedClassifierCompartmentEditPartCN) childEditPart).getFigure()); return true; } - //Papyrus Gencode :precise the locator for a template signature + + + // Papyrus Gencode :precise the locator for a template signature if (childEditPart instanceof RedefinableTemplateSignatureEditPart) { IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST); - getBorderedFigure().getBorderItemContainer() - .add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator); + getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator); return true; } + return false; } @@ -280,8 +286,7 @@ public class ClassEditPartCN extends ClassEditPart { return true; } if (childEditPart instanceof RedefinableTemplateSignatureEditPart) { - getBorderedFigure().getBorderItemContainer() - .remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure()); + getBorderedFigure().getBorderItemContainer().remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure()); return true; } return false; @@ -290,6 +295,7 @@ public class ClassEditPartCN extends ClassEditPart { /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -300,6 +306,7 @@ public class ClassEditPartCN extends ClassEditPart { /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -310,6 +317,7 @@ public class ClassEditPartCN extends ClassEditPart { /** * @generated */ + @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { if (editPart instanceof ClassAttributeCompartmentEditPartCN) { return getPrimaryShape().getAttributeCompartmentFigure(); @@ -329,6 +337,7 @@ public class ClassEditPartCN extends ClassEditPart { /** * @generated */ + @Override protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) { if (borderItemEditPart instanceof ClassFloatingNameEditPartCN) { IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure()); @@ -341,6 +350,7 @@ public class ClassEditPartCN extends ClassEditPart { /** * @generated */ + @Override protected NodeFigure createNodePlate() { RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(100, 100); return result; @@ -348,12 +358,13 @@ public class ClassEditPartCN extends ClassEditPart { /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected NodeFigure createMainFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); @@ -362,9 +373,12 @@ public class ClassEditPartCN extends ClassEditPart { /** * Default implementation treats passed figure as content pane. * Respects layout one may have set for generated figure. - * @param nodeShape instance of generated figure class + * + * @param nodeShape + * instance of generated figure class * @generated */ + @Override protected IFigure setupContentPane(IFigure nodeShape) { if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); @@ -377,6 +391,7 @@ public class ClassEditPartCN extends ClassEditPart { /** * @generated */ + @Override public IFigure getContentPane() { if (contentPane != null) { return contentPane; @@ -387,6 +402,7 @@ public class ClassEditPartCN extends ClassEditPart { /** * @generated */ + @Override protected void setForegroundColor(Color color) { if (primaryShape != null) { primaryShape.setForegroundColor(color); @@ -396,6 +412,7 @@ public class ClassEditPartCN extends ClassEditPart { /** * @generated */ + @Override protected void setLineWidth(int width) { super.setLineWidth(width); } @@ -403,6 +420,7 @@ public class ClassEditPartCN extends ClassEditPart { /** * @generated */ + @Override protected void setLineType(int style) { if (primaryShape instanceof IPapyrusNodeFigure) { ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); @@ -412,6 +430,7 @@ public class ClassEditPartCN extends ClassEditPart { /** * @generated */ + @Override public EditPart getPrimaryChildEditPart() { return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassNameEditPartCN.VISUAL_ID)); } @@ -419,50 +438,40 @@ public class ClassEditPartCN extends ClassEditPart { /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { if (request instanceof CreateViewAndElementRequest) { - CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor() - .getCreateElementRequestAdapter(); + CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter(); IElementType type = (IElementType) adapter.getAdapter(IElementType.class); if (UMLElementTypes.isKindOf(type, UMLElementTypes.Property_ClassAttributeLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(ClassAttributeCompartmentEditPartCN.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassAttributeCompartmentEditPartCN.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Reception_ReceptionLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(ClassOperationCompartmentEditPartCN.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassOperationCompartmentEditPartCN.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Operation_ClassOperationLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(ClassOperationCompartmentEditPartCN.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassOperationCompartmentEditPartCN.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Class_ClassNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Interface_ClassNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Enumeration_ClassNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.PrimitiveType_ClassNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.DataType_ClassNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Signal_ClassNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Component_ClassNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID)); } } return super.getTargetEditPart(request); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassFloatingNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassFloatingNameEditPart.java index 7652aa34efa..cc8100a6c40 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassFloatingNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassFloatingNameEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -50,6 +50,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -60,11 +65,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -115,12 +115,14 @@ public class ClassFloatingNameEditPart extends FloatingLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -129,10 +131,7 @@ public class ClassFloatingNameEditPart extends FloatingLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry - .getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassFloatingNameEditPart.VISUAL_ID), - new Point(0, 0)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassFloatingNameEditPart.VISUAL_ID), new Point(0, 0)); } /** @@ -145,6 +144,7 @@ public class ClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); @@ -156,6 +156,7 @@ public class ClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IBorderItemLocator getBorderItemLocator() { IFigure parentFigure = getFigure().getParent(); if (parentFigure != null && parentFigure.getLayoutManager() != null) { @@ -168,6 +169,7 @@ public class ClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public void refreshBounds() { int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); @@ -242,6 +244,7 @@ public class ClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -249,6 +252,7 @@ public class ClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -281,7 +285,8 @@ public class ClassFloatingNameEditPart extends FloatingLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -293,6 +298,7 @@ public class ClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -308,11 +314,13 @@ public class ClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -326,6 +334,7 @@ public class ClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -335,13 +344,12 @@ public class ClassFloatingNameEditPart extends FloatingLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), ClassFloatingNameEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ClassFloatingNameEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -359,6 +367,7 @@ public class ClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -369,6 +378,7 @@ public class ClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -376,6 +386,7 @@ public class ClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Class_Shape, getParserElement(), this, VISUAL_ID); @@ -438,6 +449,7 @@ public class ClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -465,18 +477,13 @@ public class ClassFloatingNameEditPart extends FloatingLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -488,8 +495,7 @@ public class ClassFloatingNameEditPart extends FloatingLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -515,10 +521,9 @@ public class ClassFloatingNameEditPart extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -534,6 +539,7 @@ public class ClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -575,7 +581,8 @@ public class ClassFloatingNameEditPart extends FloatingLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -592,7 +599,8 @@ public class ClassFloatingNameEditPart extends FloatingLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -601,11 +609,15 @@ public class ClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -613,6 +625,7 @@ public class ClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -620,6 +633,7 @@ public class ClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -635,6 +649,7 @@ public class ClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -648,6 +663,7 @@ public class ClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -670,7 +686,7 @@ public class ClassFloatingNameEditPart extends FloatingLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -689,7 +705,7 @@ public class ClassFloatingNameEditPart extends FloatingLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -702,7 +718,7 @@ public class ClassFloatingNameEditPart extends FloatingLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -712,43 +728,42 @@ public class ClassFloatingNameEditPart extends FloatingLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -757,13 +772,11 @@ public class ClassFloatingNameEditPart extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -780,6 +793,7 @@ public class ClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -789,10 +803,10 @@ public class ClassFloatingNameEditPart extends FloatingLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -815,6 +829,7 @@ public class ClassFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassFloatingNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassFloatingNameEditPartCN.java index 5f010f98e14..b19c2393838 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassFloatingNameEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassFloatingNameEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -50,6 +50,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -60,11 +65,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -115,12 +115,14 @@ public class ClassFloatingNameEditPartCN extends FloatingLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -129,10 +131,7 @@ public class ClassFloatingNameEditPartCN extends FloatingLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassFloatingNameEditPartCN.VISUAL_ID), - new Point(0, 0)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassFloatingNameEditPartCN.VISUAL_ID), new Point(0, 0)); } /** @@ -145,6 +144,7 @@ public class ClassFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); @@ -156,6 +156,7 @@ public class ClassFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public IBorderItemLocator getBorderItemLocator() { IFigure parentFigure = getFigure().getParent(); if (parentFigure != null && parentFigure.getLayoutManager() != null) { @@ -168,6 +169,7 @@ public class ClassFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public void refreshBounds() { int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); @@ -242,6 +244,7 @@ public class ClassFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -249,6 +252,7 @@ public class ClassFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -281,7 +285,8 @@ public class ClassFloatingNameEditPartCN extends FloatingLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -293,6 +298,7 @@ public class ClassFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -308,11 +314,13 @@ public class ClassFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -326,6 +334,7 @@ public class ClassFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -335,13 +344,12 @@ public class ClassFloatingNameEditPartCN extends FloatingLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), ClassFloatingNameEditPartCN.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ClassFloatingNameEditPartCN.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -359,6 +367,7 @@ public class ClassFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -369,6 +378,7 @@ public class ClassFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -376,6 +386,7 @@ public class ClassFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Class_Shape_CN, getParserElement(), this, VISUAL_ID); @@ -438,6 +449,7 @@ public class ClassFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -465,18 +477,13 @@ public class ClassFloatingNameEditPartCN extends FloatingLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -488,8 +495,7 @@ public class ClassFloatingNameEditPartCN extends FloatingLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -515,10 +521,9 @@ public class ClassFloatingNameEditPartCN extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -534,6 +539,7 @@ public class ClassFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -575,7 +581,8 @@ public class ClassFloatingNameEditPartCN extends FloatingLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -592,7 +599,8 @@ public class ClassFloatingNameEditPartCN extends FloatingLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -601,11 +609,15 @@ public class ClassFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -613,6 +625,7 @@ public class ClassFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -620,6 +633,7 @@ public class ClassFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -635,6 +649,7 @@ public class ClassFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -648,6 +663,7 @@ public class ClassFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -670,7 +686,7 @@ public class ClassFloatingNameEditPartCN extends FloatingLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -689,7 +705,7 @@ public class ClassFloatingNameEditPartCN extends FloatingLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -702,7 +718,7 @@ public class ClassFloatingNameEditPartCN extends FloatingLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -712,43 +728,42 @@ public class ClassFloatingNameEditPartCN extends FloatingLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -757,13 +772,11 @@ public class ClassFloatingNameEditPartCN extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -780,6 +793,7 @@ public class ClassFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -789,10 +803,10 @@ public class ClassFloatingNameEditPartCN extends FloatingLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -815,6 +829,7 @@ public class ClassFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassNameEditPart.java index 0a6667f64aa..3558698325c 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassNameEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,20 +64,12 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -115,12 +113,14 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -135,6 +135,7 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy()); @@ -208,6 +209,7 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -215,6 +217,7 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -222,6 +225,7 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -237,8 +241,7 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -248,7 +251,8 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -260,6 +264,7 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -275,11 +280,13 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -293,6 +300,7 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -302,14 +310,12 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), ClassNameEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ClassNameEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -327,6 +333,7 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -337,6 +344,7 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -344,6 +352,7 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Class_Shape, getParserElement(), this, VISUAL_ID); @@ -406,6 +415,7 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -433,18 +443,13 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -456,8 +461,7 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -483,10 +487,9 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -502,6 +505,7 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -543,7 +547,8 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -560,7 +565,8 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -569,11 +575,15 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -581,6 +591,7 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -588,6 +599,7 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -603,6 +615,7 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -616,6 +629,7 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -638,7 +652,7 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -657,7 +671,7 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -670,7 +684,7 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -680,43 +694,42 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -725,13 +738,11 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -748,6 +759,7 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -756,6 +768,7 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -764,6 +777,7 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); @@ -774,10 +788,10 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -794,8 +808,7 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } super.handleNotificationEvent(event); @@ -804,6 +817,7 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -817,6 +831,7 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void activate() { super.activate(); addOwnerElementListeners(); @@ -833,6 +848,7 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void deactivate() { removeOwnerElementListeners(); super.deactivate(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassNameEditPartCN.java index ecff84db62c..d656bff9394 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassNameEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassNameEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,20 +64,12 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -115,12 +113,14 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -135,6 +135,7 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy()); @@ -208,6 +209,7 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -215,6 +217,7 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -222,6 +225,7 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -237,8 +241,7 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -248,7 +251,8 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -260,6 +264,7 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -275,11 +280,13 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -293,6 +300,7 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -302,13 +310,12 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), ClassNameEditPartCN.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ClassNameEditPartCN.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -326,6 +333,7 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -336,6 +344,7 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -343,6 +352,7 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Class_Shape_CN, getParserElement(), this, VISUAL_ID); @@ -405,6 +415,7 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -432,18 +443,13 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -455,8 +461,7 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -482,10 +487,9 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -501,6 +505,7 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -542,7 +547,8 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -559,7 +565,8 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -568,11 +575,15 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -580,6 +591,7 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -587,6 +599,7 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -602,6 +615,7 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -615,6 +629,7 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -637,7 +652,7 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -656,7 +671,7 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -669,7 +684,7 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -679,43 +694,42 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -724,13 +738,11 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -747,6 +759,7 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -755,6 +768,7 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -763,6 +777,7 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); @@ -773,10 +788,10 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -793,8 +808,7 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } super.handleNotificationEvent(event); @@ -803,6 +817,7 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -816,6 +831,7 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void activate() { super.activate(); addOwnerElementListeners(); @@ -832,6 +848,7 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void deactivate() { removeOwnerElementListeners(); super.deactivate(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassNestedClassifierCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassNestedClassifierCompartmentEditPart.java index bcdbee01df7..b2ed93de9cb 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassNestedClassifierCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassNestedClassifierCompartmentEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -32,7 +32,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentS import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedClazzCompartmentCreationEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -56,6 +55,7 @@ public class ClassNestedClassifierCompartmentEditPart extends ResizeableListComp /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; } @@ -63,6 +63,7 @@ public class ClassNestedClassifierCompartmentEditPart extends ResizeableListComp /** * @generated */ + @Override public String getCompartmentName() { return Messages.ClassNestedClassifierCompartmentEditPart_title; } @@ -70,6 +71,7 @@ public class ClassNestedClassifierCompartmentEditPart extends ResizeableListComp /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -77,10 +79,9 @@ public class ClassNestedClassifierCompartmentEditPart extends ResizeableListComp installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassNestedClassifierCompartmentCanonicalEditPolicy()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassNestedClassifierCompartmentCanonicalEditPolicy()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); installEditPolicy(EditPolicyRoles.CREATION_ROLE, new NestedClazzCompartmentCreationEditPolicy()); } @@ -88,6 +89,7 @@ public class ClassNestedClassifierCompartmentEditPart extends ResizeableListComp /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -97,6 +99,7 @@ public class ClassNestedClassifierCompartmentEditPart extends ResizeableListComp /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -105,6 +108,7 @@ public class ClassNestedClassifierCompartmentEditPart extends ResizeableListComp /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -119,6 +123,7 @@ public class ClassNestedClassifierCompartmentEditPart extends ResizeableListComp /** * @generated */ + @Override protected void refreshBounds() { int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); @@ -126,12 +131,16 @@ public class ClassNestedClassifierCompartmentEditPart extends ResizeableListComp int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassNestedClassifierCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassNestedClassifierCompartmentEditPartCN.java index 9f23c89058c..b9573959e92 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassNestedClassifierCompartmentEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassNestedClassifierCompartmentEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -32,7 +32,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentS import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedClazzCompartmentCreationEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -56,6 +55,7 @@ public class ClassNestedClassifierCompartmentEditPartCN extends ResizeableListCo /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; } @@ -63,6 +63,7 @@ public class ClassNestedClassifierCompartmentEditPartCN extends ResizeableListCo /** * @generated */ + @Override public String getCompartmentName() { return Messages.ClassNestedClassifierCompartmentEditPartCN_title; } @@ -70,6 +71,7 @@ public class ClassNestedClassifierCompartmentEditPartCN extends ResizeableListCo /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -77,10 +79,9 @@ public class ClassNestedClassifierCompartmentEditPartCN extends ResizeableListCo installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassNestedClassifierCompartmentCanonicalEditPolicyCN()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassNestedClassifierCompartmentCanonicalEditPolicyCN()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); installEditPolicy(EditPolicyRoles.CREATION_ROLE, new NestedClazzCompartmentCreationEditPolicy()); } @@ -88,6 +89,7 @@ public class ClassNestedClassifierCompartmentEditPartCN extends ResizeableListCo /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -97,6 +99,7 @@ public class ClassNestedClassifierCompartmentEditPartCN extends ResizeableListCo /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -105,6 +108,7 @@ public class ClassNestedClassifierCompartmentEditPartCN extends ResizeableListCo /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -119,6 +123,7 @@ public class ClassNestedClassifierCompartmentEditPartCN extends ResizeableListCo /** * @generated */ + @Override protected void refreshBounds() { int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); @@ -126,12 +131,16 @@ public class ClassNestedClassifierCompartmentEditPartCN extends ResizeableListCo int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassOperationCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassOperationCompartmentEditPart.java index 39068a64368..7e81288e8da 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassOperationCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassOperationCompartmentEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -31,7 +31,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartme import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -55,6 +54,7 @@ public class ClassOperationCompartmentEditPart extends ResizeableListCompartment /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; } @@ -62,6 +62,7 @@ public class ClassOperationCompartmentEditPart extends ResizeableListCompartment /** * @generated */ + @Override public String getCompartmentName() { return Messages.ClassOperationCompartmentEditPart_title; } @@ -69,6 +70,7 @@ public class ClassOperationCompartmentEditPart extends ResizeableListCompartment /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -76,16 +78,16 @@ public class ClassOperationCompartmentEditPart extends ResizeableListCompartment installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassOperationCompartmentCanonicalEditPolicy()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassOperationCompartmentCanonicalEditPolicy()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); } /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -95,6 +97,7 @@ public class ClassOperationCompartmentEditPart extends ResizeableListCompartment /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -103,6 +106,7 @@ public class ClassOperationCompartmentEditPart extends ResizeableListCompartment /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -117,6 +121,7 @@ public class ClassOperationCompartmentEditPart extends ResizeableListCompartment /** * @generated */ + @Override protected void refreshBounds() { int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); @@ -124,12 +129,16 @@ public class ClassOperationCompartmentEditPart extends ResizeableListCompartment int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassOperationCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassOperationCompartmentEditPartCN.java index ba3d6986c97..dded1d42430 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassOperationCompartmentEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassOperationCompartmentEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -31,7 +31,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartme import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -55,6 +54,7 @@ public class ClassOperationCompartmentEditPartCN extends ResizeableListCompartme /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; } @@ -62,6 +62,7 @@ public class ClassOperationCompartmentEditPartCN extends ResizeableListCompartme /** * @generated */ + @Override public String getCompartmentName() { return Messages.ClassOperationCompartmentEditPartCN_title; } @@ -69,6 +70,7 @@ public class ClassOperationCompartmentEditPartCN extends ResizeableListCompartme /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -76,16 +78,16 @@ public class ClassOperationCompartmentEditPartCN extends ResizeableListCompartme installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassOperationCompartmentCanonicalEditPolicyCN()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ClassOperationCompartmentCanonicalEditPolicyCN()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); } /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -95,6 +97,7 @@ public class ClassOperationCompartmentEditPartCN extends ResizeableListCompartme /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -103,6 +106,7 @@ public class ClassOperationCompartmentEditPartCN extends ResizeableListCompartme /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -117,6 +121,7 @@ public class ClassOperationCompartmentEditPartCN extends ResizeableListCompartme /** * @generated */ + @Override protected void refreshBounds() { int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); @@ -124,12 +129,16 @@ public class ClassOperationCompartmentEditPartCN extends ResizeableListCompartme int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassifierTemplateParameterEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassifierTemplateParameterEditPart.java index 299d6a20825..f7e005b1c8a 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassifierTemplateParameterEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassifierTemplateParameterEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -53,6 +53,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -63,11 +68,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.AbstractTemplateParameterEditPart; import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.TemplateParameterFigure; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.TemplateParamaterDisplayEditPolicy; @@ -121,12 +121,14 @@ public class ClassifierTemplateParameterEditPart extends AbstractTemplateParamet /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -141,6 +143,7 @@ public class ClassifierTemplateParameterEditPart extends AbstractTemplateParamet /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -151,14 +154,14 @@ public class ClassifierTemplateParameterEditPart extends AbstractTemplateParamet /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy()); installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); - installEditPolicy(TemplateParamaterDisplayEditPolicy.TEMPLATE_PARAMETER_DISPLAY, - new TemplateParamaterDisplayEditPolicy()); + installEditPolicy(TemplateParamaterDisplayEditPolicy.TEMPLATE_PARAMETER_DISPLAY, new TemplateParamaterDisplayEditPolicy()); } /** @@ -227,6 +230,7 @@ public class ClassifierTemplateParameterEditPart extends AbstractTemplateParamet /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -234,6 +238,7 @@ public class ClassifierTemplateParameterEditPart extends AbstractTemplateParamet /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -241,6 +246,7 @@ public class ClassifierTemplateParameterEditPart extends AbstractTemplateParamet /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -266,7 +272,8 @@ public class ClassifierTemplateParameterEditPart extends AbstractTemplateParamet String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -278,6 +285,7 @@ public class ClassifierTemplateParameterEditPart extends AbstractTemplateParamet /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -293,11 +301,13 @@ public class ClassifierTemplateParameterEditPart extends AbstractTemplateParamet /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -311,6 +321,7 @@ public class ClassifierTemplateParameterEditPart extends AbstractTemplateParamet /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -320,16 +331,12 @@ public class ClassifierTemplateParameterEditPart extends AbstractTemplateParamet final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - ClassifierTemplateParameterEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ClassifierTemplateParameterEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -347,6 +354,7 @@ public class ClassifierTemplateParameterEditPart extends AbstractTemplateParamet /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -357,6 +365,7 @@ public class ClassifierTemplateParameterEditPart extends AbstractTemplateParamet /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -364,10 +373,10 @@ public class ClassifierTemplateParameterEditPart extends AbstractTemplateParamet /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.ClassifierTemplateParameter_TemplateParameterLabel, - getParserElement(), this, VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.ClassifierTemplateParameter_TemplateParameterLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -427,6 +436,7 @@ public class ClassifierTemplateParameterEditPart extends AbstractTemplateParamet /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -454,18 +464,13 @@ public class ClassifierTemplateParameterEditPart extends AbstractTemplateParamet initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -477,8 +482,7 @@ public class ClassifierTemplateParameterEditPart extends AbstractTemplateParamet @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -504,10 +508,9 @@ public class ClassifierTemplateParameterEditPart extends AbstractTemplateParamet @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -523,6 +526,7 @@ public class ClassifierTemplateParameterEditPart extends AbstractTemplateParamet /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -564,7 +568,8 @@ public class ClassifierTemplateParameterEditPart extends AbstractTemplateParamet * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -581,7 +586,8 @@ public class ClassifierTemplateParameterEditPart extends AbstractTemplateParamet * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -590,11 +596,15 @@ public class ClassifierTemplateParameterEditPart extends AbstractTemplateParamet /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -602,6 +612,7 @@ public class ClassifierTemplateParameterEditPart extends AbstractTemplateParamet /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -609,6 +620,7 @@ public class ClassifierTemplateParameterEditPart extends AbstractTemplateParamet /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -624,6 +636,7 @@ public class ClassifierTemplateParameterEditPart extends AbstractTemplateParamet /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -637,6 +650,7 @@ public class ClassifierTemplateParameterEditPart extends AbstractTemplateParamet /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -659,7 +673,7 @@ public class ClassifierTemplateParameterEditPart extends AbstractTemplateParamet /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -678,7 +692,7 @@ public class ClassifierTemplateParameterEditPart extends AbstractTemplateParamet /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -691,7 +705,7 @@ public class ClassifierTemplateParameterEditPart extends AbstractTemplateParamet /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -701,43 +715,42 @@ public class ClassifierTemplateParameterEditPart extends AbstractTemplateParamet /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -746,13 +759,11 @@ public class ClassifierTemplateParameterEditPart extends AbstractTemplateParamet @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -769,6 +780,7 @@ public class ClassifierTemplateParameterEditPart extends AbstractTemplateParamet /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -777,6 +789,7 @@ public class ClassifierTemplateParameterEditPart extends AbstractTemplateParamet /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -785,6 +798,7 @@ public class ClassifierTemplateParameterEditPart extends AbstractTemplateParamet /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -794,10 +808,10 @@ public class ClassifierTemplateParameterEditPart extends AbstractTemplateParamet refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -823,6 +837,7 @@ public class ClassifierTemplateParameterEditPart extends AbstractTemplateParamet /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentAnnotatedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentAnnotatedElementEditPart.java index 55b1ab5ad6e..86e52f350b2 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentAnnotatedElementEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentAnnotatedElementEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -24,8 +24,8 @@ import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPar import org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure; /** - * @generated - */ + * @generated + */ public class CommentAnnotatedElementEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart { /** @@ -43,6 +43,7 @@ public class CommentAnnotatedElementEditPart extends UMLConnectionNodeEditPart i /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); @@ -51,12 +52,13 @@ public class CommentAnnotatedElementEditPart extends UMLConnectionNodeEditPart i /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected Connection createConnectionFigure() { return new SimpleDashedEdgeFigure(); } @@ -64,6 +66,7 @@ public class CommentAnnotatedElementEditPart extends UMLConnectionNodeEditPart i /** * @generated */ + @Override public SimpleDashedEdgeFigure getPrimaryShape() { return (SimpleDashedEdgeFigure) getFigure(); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentBodyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentBodyEditPart.java index 9b59a4beefb..ca9ab710821 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentBodyEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentBodyEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -47,6 +47,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -57,11 +62,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -111,12 +111,14 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -131,6 +133,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy()); @@ -204,6 +207,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -211,6 +215,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -218,6 +223,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -243,7 +249,8 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -255,6 +262,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -270,11 +278,13 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -288,6 +298,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -297,13 +308,12 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), CommentBodyEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), CommentBodyEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -321,6 +331,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -331,6 +342,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -338,6 +350,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Comment_Shape, getParserElement(), this, VISUAL_ID); @@ -400,6 +413,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -427,18 +441,13 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -450,8 +459,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -477,10 +485,9 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -496,6 +503,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -537,7 +545,8 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -554,7 +563,8 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -563,11 +573,15 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -575,6 +589,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -582,6 +597,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -597,6 +613,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -610,6 +627,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -632,7 +650,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -651,7 +669,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -664,7 +682,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -674,43 +692,42 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -719,13 +736,11 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -742,6 +757,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -750,6 +766,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -758,6 +775,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); @@ -768,10 +786,10 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -794,6 +812,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -807,6 +826,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void activate() { super.activate(); addOwnerElementListeners(); @@ -823,6 +843,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void deactivate() { removeOwnerElementListeners(); super.deactivate(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentBodyEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentBodyEditPartCN.java index fc562edabda..ad068f0778c 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentBodyEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentBodyEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -47,6 +47,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -57,11 +62,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -111,12 +111,14 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -131,6 +133,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy()); @@ -204,6 +207,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -211,6 +215,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -218,6 +223,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -243,7 +249,8 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -255,6 +262,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -270,11 +278,13 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -288,6 +298,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -297,13 +308,12 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), CommentBodyEditPartCN.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), CommentBodyEditPartCN.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -321,6 +331,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -331,6 +342,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -338,6 +350,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Comment_Shape_CN, getParserElement(), this, VISUAL_ID); @@ -400,6 +413,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -427,18 +441,13 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -450,8 +459,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -477,10 +485,9 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -496,6 +503,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -537,7 +545,8 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -554,7 +563,8 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -563,11 +573,15 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -575,6 +589,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -582,6 +597,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -597,6 +613,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -610,6 +627,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -632,7 +650,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -651,7 +669,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -664,7 +682,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -674,43 +692,42 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -719,13 +736,11 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -742,6 +757,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -750,6 +766,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -758,6 +775,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); @@ -768,10 +786,10 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -794,6 +812,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -807,6 +826,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void activate() { super.activate(); addOwnerElementListeners(); @@ -823,6 +843,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void deactivate() { removeOwnerElementListeners(); super.deactivate(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentEditPart.java index efa562c9f86..6096cd9e40a 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -71,6 +71,7 @@ public class CommentEditPart extends AbstractCommentEditPart { /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); @@ -79,8 +80,7 @@ public class CommentEditPart extends AbstractCommentEditPart { installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusReflowableShapeEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE); @@ -115,9 +115,11 @@ public class CommentEditPart extends AbstractCommentEditPart { } /** - *Papyrus codeGen - *@generated - **/ + * Papyrus codeGen + * + * @generated + **/ + @Override protected void handleNotificationEvent(Notification event) { super.handleNotificationEvent(event); @@ -126,14 +128,17 @@ public class CommentEditPart extends AbstractCommentEditPart { /** * @generated */ + @Override protected IFigure createNodeShape() { return primaryShape = new HTMLCornerBentFigure(); } /** * org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure + * * @generated */ + @Override public HTMLCornerBentFigure getPrimaryShape() { return (HTMLCornerBentFigure) primaryShape; } @@ -147,6 +152,7 @@ public class CommentEditPart extends AbstractCommentEditPart { return true; } + return false; } @@ -163,6 +169,7 @@ public class CommentEditPart extends AbstractCommentEditPart { /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -173,6 +180,7 @@ public class CommentEditPart extends AbstractCommentEditPart { /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -183,6 +191,7 @@ public class CommentEditPart extends AbstractCommentEditPart { /** * @generated */ + @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { return getContentPane(); } @@ -190,6 +199,7 @@ public class CommentEditPart extends AbstractCommentEditPart { /** * @generated */ + @Override protected NodeFigure createNodePlate() { RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40); return result; @@ -197,12 +207,13 @@ public class CommentEditPart extends AbstractCommentEditPart { /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected NodeFigure createNodeFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); @@ -211,9 +222,12 @@ public class CommentEditPart extends AbstractCommentEditPart { /** * Default implementation treats passed figure as content pane. * Respects layout one may have set for generated figure. - * @param nodeShape instance of generated figure class + * + * @param nodeShape + * instance of generated figure class * @generated */ + @Override protected IFigure setupContentPane(IFigure nodeShape) { if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); @@ -226,6 +240,7 @@ public class CommentEditPart extends AbstractCommentEditPart { /** * @generated */ + @Override public IFigure getContentPane() { if (contentPane != null) { return contentPane; @@ -236,6 +251,7 @@ public class CommentEditPart extends AbstractCommentEditPart { /** * @generated */ + @Override protected void setForegroundColor(Color color) { if (primaryShape != null) { primaryShape.setForegroundColor(color); @@ -245,6 +261,7 @@ public class CommentEditPart extends AbstractCommentEditPart { /** * @generated */ + @Override protected void setLineWidth(int width) { super.setLineWidth(width); } @@ -252,6 +269,7 @@ public class CommentEditPart extends AbstractCommentEditPart { /** * @generated */ + @Override protected void setLineType(int style) { if (primaryShape instanceof IPapyrusNodeFigure) { ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); @@ -261,6 +279,7 @@ public class CommentEditPart extends AbstractCommentEditPart { /** * @generated */ + @Override public EditPart getPrimaryChildEditPart() { return getChildBySemanticHint(UMLVisualIDRegistry.getType(CommentBodyEditPart.VISUAL_ID)); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentEditPartCN.java index 5bd9f30d2d7..98aed003b58 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -71,6 +71,7 @@ public class CommentEditPartCN extends AbstractCommentEditPart { /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); @@ -79,8 +80,7 @@ public class CommentEditPartCN extends AbstractCommentEditPart { installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new PapyrusReflowableShapeEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE); @@ -115,9 +115,11 @@ public class CommentEditPartCN extends AbstractCommentEditPart { } /** - *Papyrus codeGen - *@generated - **/ + * Papyrus codeGen + * + * @generated + **/ + @Override protected void handleNotificationEvent(Notification event) { super.handleNotificationEvent(event); @@ -126,14 +128,17 @@ public class CommentEditPartCN extends AbstractCommentEditPart { /** * @generated */ + @Override protected IFigure createNodeShape() { return primaryShape = new HTMLCornerBentFigure(); } /** * org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure + * * @generated */ + @Override public HTMLCornerBentFigure getPrimaryShape() { return (HTMLCornerBentFigure) primaryShape; } @@ -147,6 +152,7 @@ public class CommentEditPartCN extends AbstractCommentEditPart { return true; } + return false; } @@ -163,6 +169,7 @@ public class CommentEditPartCN extends AbstractCommentEditPart { /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -173,6 +180,7 @@ public class CommentEditPartCN extends AbstractCommentEditPart { /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -183,6 +191,7 @@ public class CommentEditPartCN extends AbstractCommentEditPart { /** * @generated */ + @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { return getContentPane(); } @@ -190,6 +199,7 @@ public class CommentEditPartCN extends AbstractCommentEditPart { /** * @generated */ + @Override protected NodeFigure createNodePlate() { RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40); return result; @@ -197,12 +207,13 @@ public class CommentEditPartCN extends AbstractCommentEditPart { /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected NodeFigure createNodeFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); @@ -211,9 +222,12 @@ public class CommentEditPartCN extends AbstractCommentEditPart { /** * Default implementation treats passed figure as content pane. * Respects layout one may have set for generated figure. - * @param nodeShape instance of generated figure class + * + * @param nodeShape + * instance of generated figure class * @generated */ + @Override protected IFigure setupContentPane(IFigure nodeShape) { if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); @@ -226,6 +240,7 @@ public class CommentEditPartCN extends AbstractCommentEditPart { /** * @generated */ + @Override public IFigure getContentPane() { if (contentPane != null) { return contentPane; @@ -236,6 +251,7 @@ public class CommentEditPartCN extends AbstractCommentEditPart { /** * @generated */ + @Override protected void setForegroundColor(Color color) { if (primaryShape != null) { primaryShape.setForegroundColor(color); @@ -245,6 +261,7 @@ public class CommentEditPartCN extends AbstractCommentEditPart { /** * @generated */ + @Override protected void setLineWidth(int width) { super.setLineWidth(width); } @@ -252,6 +269,7 @@ public class CommentEditPartCN extends AbstractCommentEditPart { /** * @generated */ + @Override protected void setLineType(int style) { if (primaryShape instanceof IPapyrusNodeFigure) { ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); @@ -261,6 +279,7 @@ public class CommentEditPartCN extends AbstractCommentEditPart { /** * @generated */ + @Override public EditPart getPrimaryChildEditPart() { return getChildBySemanticHint(UMLVisualIDRegistry.getType(CommentBodyEditPartCN.VISUAL_ID)); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentAttributeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentAttributeCompartmentEditPart.java index 11104043653..c5999aec9ad 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentAttributeCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentAttributeCompartmentEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -31,7 +31,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartme import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -55,6 +54,7 @@ public class ComponentAttributeCompartmentEditPart extends ResizeableListCompart /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; } @@ -62,6 +62,7 @@ public class ComponentAttributeCompartmentEditPart extends ResizeableListCompart /** * @generated */ + @Override public String getCompartmentName() { return Messages.ComponentAttributeCompartmentEditPart_title; } @@ -69,6 +70,7 @@ public class ComponentAttributeCompartmentEditPart extends ResizeableListCompart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -76,16 +78,16 @@ public class ComponentAttributeCompartmentEditPart extends ResizeableListCompart installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentAttributeCompartmentCanonicalEditPolicy()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentAttributeCompartmentCanonicalEditPolicy()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); } /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -95,6 +97,7 @@ public class ComponentAttributeCompartmentEditPart extends ResizeableListCompart /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -103,6 +106,7 @@ public class ComponentAttributeCompartmentEditPart extends ResizeableListCompart /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -117,6 +121,7 @@ public class ComponentAttributeCompartmentEditPart extends ResizeableListCompart /** * @generated */ + @Override protected void refreshBounds() { int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); @@ -124,12 +129,16 @@ public class ComponentAttributeCompartmentEditPart extends ResizeableListCompart int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentAttributeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentAttributeCompartmentEditPartCN.java index 57dbca68347..204b8e1746e 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentAttributeCompartmentEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentAttributeCompartmentEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -31,7 +31,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartme import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -55,6 +54,7 @@ public class ComponentAttributeCompartmentEditPartCN extends ResizeableListCompa /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; } @@ -62,6 +62,7 @@ public class ComponentAttributeCompartmentEditPartCN extends ResizeableListCompa /** * @generated */ + @Override public String getCompartmentName() { return Messages.ComponentAttributeCompartmentEditPartCN_title; } @@ -69,6 +70,7 @@ public class ComponentAttributeCompartmentEditPartCN extends ResizeableListCompa /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -76,16 +78,16 @@ public class ComponentAttributeCompartmentEditPartCN extends ResizeableListCompa installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentAttributeCompartmentCanonicalEditPolicyCN()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentAttributeCompartmentCanonicalEditPolicyCN()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); } /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -95,6 +97,7 @@ public class ComponentAttributeCompartmentEditPartCN extends ResizeableListCompa /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -103,6 +106,7 @@ public class ComponentAttributeCompartmentEditPartCN extends ResizeableListCompa /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -117,6 +121,7 @@ public class ComponentAttributeCompartmentEditPartCN extends ResizeableListCompa /** * @generated */ + @Override protected void refreshBounds() { int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); @@ -124,12 +129,16 @@ public class ComponentAttributeCompartmentEditPartCN extends ResizeableListCompa int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPart.java index 002a2a8883e..8bfb69a041c 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -96,6 +96,7 @@ public class ComponentEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void createDefaultEditPolicies() { installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); super.createDefaultEditPolicies(); @@ -104,18 +105,15 @@ public class ComponentEditPart extends ClassifierEditPart { installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentCanonicalEditPolicy()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentCanonicalEditPolicy()); installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); - installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, - new ShowHideCompartmentEditPolicy()); - installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, - new ShowHideClassifierContentsEditPolicy()); + installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy()); + installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies @@ -169,9 +167,11 @@ public class ComponentEditPart extends ClassifierEditPart { } /** - *Papyrus codeGen - *@generated - **/ + * Papyrus codeGen + * + * @generated + **/ + @Override protected void handleNotificationEvent(Notification event) { /* * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart @@ -180,7 +180,8 @@ public class ComponentEditPart extends ClassifierEditPart { if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) { Object notifier = event.getNotifier(); List<?> modelChildren = ((View) getModel()).getChildren(); - if (false == notifier instanceof Edge && false == notifier instanceof BasicCompartment) { + if (false == notifier instanceof Edge + && false == notifier instanceof BasicCompartment) { if (modelChildren.contains(event.getNotifier())) { return; } @@ -193,14 +194,17 @@ public class ComponentEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected IFigure createNodeShape() { return primaryShape = new ComponentFigure(); } /** * org.eclipse.papyrus.uml.diagram.common.figure.node.ComponentFigure + * * @generated */ + @Override public ComponentFigure getPrimaryShape() { return (ComponentFigure) primaryShape; } @@ -214,35 +218,38 @@ public class ComponentEditPart extends ClassifierEditPart { return true; } + if (childEditPart instanceof ComponentAttributeCompartmentEditPart) { IFigure pane = getPrimaryShape().getAttributeCompartmentFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((ComponentAttributeCompartmentEditPart) childEditPart).getFigure()); return true; } if (childEditPart instanceof ComponentOperationCompartmentEditPart) { IFigure pane = getPrimaryShape().getOperationCompartmentFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((ComponentOperationCompartmentEditPart) childEditPart).getFigure()); return true; } if (childEditPart instanceof ComponentNestedClassifierCompartmentEditPart) { IFigure pane = getPrimaryShape().getNestedClassifierFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((ComponentNestedClassifierCompartmentEditPart) childEditPart).getFigure()); return true; } - //Papyrus Gencode :precise the locator for a template signature + + + // Papyrus Gencode :precise the locator for a template signature if (childEditPart instanceof RedefinableTemplateSignatureEditPart) { IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST); - getBorderedFigure().getBorderItemContainer() - .add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator); + getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator); return true; } + return false; } @@ -269,8 +276,7 @@ public class ComponentEditPart extends ClassifierEditPart { return true; } if (childEditPart instanceof RedefinableTemplateSignatureEditPart) { - getBorderedFigure().getBorderItemContainer() - .remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure()); + getBorderedFigure().getBorderItemContainer().remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure()); return true; } return false; @@ -279,6 +285,7 @@ public class ComponentEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -289,6 +296,7 @@ public class ComponentEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -299,6 +307,7 @@ public class ComponentEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { if (editPart instanceof ComponentAttributeCompartmentEditPart) { return getPrimaryShape().getAttributeCompartmentFigure(); @@ -318,6 +327,7 @@ public class ComponentEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) { if (borderItemEditPart instanceof ComponentFloatingNameEditPart) { IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure()); @@ -330,6 +340,7 @@ public class ComponentEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected NodeFigure createNodePlate() { RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(100, 100); return result; @@ -337,12 +348,13 @@ public class ComponentEditPart extends ClassifierEditPart { /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected NodeFigure createMainFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); @@ -351,9 +363,12 @@ public class ComponentEditPart extends ClassifierEditPart { /** * Default implementation treats passed figure as content pane. * Respects layout one may have set for generated figure. - * @param nodeShape instance of generated figure class + * + * @param nodeShape + * instance of generated figure class * @generated */ + @Override protected IFigure setupContentPane(IFigure nodeShape) { if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); @@ -366,6 +381,7 @@ public class ComponentEditPart extends ClassifierEditPart { /** * @generated */ + @Override public IFigure getContentPane() { if (contentPane != null) { return contentPane; @@ -376,6 +392,7 @@ public class ComponentEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void setForegroundColor(Color color) { if (primaryShape != null) { primaryShape.setForegroundColor(color); @@ -385,6 +402,7 @@ public class ComponentEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void setLineWidth(int width) { super.setLineWidth(width); } @@ -392,6 +410,7 @@ public class ComponentEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void setLineType(int style) { if (primaryShape instanceof IPapyrusNodeFigure) { ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); @@ -401,6 +420,7 @@ public class ComponentEditPart extends ClassifierEditPart { /** * @generated */ + @Override public EditPart getPrimaryChildEditPart() { return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentNameEditPart.VISUAL_ID)); } @@ -408,50 +428,40 @@ public class ComponentEditPart extends ClassifierEditPart { /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { if (request instanceof CreateViewAndElementRequest) { - CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor() - .getCreateElementRequestAdapter(); + CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter(); IElementType type = (IElementType) adapter.getAdapter(IElementType.class); if (UMLElementTypes.isKindOf(type, UMLElementTypes.Property_ComponentAttributeLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(ComponentAttributeCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentAttributeCompartmentEditPart.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Operation_ComponentOperationLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(ComponentOperationCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentOperationCompartmentEditPart.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Reception_ReceptionLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(ComponentOperationCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentOperationCompartmentEditPart.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Class_ComponentNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPart.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Interface_ComponentNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPart.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Enumeration_ComponentNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPart.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.PrimitiveType_ComponentNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPart.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.DataType_ComponentNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPart.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Signal_ComponentNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPart.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Component_ComponentNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPart.VISUAL_ID)); } } return super.getTargetEditPart(request); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPartCN.java index c4519b10cf2..b1385376d29 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -97,6 +97,7 @@ public class ComponentEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void createDefaultEditPolicies() { installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); super.createDefaultEditPolicies(); @@ -105,19 +106,16 @@ public class ComponentEditPartCN extends ClassifierEditPart { installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentCanonicalEditPolicyCN()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentCanonicalEditPolicyCN()); installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); - installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, - new ShowHideCompartmentEditPolicy()); - installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, - new ShowHideClassifierContentsEditPolicy()); + installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy()); + installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies @@ -171,9 +169,11 @@ public class ComponentEditPartCN extends ClassifierEditPart { } /** - *Papyrus codeGen - *@generated - **/ + * Papyrus codeGen + * + * @generated + **/ + @Override protected void handleNotificationEvent(Notification event) { /* * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart @@ -182,7 +182,8 @@ public class ComponentEditPartCN extends ClassifierEditPart { if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) { Object notifier = event.getNotifier(); List<?> modelChildren = ((View) getModel()).getChildren(); - if (false == notifier instanceof Edge && false == notifier instanceof BasicCompartment) { + if (false == notifier instanceof Edge + && false == notifier instanceof BasicCompartment) { if (modelChildren.contains(event.getNotifier())) { return; } @@ -195,14 +196,17 @@ public class ComponentEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected IFigure createNodeShape() { return primaryShape = new ComponentFigure(); } /** * org.eclipse.papyrus.uml.diagram.common.figure.node.ComponentFigure + * * @generated */ + @Override public ComponentFigure getPrimaryShape() { return (ComponentFigure) primaryShape; } @@ -216,35 +220,38 @@ public class ComponentEditPartCN extends ClassifierEditPart { return true; } + if (childEditPart instanceof ComponentAttributeCompartmentEditPartCN) { IFigure pane = getPrimaryShape().getAttributeCompartmentFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((ComponentAttributeCompartmentEditPartCN) childEditPart).getFigure()); return true; } if (childEditPart instanceof ComponentOperationCompartmentEditPartCN) { IFigure pane = getPrimaryShape().getOperationCompartmentFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((ComponentOperationCompartmentEditPartCN) childEditPart).getFigure()); return true; } if (childEditPart instanceof ComponentNestedClassifierCompartmentEditPartCN) { IFigure pane = getPrimaryShape().getNestedClassifierFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((ComponentNestedClassifierCompartmentEditPartCN) childEditPart).getFigure()); return true; } - //Papyrus Gencode :precise the locator for a template signature + + + // Papyrus Gencode :precise the locator for a template signature if (childEditPart instanceof RedefinableTemplateSignatureEditPart) { IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST); - getBorderedFigure().getBorderItemContainer() - .add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator); + getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator); return true; } + return false; } @@ -271,8 +278,7 @@ public class ComponentEditPartCN extends ClassifierEditPart { return true; } if (childEditPart instanceof RedefinableTemplateSignatureEditPart) { - getBorderedFigure().getBorderItemContainer() - .remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure()); + getBorderedFigure().getBorderItemContainer().remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure()); return true; } return false; @@ -281,6 +287,7 @@ public class ComponentEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -291,6 +298,7 @@ public class ComponentEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -301,6 +309,7 @@ public class ComponentEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { if (editPart instanceof ComponentAttributeCompartmentEditPartCN) { return getPrimaryShape().getAttributeCompartmentFigure(); @@ -320,6 +329,7 @@ public class ComponentEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) { if (borderItemEditPart instanceof ComponentFloatingNameEditPartCN) { IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure()); @@ -332,6 +342,7 @@ public class ComponentEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected NodeFigure createNodePlate() { RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(100, 100); return result; @@ -339,12 +350,13 @@ public class ComponentEditPartCN extends ClassifierEditPart { /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected NodeFigure createMainFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); @@ -353,9 +365,12 @@ public class ComponentEditPartCN extends ClassifierEditPart { /** * Default implementation treats passed figure as content pane. * Respects layout one may have set for generated figure. - * @param nodeShape instance of generated figure class + * + * @param nodeShape + * instance of generated figure class * @generated */ + @Override protected IFigure setupContentPane(IFigure nodeShape) { if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); @@ -368,6 +383,7 @@ public class ComponentEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override public IFigure getContentPane() { if (contentPane != null) { return contentPane; @@ -378,6 +394,7 @@ public class ComponentEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void setForegroundColor(Color color) { if (primaryShape != null) { primaryShape.setForegroundColor(color); @@ -387,6 +404,7 @@ public class ComponentEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void setLineWidth(int width) { super.setLineWidth(width); } @@ -394,6 +412,7 @@ public class ComponentEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void setLineType(int style) { if (primaryShape instanceof IPapyrusNodeFigure) { ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); @@ -403,6 +422,7 @@ public class ComponentEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override public EditPart getPrimaryChildEditPart() { return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentNameEditPartCN.VISUAL_ID)); } @@ -410,50 +430,40 @@ public class ComponentEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { if (request instanceof CreateViewAndElementRequest) { - CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor() - .getCreateElementRequestAdapter(); + CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter(); IElementType type = (IElementType) adapter.getAdapter(IElementType.class); if (UMLElementTypes.isKindOf(type, UMLElementTypes.Property_ComponentAttributeLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(ComponentAttributeCompartmentEditPartCN.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentAttributeCompartmentEditPartCN.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Operation_ComponentOperationLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(ComponentOperationCompartmentEditPartCN.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentOperationCompartmentEditPartCN.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Reception_ReceptionLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(ComponentOperationCompartmentEditPartCN.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentOperationCompartmentEditPartCN.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Class_ComponentNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Interface_ComponentNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Enumeration_ComponentNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.PrimitiveType_ComponentNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.DataType_ComponentNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Signal_ComponentNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Component_ComponentNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID)); } } return super.getTargetEditPart(request); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentFloatingNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentFloatingNameEditPart.java index 43e95f355f1..2299654e88a 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentFloatingNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentFloatingNameEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -50,6 +50,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -60,11 +65,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -115,12 +115,14 @@ public class ComponentFloatingNameEditPart extends FloatingLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -129,10 +131,7 @@ public class ComponentFloatingNameEditPart extends FloatingLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentFloatingNameEditPart.VISUAL_ID), - new Point(0, 0)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentFloatingNameEditPart.VISUAL_ID), new Point(0, 0)); } /** @@ -145,6 +144,7 @@ public class ComponentFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); @@ -156,6 +156,7 @@ public class ComponentFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IBorderItemLocator getBorderItemLocator() { IFigure parentFigure = getFigure().getParent(); if (parentFigure != null && parentFigure.getLayoutManager() != null) { @@ -168,6 +169,7 @@ public class ComponentFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public void refreshBounds() { int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); @@ -242,6 +244,7 @@ public class ComponentFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -249,6 +252,7 @@ public class ComponentFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -281,7 +285,8 @@ public class ComponentFloatingNameEditPart extends FloatingLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -293,6 +298,7 @@ public class ComponentFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -308,11 +314,13 @@ public class ComponentFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -326,6 +334,7 @@ public class ComponentFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -335,14 +344,12 @@ public class ComponentFloatingNameEditPart extends FloatingLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), - ComponentFloatingNameEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ComponentFloatingNameEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -360,6 +367,7 @@ public class ComponentFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -370,6 +378,7 @@ public class ComponentFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -377,6 +386,7 @@ public class ComponentFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Component_Shape, getParserElement(), this, VISUAL_ID); @@ -439,6 +449,7 @@ public class ComponentFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -466,18 +477,13 @@ public class ComponentFloatingNameEditPart extends FloatingLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -489,8 +495,7 @@ public class ComponentFloatingNameEditPart extends FloatingLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -516,10 +521,9 @@ public class ComponentFloatingNameEditPart extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -535,6 +539,7 @@ public class ComponentFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -576,7 +581,8 @@ public class ComponentFloatingNameEditPart extends FloatingLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -593,7 +599,8 @@ public class ComponentFloatingNameEditPart extends FloatingLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -602,11 +609,15 @@ public class ComponentFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -614,6 +625,7 @@ public class ComponentFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -621,6 +633,7 @@ public class ComponentFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -636,6 +649,7 @@ public class ComponentFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -649,6 +663,7 @@ public class ComponentFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -671,7 +686,7 @@ public class ComponentFloatingNameEditPart extends FloatingLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -690,7 +705,7 @@ public class ComponentFloatingNameEditPart extends FloatingLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -703,7 +718,7 @@ public class ComponentFloatingNameEditPart extends FloatingLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -713,43 +728,42 @@ public class ComponentFloatingNameEditPart extends FloatingLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -758,13 +772,11 @@ public class ComponentFloatingNameEditPart extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -781,6 +793,7 @@ public class ComponentFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -790,10 +803,10 @@ public class ComponentFloatingNameEditPart extends FloatingLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -816,6 +829,7 @@ public class ComponentFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentFloatingNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentFloatingNameEditPartCN.java index 7681855a0ce..4a6250a7ae9 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentFloatingNameEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentFloatingNameEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -50,6 +50,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -60,11 +65,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -115,12 +115,14 @@ public class ComponentFloatingNameEditPartCN extends FloatingLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -129,10 +131,7 @@ public class ComponentFloatingNameEditPartCN extends FloatingLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentFloatingNameEditPartCN.VISUAL_ID), - new Point(0, 0)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ComponentFloatingNameEditPartCN.VISUAL_ID), new Point(0, 0)); } /** @@ -145,6 +144,7 @@ public class ComponentFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); @@ -156,6 +156,7 @@ public class ComponentFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public IBorderItemLocator getBorderItemLocator() { IFigure parentFigure = getFigure().getParent(); if (parentFigure != null && parentFigure.getLayoutManager() != null) { @@ -168,6 +169,7 @@ public class ComponentFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public void refreshBounds() { int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); @@ -242,6 +244,7 @@ public class ComponentFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -249,6 +252,7 @@ public class ComponentFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -281,7 +285,8 @@ public class ComponentFloatingNameEditPartCN extends FloatingLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -293,6 +298,7 @@ public class ComponentFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -308,11 +314,13 @@ public class ComponentFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -326,6 +334,7 @@ public class ComponentFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -335,14 +344,12 @@ public class ComponentFloatingNameEditPartCN extends FloatingLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), - ComponentFloatingNameEditPartCN.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ComponentFloatingNameEditPartCN.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -360,6 +367,7 @@ public class ComponentFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -370,6 +378,7 @@ public class ComponentFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -377,6 +386,7 @@ public class ComponentFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Component_Shape_CN, getParserElement(), this, VISUAL_ID); @@ -439,6 +449,7 @@ public class ComponentFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -466,18 +477,13 @@ public class ComponentFloatingNameEditPartCN extends FloatingLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -489,8 +495,7 @@ public class ComponentFloatingNameEditPartCN extends FloatingLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -516,10 +521,9 @@ public class ComponentFloatingNameEditPartCN extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -535,6 +539,7 @@ public class ComponentFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -576,7 +581,8 @@ public class ComponentFloatingNameEditPartCN extends FloatingLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -593,7 +599,8 @@ public class ComponentFloatingNameEditPartCN extends FloatingLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -602,11 +609,15 @@ public class ComponentFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -614,6 +625,7 @@ public class ComponentFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -621,6 +633,7 @@ public class ComponentFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -636,6 +649,7 @@ public class ComponentFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -649,6 +663,7 @@ public class ComponentFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -671,7 +686,7 @@ public class ComponentFloatingNameEditPartCN extends FloatingLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -690,7 +705,7 @@ public class ComponentFloatingNameEditPartCN extends FloatingLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -703,7 +718,7 @@ public class ComponentFloatingNameEditPartCN extends FloatingLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -713,43 +728,42 @@ public class ComponentFloatingNameEditPartCN extends FloatingLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -758,13 +772,11 @@ public class ComponentFloatingNameEditPartCN extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -781,6 +793,7 @@ public class ComponentFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -790,10 +803,10 @@ public class ComponentFloatingNameEditPartCN extends FloatingLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -816,6 +829,7 @@ public class ComponentFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentNameEditPart.java index 682ede8a3bd..3dbdb3ea7a7 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentNameEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,20 +64,12 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -115,12 +113,14 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -135,6 +135,7 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy()); @@ -208,6 +209,7 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -215,6 +217,7 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -222,6 +225,7 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -237,8 +241,7 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -248,7 +251,8 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -260,6 +264,7 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -275,11 +280,13 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -293,6 +300,7 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -302,13 +310,12 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), ComponentNameEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ComponentNameEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -326,6 +333,7 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -336,6 +344,7 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -343,6 +352,7 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Component_Shape, getParserElement(), this, VISUAL_ID); @@ -405,6 +415,7 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -432,18 +443,13 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -455,8 +461,7 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -482,10 +487,9 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -501,6 +505,7 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -542,7 +547,8 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -559,7 +565,8 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -568,11 +575,15 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -580,6 +591,7 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -587,6 +599,7 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -602,6 +615,7 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -615,6 +629,7 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -637,7 +652,7 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -656,7 +671,7 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -669,7 +684,7 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -679,43 +694,42 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -724,13 +738,11 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -747,6 +759,7 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -755,6 +768,7 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -763,6 +777,7 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); @@ -773,10 +788,10 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -793,8 +808,7 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } super.handleNotificationEvent(event); @@ -803,6 +817,7 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -816,6 +831,7 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void activate() { super.activate(); addOwnerElementListeners(); @@ -832,6 +848,7 @@ public class ComponentNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void deactivate() { removeOwnerElementListeners(); super.deactivate(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentNameEditPartCN.java index 008188b4a6c..49f19a7449b 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentNameEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentNameEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,20 +64,12 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -115,12 +113,14 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -135,6 +135,7 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy()); @@ -208,6 +209,7 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -215,6 +217,7 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -222,6 +225,7 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -237,8 +241,7 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -248,7 +251,8 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -260,6 +264,7 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -275,11 +280,13 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -293,6 +300,7 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -302,13 +310,12 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), ComponentNameEditPartCN.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ComponentNameEditPartCN.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -326,6 +333,7 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -336,6 +344,7 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -343,6 +352,7 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Component_Shape_CN, getParserElement(), this, VISUAL_ID); @@ -405,6 +415,7 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -432,18 +443,13 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -455,8 +461,7 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -482,10 +487,9 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -501,6 +505,7 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -542,7 +547,8 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -559,7 +565,8 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -568,11 +575,15 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -580,6 +591,7 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -587,6 +599,7 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -602,6 +615,7 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -615,6 +629,7 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -637,7 +652,7 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -656,7 +671,7 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -669,7 +684,7 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -679,43 +694,42 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -724,13 +738,11 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -747,6 +759,7 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -755,6 +768,7 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -763,6 +777,7 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); @@ -773,10 +788,10 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -793,8 +808,7 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } super.handleNotificationEvent(event); @@ -803,6 +817,7 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -816,6 +831,7 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void activate() { super.activate(); addOwnerElementListeners(); @@ -832,6 +848,7 @@ public class ComponentNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void deactivate() { removeOwnerElementListeners(); super.deactivate(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentNestedClassifierCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentNestedClassifierCompartmentEditPart.java index 019f1963703..0713eb60b71 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentNestedClassifierCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentNestedClassifierCompartmentEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -32,7 +32,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentS import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedClazzCompartmentCreationEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -56,6 +55,7 @@ public class ComponentNestedClassifierCompartmentEditPart extends ResizeableList /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; } @@ -63,6 +63,7 @@ public class ComponentNestedClassifierCompartmentEditPart extends ResizeableList /** * @generated */ + @Override public String getCompartmentName() { return Messages.ComponentNestedClassifierCompartmentEditPart_title; } @@ -70,6 +71,7 @@ public class ComponentNestedClassifierCompartmentEditPart extends ResizeableList /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -77,10 +79,9 @@ public class ComponentNestedClassifierCompartmentEditPart extends ResizeableList installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentNestedClassifierCompartmentCanonicalEditPolicy()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentNestedClassifierCompartmentCanonicalEditPolicy()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.CREATION_ROLE, new NestedClazzCompartmentCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); } @@ -88,6 +89,7 @@ public class ComponentNestedClassifierCompartmentEditPart extends ResizeableList /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -97,6 +99,7 @@ public class ComponentNestedClassifierCompartmentEditPart extends ResizeableList /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -105,6 +108,7 @@ public class ComponentNestedClassifierCompartmentEditPart extends ResizeableList /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -119,6 +123,7 @@ public class ComponentNestedClassifierCompartmentEditPart extends ResizeableList /** * @generated */ + @Override protected void refreshBounds() { int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); @@ -126,12 +131,16 @@ public class ComponentNestedClassifierCompartmentEditPart extends ResizeableList int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentNestedClassifierCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentNestedClassifierCompartmentEditPartCN.java index 9af9df05464..2d81efda379 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentNestedClassifierCompartmentEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentNestedClassifierCompartmentEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -32,7 +32,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentS import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedClazzCompartmentCreationEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -56,6 +55,7 @@ public class ComponentNestedClassifierCompartmentEditPartCN extends ResizeableLi /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; } @@ -63,6 +63,7 @@ public class ComponentNestedClassifierCompartmentEditPartCN extends ResizeableLi /** * @generated */ + @Override public String getCompartmentName() { return Messages.ComponentNestedClassifierCompartmentEditPartCN_title; } @@ -70,6 +71,7 @@ public class ComponentNestedClassifierCompartmentEditPartCN extends ResizeableLi /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -77,10 +79,9 @@ public class ComponentNestedClassifierCompartmentEditPartCN extends ResizeableLi installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentNestedClassifierCompartmentCanonicalEditPolicyCN()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentNestedClassifierCompartmentCanonicalEditPolicyCN()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); installEditPolicy(EditPolicyRoles.CREATION_ROLE, new NestedClazzCompartmentCreationEditPolicy()); } @@ -88,6 +89,7 @@ public class ComponentNestedClassifierCompartmentEditPartCN extends ResizeableLi /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -97,6 +99,7 @@ public class ComponentNestedClassifierCompartmentEditPartCN extends ResizeableLi /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -105,6 +108,7 @@ public class ComponentNestedClassifierCompartmentEditPartCN extends ResizeableLi /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -119,6 +123,7 @@ public class ComponentNestedClassifierCompartmentEditPartCN extends ResizeableLi /** * @generated */ + @Override protected void refreshBounds() { int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); @@ -126,12 +131,16 @@ public class ComponentNestedClassifierCompartmentEditPartCN extends ResizeableLi int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentOperationCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentOperationCompartmentEditPart.java index 4c429b67d89..997fd14533b 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentOperationCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentOperationCompartmentEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -31,7 +31,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartme import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -55,6 +54,7 @@ public class ComponentOperationCompartmentEditPart extends ResizeableListCompart /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; } @@ -62,6 +62,7 @@ public class ComponentOperationCompartmentEditPart extends ResizeableListCompart /** * @generated */ + @Override public String getCompartmentName() { return Messages.ComponentOperationCompartmentEditPart_title; } @@ -69,6 +70,7 @@ public class ComponentOperationCompartmentEditPart extends ResizeableListCompart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -76,16 +78,16 @@ public class ComponentOperationCompartmentEditPart extends ResizeableListCompart installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentOperationCompartmentCanonicalEditPolicy()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentOperationCompartmentCanonicalEditPolicy()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); } /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -95,6 +97,7 @@ public class ComponentOperationCompartmentEditPart extends ResizeableListCompart /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -103,6 +106,7 @@ public class ComponentOperationCompartmentEditPart extends ResizeableListCompart /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -117,6 +121,7 @@ public class ComponentOperationCompartmentEditPart extends ResizeableListCompart /** * @generated */ + @Override protected void refreshBounds() { int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); @@ -124,12 +129,16 @@ public class ComponentOperationCompartmentEditPart extends ResizeableListCompart int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentOperationCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentOperationCompartmentEditPartCN.java index 7f57258b300..55f5086c34f 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentOperationCompartmentEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentOperationCompartmentEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -31,7 +31,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartme import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -55,6 +54,7 @@ public class ComponentOperationCompartmentEditPartCN extends ResizeableListCompa /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; } @@ -62,6 +62,7 @@ public class ComponentOperationCompartmentEditPartCN extends ResizeableListCompa /** * @generated */ + @Override public String getCompartmentName() { return Messages.ComponentOperationCompartmentEditPartCN_title; } @@ -69,6 +70,7 @@ public class ComponentOperationCompartmentEditPartCN extends ResizeableListCompa /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -76,16 +78,16 @@ public class ComponentOperationCompartmentEditPartCN extends ResizeableListCompa installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentOperationCompartmentCanonicalEditPolicyCN()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ComponentOperationCompartmentCanonicalEditPolicyCN()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); } /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -95,6 +97,7 @@ public class ComponentOperationCompartmentEditPartCN extends ResizeableListCompa /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -103,6 +106,7 @@ public class ComponentOperationCompartmentEditPartCN extends ResizeableListCompa /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -117,6 +121,7 @@ public class ComponentOperationCompartmentEditPartCN extends ResizeableListCompa /** * @generated */ + @Override protected void refreshBounds() { int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); @@ -124,12 +129,16 @@ public class ComponentOperationCompartmentEditPartCN extends ResizeableListCompa int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConnectableElementTemplateParameterEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConnectableElementTemplateParameterEditPart.java index 69c8d7b9660..adc4e598a90 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConnectableElementTemplateParameterEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConnectableElementTemplateParameterEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -54,6 +54,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -64,11 +69,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.TemplateParameterFigure; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.TemplateParamaterDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy; @@ -121,12 +121,14 @@ public class ConnectableElementTemplateParameterEditPart extends CompartmentEdit /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -141,6 +143,7 @@ public class ConnectableElementTemplateParameterEditPart extends CompartmentEdit /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -151,14 +154,14 @@ public class ConnectableElementTemplateParameterEditPart extends CompartmentEdit /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy()); installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); - installEditPolicy(TemplateParamaterDisplayEditPolicy.TEMPLATE_PARAMETER_DISPLAY, - new TemplateParamaterDisplayEditPolicy()); + installEditPolicy(TemplateParamaterDisplayEditPolicy.TEMPLATE_PARAMETER_DISPLAY, new TemplateParamaterDisplayEditPolicy()); } /** @@ -227,6 +230,7 @@ public class ConnectableElementTemplateParameterEditPart extends CompartmentEdit /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -234,6 +238,7 @@ public class ConnectableElementTemplateParameterEditPart extends CompartmentEdit /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -241,6 +246,7 @@ public class ConnectableElementTemplateParameterEditPart extends CompartmentEdit /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -266,7 +272,8 @@ public class ConnectableElementTemplateParameterEditPart extends CompartmentEdit String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -278,6 +285,7 @@ public class ConnectableElementTemplateParameterEditPart extends CompartmentEdit /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -293,11 +301,13 @@ public class ConnectableElementTemplateParameterEditPart extends CompartmentEdit /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -311,6 +321,7 @@ public class ConnectableElementTemplateParameterEditPart extends CompartmentEdit /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -320,15 +331,12 @@ public class ConnectableElementTemplateParameterEditPart extends CompartmentEdit final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - ConnectableElementTemplateParameterEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ConnectableElementTemplateParameterEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -346,6 +354,7 @@ public class ConnectableElementTemplateParameterEditPart extends CompartmentEdit /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -356,6 +365,7 @@ public class ConnectableElementTemplateParameterEditPart extends CompartmentEdit /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -363,10 +373,10 @@ public class ConnectableElementTemplateParameterEditPart extends CompartmentEdit /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.ConnectableElementTemplateParameter_TemplateParameterLabel, - getParserElement(), this, VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.ConnectableElementTemplateParameter_TemplateParameterLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -426,6 +436,7 @@ public class ConnectableElementTemplateParameterEditPart extends CompartmentEdit /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -453,18 +464,13 @@ public class ConnectableElementTemplateParameterEditPart extends CompartmentEdit initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -476,8 +482,7 @@ public class ConnectableElementTemplateParameterEditPart extends CompartmentEdit @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -503,10 +508,9 @@ public class ConnectableElementTemplateParameterEditPart extends CompartmentEdit @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -522,6 +526,7 @@ public class ConnectableElementTemplateParameterEditPart extends CompartmentEdit /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -563,7 +568,8 @@ public class ConnectableElementTemplateParameterEditPart extends CompartmentEdit * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -580,7 +586,8 @@ public class ConnectableElementTemplateParameterEditPart extends CompartmentEdit * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -589,11 +596,15 @@ public class ConnectableElementTemplateParameterEditPart extends CompartmentEdit /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -601,6 +612,7 @@ public class ConnectableElementTemplateParameterEditPart extends CompartmentEdit /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -608,6 +620,7 @@ public class ConnectableElementTemplateParameterEditPart extends CompartmentEdit /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -623,6 +636,7 @@ public class ConnectableElementTemplateParameterEditPart extends CompartmentEdit /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -636,6 +650,7 @@ public class ConnectableElementTemplateParameterEditPart extends CompartmentEdit /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -658,7 +673,7 @@ public class ConnectableElementTemplateParameterEditPart extends CompartmentEdit /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -677,7 +692,7 @@ public class ConnectableElementTemplateParameterEditPart extends CompartmentEdit /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -690,7 +705,7 @@ public class ConnectableElementTemplateParameterEditPart extends CompartmentEdit /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -700,43 +715,42 @@ public class ConnectableElementTemplateParameterEditPart extends CompartmentEdit /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -745,13 +759,11 @@ public class ConnectableElementTemplateParameterEditPart extends CompartmentEdit @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -768,6 +780,7 @@ public class ConnectableElementTemplateParameterEditPart extends CompartmentEdit /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -776,6 +789,7 @@ public class ConnectableElementTemplateParameterEditPart extends CompartmentEdit /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -784,6 +798,7 @@ public class ConnectableElementTemplateParameterEditPart extends CompartmentEdit /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -793,10 +808,10 @@ public class ConnectableElementTemplateParameterEditPart extends CompartmentEdit refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -822,6 +837,7 @@ public class ConnectableElementTemplateParameterEditPart extends CompartmentEdit /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConnectorDurationObservationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConnectorDurationObservationEditPart.java index 9a00419f6c3..12f17052f59 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConnectorDurationObservationEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConnectorDurationObservationEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -22,8 +22,8 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEdit import org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure; /** - * @generated - */ + * @generated + */ public class ConnectorDurationObservationEditPart extends ConnectionEditPart implements ITreeBranchEditPart { /** @@ -41,6 +41,7 @@ public class ConnectorDurationObservationEditPart extends ConnectionEditPart imp /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); @@ -48,12 +49,13 @@ public class ConnectorDurationObservationEditPart extends ConnectionEditPart imp /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected Connection createConnectionFigure() { return new SimpleDashedEdgeFigure(); } @@ -61,6 +63,7 @@ public class ConnectorDurationObservationEditPart extends ConnectionEditPart imp /** * @generated */ + @Override public SimpleDashedEdgeFigure getPrimaryShape() { return (SimpleDashedEdgeFigure) getFigure(); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConnectorTimeObservationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConnectorTimeObservationEditPart.java index 74e3c833ed6..a4f6f94182a 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConnectorTimeObservationEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConnectorTimeObservationEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -22,8 +22,8 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEdit import org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure; /** - * @generated - */ + * @generated + */ public class ConnectorTimeObservationEditPart extends ConnectionEditPart implements ITreeBranchEditPart { /** @@ -41,6 +41,7 @@ public class ConnectorTimeObservationEditPart extends ConnectionEditPart impleme /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); @@ -48,12 +49,13 @@ public class ConnectorTimeObservationEditPart extends ConnectionEditPart impleme /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected Connection createConnectionFigure() { return new SimpleDashedEdgeFigure(); } @@ -61,6 +63,7 @@ public class ConnectorTimeObservationEditPart extends ConnectionEditPart impleme /** * @generated */ + @Override public SimpleDashedEdgeFigure getPrimaryShape() { return (SimpleDashedEdgeFigure) getFigure(); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintBodyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintBodyEditPart.java index 51af5cc8dd0..b074d6e9e25 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintBodyEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintBodyEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -47,6 +47,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -57,11 +62,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -111,12 +111,14 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -131,6 +133,7 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy()); @@ -204,6 +207,7 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -211,6 +215,7 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -218,6 +223,7 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -243,7 +249,8 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -255,6 +262,7 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -270,11 +278,13 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -288,6 +298,7 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -297,13 +308,12 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), ConstraintBodyEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ConstraintBodyEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -321,6 +331,7 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -331,6 +342,7 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -338,10 +350,10 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.Constraint_PackagedElementShape, getParserElement(), this, - VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.Constraint_PackagedElementShape, getParserElement(), this, VISUAL_ID); } return parser; } @@ -401,6 +413,7 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -428,18 +441,13 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -451,8 +459,7 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -478,10 +485,9 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -497,6 +503,7 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -538,7 +545,8 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -555,7 +563,8 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -564,11 +573,15 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -576,6 +589,7 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -583,6 +597,7 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -598,6 +613,7 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -611,6 +627,7 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -633,7 +650,7 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -652,7 +669,7 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -665,7 +682,7 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -675,43 +692,42 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -720,13 +736,11 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -743,6 +757,7 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -751,6 +766,7 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -759,6 +775,7 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); @@ -769,10 +786,10 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -795,6 +812,7 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -808,6 +826,7 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void activate() { super.activate(); addOwnerElementListeners(); @@ -824,6 +843,7 @@ public class ConstraintBodyEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void deactivate() { removeOwnerElementListeners(); super.deactivate(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintBodyEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintBodyEditPartCN.java index 0fa96e1f689..d286c0991db 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintBodyEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintBodyEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -47,6 +47,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -57,11 +62,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -111,12 +111,14 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -131,6 +133,7 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy()); @@ -204,6 +207,7 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -211,6 +215,7 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -218,6 +223,7 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -243,7 +249,8 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -255,6 +262,7 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -270,11 +278,13 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -288,6 +298,7 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -297,13 +308,12 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), ConstraintBodyEditPartCN.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ConstraintBodyEditPartCN.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -321,6 +331,7 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -331,6 +342,7 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -338,10 +350,10 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.Constraint_PackagedElementShape_CN, getParserElement(), this, - VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.Constraint_PackagedElementShape_CN, getParserElement(), this, VISUAL_ID); } return parser; } @@ -401,6 +413,7 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -428,18 +441,13 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -451,8 +459,7 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -478,10 +485,9 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -497,6 +503,7 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -538,7 +545,8 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -555,7 +563,8 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -564,11 +573,15 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -576,6 +589,7 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -583,6 +597,7 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -598,6 +613,7 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -611,6 +627,7 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -633,7 +650,7 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -652,7 +669,7 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -665,7 +682,7 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -675,43 +692,42 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -720,13 +736,11 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -743,6 +757,7 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -751,6 +766,7 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -759,6 +775,7 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); @@ -769,10 +786,10 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -795,6 +812,7 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -808,6 +826,7 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void activate() { super.activate(); addOwnerElementListeners(); @@ -824,6 +843,7 @@ public class ConstraintBodyEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void deactivate() { removeOwnerElementListeners(); super.deactivate(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintConstrainedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintConstrainedElementEditPart.java index 9ab0452559b..56ee37ff014 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintConstrainedElementEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintConstrainedElementEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -24,8 +24,8 @@ import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPar import org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure; /** - * @generated - */ + * @generated + */ public class ConstraintConstrainedElementEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart { /** @@ -43,6 +43,7 @@ public class ConstraintConstrainedElementEditPart extends UMLConnectionNodeEditP /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); @@ -51,12 +52,13 @@ public class ConstraintConstrainedElementEditPart extends UMLConnectionNodeEditP /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected Connection createConnectionFigure() { return new SimpleDashedEdgeFigure(); } @@ -64,6 +66,7 @@ public class ConstraintConstrainedElementEditPart extends UMLConnectionNodeEditP /** * @generated */ + @Override public SimpleDashedEdgeFigure getPrimaryShape() { return (SimpleDashedEdgeFigure) getFigure(); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintEditPart.java index bb13bfd011c..80567ecac60 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -70,6 +70,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); @@ -78,8 +79,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE); } @@ -113,9 +113,11 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { } /** - *Papyrus codeGen - *@generated - **/ + * Papyrus codeGen + * + * @generated + **/ + @Override protected void handleNotificationEvent(Notification event) { super.handleNotificationEvent(event); @@ -124,14 +126,17 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { /** * @generated */ + @Override protected IFigure createNodeShape() { return primaryShape = new ConstraintFigure(); } /** * org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure + * * @generated */ + @Override public ConstraintFigure getPrimaryShape() { return (ConstraintFigure) primaryShape; } @@ -149,6 +154,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { return true; } + return false; } @@ -168,6 +174,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -178,6 +185,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -188,6 +196,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { /** * @generated */ + @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { return getContentPane(); } @@ -195,6 +204,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { /** * @generated */ + @Override protected NodeFigure createNodePlate() { RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40); return result; @@ -202,12 +212,13 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected NodeFigure createNodeFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); @@ -216,9 +227,12 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { /** * Default implementation treats passed figure as content pane. * Respects layout one may have set for generated figure. - * @param nodeShape instance of generated figure class + * + * @param nodeShape + * instance of generated figure class * @generated */ + @Override protected IFigure setupContentPane(IFigure nodeShape) { if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); @@ -231,6 +245,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { /** * @generated */ + @Override public IFigure getContentPane() { if (contentPane != null) { return contentPane; @@ -241,6 +256,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { /** * @generated */ + @Override protected void setForegroundColor(Color color) { if (primaryShape != null) { primaryShape.setForegroundColor(color); @@ -250,6 +266,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { /** * @generated */ + @Override protected void setLineWidth(int width) { super.setLineWidth(width); } @@ -257,6 +274,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { /** * @generated */ + @Override protected void setLineType(int style) { if (primaryShape instanceof IPapyrusNodeFigure) { ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); @@ -266,6 +284,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { /** * @generated */ + @Override public EditPart getPrimaryChildEditPart() { return getChildBySemanticHint(UMLVisualIDRegistry.getType(ConstraintNameEditPart.VISUAL_ID)); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintEditPartCN.java index 28be63e79d7..f56e2b45a63 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -70,6 +70,7 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart { /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); @@ -78,8 +79,7 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart { installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE); } @@ -113,9 +113,11 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart { } /** - *Papyrus codeGen - *@generated - **/ + * Papyrus codeGen + * + * @generated + **/ + @Override protected void handleNotificationEvent(Notification event) { super.handleNotificationEvent(event); @@ -124,14 +126,17 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart { /** * @generated */ + @Override protected IFigure createNodeShape() { return primaryShape = new ConstraintFigure(); } /** * org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure + * * @generated */ + @Override public ConstraintFigure getPrimaryShape() { return (ConstraintFigure) primaryShape; } @@ -149,6 +154,7 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart { return true; } + return false; } @@ -168,6 +174,7 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart { /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -178,6 +185,7 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart { /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -188,6 +196,7 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart { /** * @generated */ + @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { return getContentPane(); } @@ -195,6 +204,7 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart { /** * @generated */ + @Override protected NodeFigure createNodePlate() { RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40); return result; @@ -202,12 +212,13 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart { /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected NodeFigure createNodeFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); @@ -216,9 +227,12 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart { /** * Default implementation treats passed figure as content pane. * Respects layout one may have set for generated figure. - * @param nodeShape instance of generated figure class + * + * @param nodeShape + * instance of generated figure class * @generated */ + @Override protected IFigure setupContentPane(IFigure nodeShape) { if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); @@ -231,6 +245,7 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart { /** * @generated */ + @Override public IFigure getContentPane() { if (contentPane != null) { return contentPane; @@ -241,6 +256,7 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart { /** * @generated */ + @Override protected void setForegroundColor(Color color) { if (primaryShape != null) { primaryShape.setForegroundColor(color); @@ -250,6 +266,7 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart { /** * @generated */ + @Override protected void setLineWidth(int width) { super.setLineWidth(width); } @@ -257,6 +274,7 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart { /** * @generated */ + @Override protected void setLineType(int style) { if (primaryShape instanceof IPapyrusNodeFigure) { ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); @@ -266,6 +284,7 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart { /** * @generated */ + @Override public EditPart getPrimaryChildEditPart() { return getChildBySemanticHint(UMLVisualIDRegistry.getType(ConstraintNameEditPartCN.VISUAL_ID)); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintLabelEditPart.java index 018462499a9..c12a107424d 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintLabelEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintLabelEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,12 +64,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -113,12 +113,14 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -127,10 +129,7 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry - .getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintLabelEditPart.VISUAL_ID), - new Point(0, 20)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintLabelEditPart.VISUAL_ID), new Point(0, 20)); } /** @@ -154,6 +153,7 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public int getKeyPoint() { return ConnectionLocator.MIDDLE; } @@ -224,6 +224,7 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -231,6 +232,7 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -238,6 +240,7 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -263,7 +266,8 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -275,6 +279,7 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -290,11 +295,13 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -308,6 +315,7 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -317,13 +325,12 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), ConstraintLabelEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ConstraintLabelEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -341,6 +348,7 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -351,6 +359,7 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -358,6 +367,7 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.GeneralizationSet_Edge, getParserElement(), this, VISUAL_ID); @@ -420,6 +430,7 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -447,18 +458,13 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -470,8 +476,7 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -497,10 +502,9 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -516,6 +520,7 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -557,7 +562,8 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -574,7 +580,8 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -583,11 +590,15 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -595,6 +606,7 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -602,6 +614,7 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -617,6 +630,7 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -630,6 +644,7 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -652,7 +667,7 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -663,7 +678,7 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -676,7 +691,7 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -686,43 +701,42 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -731,13 +745,11 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -754,6 +766,7 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -763,10 +776,10 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -790,6 +803,7 @@ public class ConstraintLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintNameEditPart.java index 0bfe4016e74..18eca969ef0 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintNameEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,20 +64,12 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -115,12 +113,14 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -135,6 +135,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy()); @@ -208,6 +209,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -215,6 +217,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -222,6 +225,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -237,8 +241,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -248,7 +251,8 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -260,6 +264,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -275,11 +280,13 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -293,6 +300,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -302,13 +310,12 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), ConstraintNameEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ConstraintNameEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -326,6 +333,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -336,6 +344,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -343,10 +352,10 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.Constraint_PackagedElementShape, getParserElement(), this, - VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.Constraint_PackagedElementShape, getParserElement(), this, VISUAL_ID); } return parser; } @@ -406,6 +415,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -433,18 +443,13 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -456,8 +461,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -483,10 +487,9 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -502,6 +505,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -543,7 +547,8 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -560,7 +565,8 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -569,11 +575,15 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -581,6 +591,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -588,6 +599,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -603,6 +615,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -616,6 +629,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -638,7 +652,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -657,7 +671,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -670,7 +684,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -680,43 +694,42 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -725,13 +738,11 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -748,6 +759,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -756,6 +768,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -764,6 +777,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); @@ -774,10 +788,10 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -794,8 +808,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } super.handleNotificationEvent(event); @@ -804,6 +817,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -817,6 +831,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void activate() { super.activate(); addOwnerElementListeners(); @@ -833,6 +848,7 @@ public class ConstraintNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void deactivate() { removeOwnerElementListeners(); super.deactivate(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintNameEditPartCN.java index 97a85d1034e..1fbf842ebd3 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintNameEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintNameEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,20 +64,12 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -115,12 +113,14 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -135,6 +135,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy()); @@ -208,6 +209,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -215,6 +217,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -222,6 +225,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -237,8 +241,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -248,7 +251,8 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -260,6 +264,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -275,11 +280,13 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -293,6 +300,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -302,13 +310,12 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), ConstraintNameEditPartCN.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ConstraintNameEditPartCN.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -326,6 +333,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -336,6 +344,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -343,10 +352,10 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.Constraint_PackagedElementShape_CN, getParserElement(), this, - VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.Constraint_PackagedElementShape_CN, getParserElement(), this, VISUAL_ID); } return parser; } @@ -406,6 +415,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -433,18 +443,13 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -456,8 +461,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -483,10 +487,9 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -502,6 +505,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -543,7 +547,8 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -560,7 +565,8 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -569,11 +575,15 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -581,6 +591,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -588,6 +599,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -603,6 +615,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -616,6 +629,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -638,7 +652,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -657,7 +671,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -670,7 +684,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -680,43 +694,42 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -725,13 +738,11 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -748,6 +759,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -756,6 +768,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -764,6 +777,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); @@ -774,10 +788,10 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -794,8 +808,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } super.handleNotificationEvent(event); @@ -804,6 +817,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -817,6 +831,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void activate() { super.activate(); addOwnerElementListeners(); @@ -833,6 +848,7 @@ public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void deactivate() { removeOwnerElementListeners(); super.deactivate(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContainmentLinkEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContainmentLinkEditPart.java index 517f5c61e70..65eeafa3fd0 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContainmentLinkEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContainmentLinkEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -23,8 +23,8 @@ import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.AddedLinkFigure; import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart; /** - * @generated - */ + * @generated + */ public class ContainmentLinkEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart { /** @@ -42,6 +42,7 @@ public class ContainmentLinkEditPart extends UMLConnectionNodeEditPart implement /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.COMPONENT_ROLE, new ViewComponentEditPolicy()); @@ -50,12 +51,13 @@ public class ContainmentLinkEditPart extends UMLConnectionNodeEditPart implement /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected Connection createConnectionFigure() { return new AddedLinkFigure(); } @@ -63,6 +65,7 @@ public class ContainmentLinkEditPart extends UMLConnectionNodeEditPart implement /** * @generated */ + @Override public AddedLinkFigure getPrimaryShape() { return (AddedLinkFigure) getFigure(); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContextLinkAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContextLinkAppliedStereotypeEditPart.java index 97dd250cbd6..4e207c9758f 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContextLinkAppliedStereotypeEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContextLinkAppliedStereotypeEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,13 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.NoSemanticParserEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,13 +65,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.NoSemanticParserEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -115,12 +115,14 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -129,9 +131,7 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContextLinkAppliedStereotypeEditPart.VISUAL_ID), - new Point(0, 15)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ContextLinkAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 15)); } /** @@ -156,6 +156,7 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public int getKeyPoint() { return ConnectionLocator.MIDDLE; } @@ -226,6 +227,7 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -233,6 +235,7 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -240,6 +243,7 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -265,7 +269,8 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -277,6 +282,7 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -292,11 +298,13 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -310,6 +318,7 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -319,16 +328,12 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - ContextLinkAppliedStereotypeEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ContextLinkAppliedStereotypeEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -346,6 +351,7 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -356,6 +362,7 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -363,6 +370,7 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Constraint_ContextEdge, getParserElement(), this, VISUAL_ID); @@ -425,6 +433,7 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -452,18 +461,13 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -475,8 +479,7 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -502,10 +505,9 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -521,6 +523,7 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -562,7 +565,8 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -579,7 +583,8 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -588,11 +593,15 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -600,6 +609,7 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -607,6 +617,7 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -622,6 +633,7 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -635,6 +647,7 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -657,7 +670,7 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -668,7 +681,7 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -681,7 +694,7 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -691,43 +704,42 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -736,13 +748,11 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -759,6 +769,7 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -768,10 +779,10 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -795,6 +806,7 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -803,6 +815,7 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getLabelRole() { return "Stereotype";//$NON-NLS-1$ } @@ -810,6 +823,7 @@ public class ContextLinkAppliedStereotypeEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getIconPathRole() { return "platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Stereotype.gif";//$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContextLinkEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContextLinkEditPart.java index aadb0dde510..79ea03f0430 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContextLinkEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContextLinkEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -23,12 +23,13 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEdit import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.CustomContextLinkFigure; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart; +import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomAppliedStereotypeContextLinkLabelDisplayEditPolicy; /** - * @generated - */ + * @generated + */ public class ContextLinkEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart { /** @@ -46,12 +47,12 @@ public class ContextLinkEditPart extends UMLConnectionNodeEditPart implements IT /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new CustomAppliedStereotypeContextLinkLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new CustomAppliedStereotypeContextLinkLabelDisplayEditPolicy()); } /** @@ -59,8 +60,8 @@ public class ContextLinkEditPart extends UMLConnectionNodeEditPart implements IT */ protected boolean addFixedChild(EditPart childEditPart) { if (childEditPart instanceof ContextLinkAppliedStereotypeEditPart) { - ((ContextLinkAppliedStereotypeEditPart) childEditPart) - .setLabel(getPrimaryShape().getAppliedStereotypeLabel()); + ((ContextLinkAppliedStereotypeEditPart) childEditPart).setLabel( + getPrimaryShape().getAppliedStereotypeLabel()); } return false; } @@ -68,6 +69,7 @@ public class ContextLinkEditPart extends UMLConnectionNodeEditPart implements IT /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -88,6 +90,7 @@ public class ContextLinkEditPart extends UMLConnectionNodeEditPart implements IT /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -97,12 +100,13 @@ public class ContextLinkEditPart extends UMLConnectionNodeEditPart implements IT /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected Connection createConnectionFigure() { return new CustomContextLinkFigure(); } @@ -110,6 +114,7 @@ public class ContextLinkEditPart extends UMLConnectionNodeEditPart implements IT /** * @generated */ + @Override public CustomContextLinkFigure getPrimaryShape() { return (CustomContextLinkFigure) getFigure(); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeAttributeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeAttributeCompartmentEditPart.java index c5511747e7a..a4d8aa728ab 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeAttributeCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeAttributeCompartmentEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -31,7 +31,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartme import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -55,6 +54,7 @@ public class DataTypeAttributeCompartmentEditPart extends ResizeableListCompartm /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; } @@ -62,6 +62,7 @@ public class DataTypeAttributeCompartmentEditPart extends ResizeableListCompartm /** * @generated */ + @Override public String getCompartmentName() { return Messages.DataTypeAttributeCompartmentEditPart_title; } @@ -69,6 +70,7 @@ public class DataTypeAttributeCompartmentEditPart extends ResizeableListCompartm /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -76,16 +78,16 @@ public class DataTypeAttributeCompartmentEditPart extends ResizeableListCompartm installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DataTypeAttributeCompartmentCanonicalEditPolicy()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DataTypeAttributeCompartmentCanonicalEditPolicy()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); } /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -95,6 +97,7 @@ public class DataTypeAttributeCompartmentEditPart extends ResizeableListCompartm /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -103,6 +106,7 @@ public class DataTypeAttributeCompartmentEditPart extends ResizeableListCompartm /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -117,6 +121,7 @@ public class DataTypeAttributeCompartmentEditPart extends ResizeableListCompartm /** * @generated */ + @Override protected void refreshBounds() { int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); @@ -124,12 +129,16 @@ public class DataTypeAttributeCompartmentEditPart extends ResizeableListCompartm int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeAttributeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeAttributeCompartmentEditPartCN.java index c3e8a48e7d5..abd28cea7e3 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeAttributeCompartmentEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeAttributeCompartmentEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -31,7 +31,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartme import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -55,6 +54,7 @@ public class DataTypeAttributeCompartmentEditPartCN extends ResizeableListCompar /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; } @@ -62,6 +62,7 @@ public class DataTypeAttributeCompartmentEditPartCN extends ResizeableListCompar /** * @generated */ + @Override public String getCompartmentName() { return Messages.DataTypeAttributeCompartmentEditPartCN_title; } @@ -69,6 +70,7 @@ public class DataTypeAttributeCompartmentEditPartCN extends ResizeableListCompar /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -76,16 +78,16 @@ public class DataTypeAttributeCompartmentEditPartCN extends ResizeableListCompar installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DataTypeAttributeCompartmentCanonicalEditPolicyCN()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DataTypeAttributeCompartmentCanonicalEditPolicyCN()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); } /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -95,6 +97,7 @@ public class DataTypeAttributeCompartmentEditPartCN extends ResizeableListCompar /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -103,6 +106,7 @@ public class DataTypeAttributeCompartmentEditPartCN extends ResizeableListCompar /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -117,6 +121,7 @@ public class DataTypeAttributeCompartmentEditPartCN extends ResizeableListCompar /** * @generated */ + @Override protected void refreshBounds() { int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); @@ -124,12 +129,16 @@ public class DataTypeAttributeCompartmentEditPartCN extends ResizeableListCompar int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeEditPart.java index 5f6153e7f12..79383429fb4 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -96,6 +96,7 @@ public class DataTypeEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void createDefaultEditPolicies() { installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); super.createDefaultEditPolicies(); @@ -104,18 +105,15 @@ public class DataTypeEditPart extends ClassifierEditPart { installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DataTypeCanonicalEditPolicy()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DataTypeCanonicalEditPolicy()); installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$ - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); - installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, - new ShowHideCompartmentEditPolicy()); - installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, - new ShowHideClassifierContentsEditPolicy()); + installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy()); + installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies @@ -169,9 +167,11 @@ public class DataTypeEditPart extends ClassifierEditPart { } /** - *Papyrus codeGen - *@generated - **/ + * Papyrus codeGen + * + * @generated + **/ + @Override protected void handleNotificationEvent(Notification event) { /* * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart @@ -180,7 +180,8 @@ public class DataTypeEditPart extends ClassifierEditPart { if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) { Object notifier = event.getNotifier(); List<?> modelChildren = ((View) getModel()).getChildren(); - if (false == notifier instanceof Edge && false == notifier instanceof BasicCompartment) { + if (false == notifier instanceof Edge + && false == notifier instanceof BasicCompartment) { if (modelChildren.contains(event.getNotifier())) { return; } @@ -193,14 +194,17 @@ public class DataTypeEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected IFigure createNodeShape() { return primaryShape = new DataTypeFigure(); } /** * org.eclipse.papyrus.uml.diagram.common.figure.node.DataTypeFigure + * * @generated */ + @Override public DataTypeFigure getPrimaryShape() { return (DataTypeFigure) primaryShape; } @@ -214,28 +218,31 @@ public class DataTypeEditPart extends ClassifierEditPart { return true; } + if (childEditPart instanceof DataTypeAttributeCompartmentEditPart) { IFigure pane = getPrimaryShape().getAttributeCompartmentFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((DataTypeAttributeCompartmentEditPart) childEditPart).getFigure()); return true; } if (childEditPart instanceof DataTypeOperationCompartmentEditPart) { IFigure pane = getPrimaryShape().getOperationCompartmentFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((DataTypeOperationCompartmentEditPart) childEditPart).getFigure()); return true; } - //Papyrus Gencode :precise the locator for a template signature + + + // Papyrus Gencode :precise the locator for a template signature if (childEditPart instanceof RedefinableTemplateSignatureEditPart) { IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST); - getBorderedFigure().getBorderItemContainer() - .add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator); + getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator); return true; } + return false; } @@ -257,8 +264,7 @@ public class DataTypeEditPart extends ClassifierEditPart { return true; } if (childEditPart instanceof RedefinableTemplateSignatureEditPart) { - getBorderedFigure().getBorderItemContainer() - .remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure()); + getBorderedFigure().getBorderItemContainer().remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure()); return true; } return false; @@ -267,6 +273,7 @@ public class DataTypeEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -277,6 +284,7 @@ public class DataTypeEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -287,6 +295,7 @@ public class DataTypeEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { if (editPart instanceof DataTypeAttributeCompartmentEditPart) { return getPrimaryShape().getAttributeCompartmentFigure(); @@ -303,6 +312,7 @@ public class DataTypeEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) { if (borderItemEditPart instanceof DataTypeFloatingNameEditPart) { IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure()); @@ -315,6 +325,7 @@ public class DataTypeEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected NodeFigure createNodePlate() { RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(100, 100); return result; @@ -322,12 +333,13 @@ public class DataTypeEditPart extends ClassifierEditPart { /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected NodeFigure createMainFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); @@ -336,9 +348,12 @@ public class DataTypeEditPart extends ClassifierEditPart { /** * Default implementation treats passed figure as content pane. * Respects layout one may have set for generated figure. - * @param nodeShape instance of generated figure class + * + * @param nodeShape + * instance of generated figure class * @generated */ + @Override protected IFigure setupContentPane(IFigure nodeShape) { if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); @@ -351,6 +366,7 @@ public class DataTypeEditPart extends ClassifierEditPart { /** * @generated */ + @Override public IFigure getContentPane() { if (contentPane != null) { return contentPane; @@ -361,6 +377,7 @@ public class DataTypeEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void setForegroundColor(Color color) { if (primaryShape != null) { primaryShape.setForegroundColor(color); @@ -370,6 +387,7 @@ public class DataTypeEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void setLineWidth(int width) { super.setLineWidth(width); } @@ -377,6 +395,7 @@ public class DataTypeEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void setLineType(int style) { if (primaryShape instanceof IPapyrusNodeFigure) { ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); @@ -386,6 +405,7 @@ public class DataTypeEditPart extends ClassifierEditPart { /** * @generated */ + @Override public EditPart getPrimaryChildEditPart() { return getChildBySemanticHint(UMLVisualIDRegistry.getType(DataTypeNameEditPart.VISUAL_ID)); } @@ -393,18 +413,16 @@ public class DataTypeEditPart extends ClassifierEditPart { /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { if (request instanceof CreateViewAndElementRequest) { - CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor() - .getCreateElementRequestAdapter(); + CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter(); IElementType type = (IElementType) adapter.getAdapter(IElementType.class); if (UMLElementTypes.isKindOf(type, UMLElementTypes.Property_DataTypeAttributeLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPart.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Operation_DataTypeOperationLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(DataTypeOperationCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(DataTypeOperationCompartmentEditPart.VISUAL_ID)); } } return super.getTargetEditPart(request); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeEditPartCN.java index 68c3884e575..e3628eb4163 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -96,6 +96,7 @@ public class DataTypeEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void createDefaultEditPolicies() { installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); super.createDefaultEditPolicies(); @@ -104,18 +105,15 @@ public class DataTypeEditPartCN extends ClassifierEditPart { installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DataTypeCanonicalEditPolicyCN()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DataTypeCanonicalEditPolicyCN()); installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); - installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, - new ShowHideCompartmentEditPolicy()); - installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, - new ShowHideClassifierContentsEditPolicy()); + installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy()); + installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies @@ -169,9 +167,11 @@ public class DataTypeEditPartCN extends ClassifierEditPart { } /** - *Papyrus codeGen - *@generated - **/ + * Papyrus codeGen + * + * @generated + **/ + @Override protected void handleNotificationEvent(Notification event) { /* * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart @@ -180,7 +180,8 @@ public class DataTypeEditPartCN extends ClassifierEditPart { if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) { Object notifier = event.getNotifier(); List<?> modelChildren = ((View) getModel()).getChildren(); - if (false == notifier instanceof Edge && false == notifier instanceof BasicCompartment) { + if (false == notifier instanceof Edge + && false == notifier instanceof BasicCompartment) { if (modelChildren.contains(event.getNotifier())) { return; } @@ -193,14 +194,17 @@ public class DataTypeEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected IFigure createNodeShape() { return primaryShape = new DataTypeFigure(); } /** * org.eclipse.papyrus.uml.diagram.common.figure.node.DataTypeFigure + * * @generated */ + @Override public DataTypeFigure getPrimaryShape() { return (DataTypeFigure) primaryShape; } @@ -214,28 +218,31 @@ public class DataTypeEditPartCN extends ClassifierEditPart { return true; } + if (childEditPart instanceof DataTypeAttributeCompartmentEditPartCN) { IFigure pane = getPrimaryShape().getAttributeCompartmentFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((DataTypeAttributeCompartmentEditPartCN) childEditPart).getFigure()); return true; } if (childEditPart instanceof DataTypeOperationCompartmentEditPartCN) { IFigure pane = getPrimaryShape().getOperationCompartmentFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((DataTypeOperationCompartmentEditPartCN) childEditPart).getFigure()); return true; } - //Papyrus Gencode :precise the locator for a template signature + + + // Papyrus Gencode :precise the locator for a template signature if (childEditPart instanceof RedefinableTemplateSignatureEditPart) { IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST); - getBorderedFigure().getBorderItemContainer() - .add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator); + getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator); return true; } + return false; } @@ -257,8 +264,7 @@ public class DataTypeEditPartCN extends ClassifierEditPart { return true; } if (childEditPart instanceof RedefinableTemplateSignatureEditPart) { - getBorderedFigure().getBorderItemContainer() - .remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure()); + getBorderedFigure().getBorderItemContainer().remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure()); return true; } return false; @@ -267,6 +273,7 @@ public class DataTypeEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -277,6 +284,7 @@ public class DataTypeEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -287,6 +295,7 @@ public class DataTypeEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { if (editPart instanceof DataTypeAttributeCompartmentEditPartCN) { return getPrimaryShape().getAttributeCompartmentFigure(); @@ -303,6 +312,7 @@ public class DataTypeEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) { if (borderItemEditPart instanceof DataTypeFloatingNameEditPartCN) { IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure()); @@ -315,6 +325,7 @@ public class DataTypeEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected NodeFigure createNodePlate() { RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(100, 100); return result; @@ -322,12 +333,13 @@ public class DataTypeEditPartCN extends ClassifierEditPart { /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected NodeFigure createMainFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); @@ -336,9 +348,12 @@ public class DataTypeEditPartCN extends ClassifierEditPart { /** * Default implementation treats passed figure as content pane. * Respects layout one may have set for generated figure. - * @param nodeShape instance of generated figure class + * + * @param nodeShape + * instance of generated figure class * @generated */ + @Override protected IFigure setupContentPane(IFigure nodeShape) { if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); @@ -351,6 +366,7 @@ public class DataTypeEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override public IFigure getContentPane() { if (contentPane != null) { return contentPane; @@ -361,6 +377,7 @@ public class DataTypeEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void setForegroundColor(Color color) { if (primaryShape != null) { primaryShape.setForegroundColor(color); @@ -370,6 +387,7 @@ public class DataTypeEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void setLineWidth(int width) { super.setLineWidth(width); } @@ -377,6 +395,7 @@ public class DataTypeEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void setLineType(int style) { if (primaryShape instanceof IPapyrusNodeFigure) { ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); @@ -386,6 +405,7 @@ public class DataTypeEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override public EditPart getPrimaryChildEditPart() { return getChildBySemanticHint(UMLVisualIDRegistry.getType(DataTypeNameEditPartCN.VISUAL_ID)); } @@ -393,18 +413,16 @@ public class DataTypeEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { if (request instanceof CreateViewAndElementRequest) { - CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor() - .getCreateElementRequestAdapter(); + CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter(); IElementType type = (IElementType) adapter.getAdapter(IElementType.class); if (UMLElementTypes.isKindOf(type, UMLElementTypes.Property_DataTypeAttributeLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPartCN.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPartCN.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Operation_DataTypeOperationLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(DataTypeOperationCompartmentEditPartCN.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(DataTypeOperationCompartmentEditPartCN.VISUAL_ID)); } } return super.getTargetEditPart(request); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeFloatingNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeFloatingNameEditPart.java index edbf97b3fe5..aa9682a1700 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeFloatingNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeFloatingNameEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -50,6 +50,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -60,11 +65,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -115,12 +115,14 @@ public class DataTypeFloatingNameEditPart extends FloatingLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -129,10 +131,7 @@ public class DataTypeFloatingNameEditPart extends FloatingLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeFloatingNameEditPart.VISUAL_ID), - new Point(0, 0)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeFloatingNameEditPart.VISUAL_ID), new Point(0, 0)); } /** @@ -145,6 +144,7 @@ public class DataTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); @@ -156,6 +156,7 @@ public class DataTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IBorderItemLocator getBorderItemLocator() { IFigure parentFigure = getFigure().getParent(); if (parentFigure != null && parentFigure.getLayoutManager() != null) { @@ -168,6 +169,7 @@ public class DataTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public void refreshBounds() { int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); @@ -242,6 +244,7 @@ public class DataTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -249,6 +252,7 @@ public class DataTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -281,7 +285,8 @@ public class DataTypeFloatingNameEditPart extends FloatingLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -293,6 +298,7 @@ public class DataTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -308,11 +314,13 @@ public class DataTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -326,6 +334,7 @@ public class DataTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -335,14 +344,12 @@ public class DataTypeFloatingNameEditPart extends FloatingLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), - DataTypeFloatingNameEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), DataTypeFloatingNameEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -360,6 +367,7 @@ public class DataTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -370,6 +378,7 @@ public class DataTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -377,6 +386,7 @@ public class DataTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.DataType_Shape, getParserElement(), this, VISUAL_ID); @@ -439,6 +449,7 @@ public class DataTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -466,18 +477,13 @@ public class DataTypeFloatingNameEditPart extends FloatingLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -489,8 +495,7 @@ public class DataTypeFloatingNameEditPart extends FloatingLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -516,10 +521,9 @@ public class DataTypeFloatingNameEditPart extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -535,6 +539,7 @@ public class DataTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -576,7 +581,8 @@ public class DataTypeFloatingNameEditPart extends FloatingLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -593,7 +599,8 @@ public class DataTypeFloatingNameEditPart extends FloatingLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -602,11 +609,15 @@ public class DataTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -614,6 +625,7 @@ public class DataTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -621,6 +633,7 @@ public class DataTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -636,6 +649,7 @@ public class DataTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -649,6 +663,7 @@ public class DataTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -671,7 +686,7 @@ public class DataTypeFloatingNameEditPart extends FloatingLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -690,7 +705,7 @@ public class DataTypeFloatingNameEditPart extends FloatingLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -703,7 +718,7 @@ public class DataTypeFloatingNameEditPart extends FloatingLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -713,43 +728,42 @@ public class DataTypeFloatingNameEditPart extends FloatingLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -758,13 +772,11 @@ public class DataTypeFloatingNameEditPart extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -781,6 +793,7 @@ public class DataTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -790,10 +803,10 @@ public class DataTypeFloatingNameEditPart extends FloatingLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -816,6 +829,7 @@ public class DataTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeFloatingNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeFloatingNameEditPartCN.java index fa72b715722..a9fc874b3c9 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeFloatingNameEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeFloatingNameEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -50,6 +50,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -60,11 +65,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -115,12 +115,14 @@ public class DataTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -129,10 +131,7 @@ public class DataTypeFloatingNameEditPartCN extends FloatingLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeFloatingNameEditPartCN.VISUAL_ID), - new Point(0, 0)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeFloatingNameEditPartCN.VISUAL_ID), new Point(0, 0)); } /** @@ -145,6 +144,7 @@ public class DataTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); @@ -156,6 +156,7 @@ public class DataTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public IBorderItemLocator getBorderItemLocator() { IFigure parentFigure = getFigure().getParent(); if (parentFigure != null && parentFigure.getLayoutManager() != null) { @@ -168,6 +169,7 @@ public class DataTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public void refreshBounds() { int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); @@ -242,6 +244,7 @@ public class DataTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -249,6 +252,7 @@ public class DataTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -281,7 +285,8 @@ public class DataTypeFloatingNameEditPartCN extends FloatingLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -293,6 +298,7 @@ public class DataTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -308,11 +314,13 @@ public class DataTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -326,6 +334,7 @@ public class DataTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -335,14 +344,12 @@ public class DataTypeFloatingNameEditPartCN extends FloatingLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), - DataTypeFloatingNameEditPartCN.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), DataTypeFloatingNameEditPartCN.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -360,6 +367,7 @@ public class DataTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -370,6 +378,7 @@ public class DataTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -377,6 +386,7 @@ public class DataTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.DataType_Shape_CN, getParserElement(), this, VISUAL_ID); @@ -439,6 +449,7 @@ public class DataTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -466,18 +477,13 @@ public class DataTypeFloatingNameEditPartCN extends FloatingLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -489,8 +495,7 @@ public class DataTypeFloatingNameEditPartCN extends FloatingLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -516,10 +521,9 @@ public class DataTypeFloatingNameEditPartCN extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -535,6 +539,7 @@ public class DataTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -576,7 +581,8 @@ public class DataTypeFloatingNameEditPartCN extends FloatingLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -593,7 +599,8 @@ public class DataTypeFloatingNameEditPartCN extends FloatingLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -602,11 +609,15 @@ public class DataTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -614,6 +625,7 @@ public class DataTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -621,6 +633,7 @@ public class DataTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -636,6 +649,7 @@ public class DataTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -649,6 +663,7 @@ public class DataTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -671,7 +686,7 @@ public class DataTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -690,7 +705,7 @@ public class DataTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -703,7 +718,7 @@ public class DataTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -713,43 +728,42 @@ public class DataTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -758,13 +772,11 @@ public class DataTypeFloatingNameEditPartCN extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -781,6 +793,7 @@ public class DataTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -790,10 +803,10 @@ public class DataTypeFloatingNameEditPartCN extends FloatingLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -816,6 +829,7 @@ public class DataTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeNameEditPart.java index a2a82a12d46..b40c1a277b6 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeNameEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,20 +64,12 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -115,12 +113,14 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -135,6 +135,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy()); @@ -208,6 +209,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -215,6 +217,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -222,6 +225,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -237,8 +241,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -248,7 +251,8 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -260,6 +264,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -275,11 +280,13 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -293,6 +300,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -302,13 +310,12 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), DataTypeNameEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), DataTypeNameEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -326,6 +333,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -336,6 +344,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -343,6 +352,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.DataType_Shape, getParserElement(), this, VISUAL_ID); @@ -405,6 +415,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -432,18 +443,13 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -455,8 +461,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -482,10 +487,9 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -501,6 +505,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -542,7 +547,8 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -559,7 +565,8 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -568,11 +575,15 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -580,6 +591,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -587,6 +599,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -602,6 +615,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -615,6 +629,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -637,7 +652,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -656,7 +671,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -669,7 +684,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -679,43 +694,42 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -724,13 +738,11 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -747,6 +759,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -755,6 +768,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -763,6 +777,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); @@ -773,10 +788,10 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -793,8 +808,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } super.handleNotificationEvent(event); @@ -803,6 +817,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -816,6 +831,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void activate() { super.activate(); addOwnerElementListeners(); @@ -832,6 +848,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void deactivate() { removeOwnerElementListeners(); super.deactivate(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeNameEditPartCN.java index 9a762882136..d4b2b6b14a5 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeNameEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeNameEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,20 +64,12 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -115,12 +113,14 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -135,6 +135,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy()); @@ -208,6 +209,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -215,6 +217,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -222,6 +225,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -237,8 +241,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -248,7 +251,8 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -260,6 +264,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -275,11 +280,13 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -293,6 +300,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -302,13 +310,12 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), DataTypeNameEditPartCN.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), DataTypeNameEditPartCN.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -326,6 +333,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -336,6 +344,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -343,6 +352,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.DataType_Shape_CN, getParserElement(), this, VISUAL_ID); @@ -405,6 +415,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -432,18 +443,13 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -455,8 +461,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -482,10 +487,9 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -501,6 +505,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -542,7 +547,8 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -559,7 +565,8 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -568,11 +575,15 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -580,6 +591,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -587,6 +599,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -602,6 +615,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -615,6 +629,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -637,7 +652,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -656,7 +671,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -669,7 +684,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -679,43 +694,42 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -724,13 +738,11 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -747,6 +759,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -755,6 +768,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -763,6 +777,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); @@ -773,10 +788,10 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -793,8 +808,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } super.handleNotificationEvent(event); @@ -803,6 +817,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -816,6 +831,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void activate() { super.activate(); addOwnerElementListeners(); @@ -832,6 +848,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void deactivate() { removeOwnerElementListeners(); super.deactivate(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeOperationCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeOperationCompartmentEditPart.java index 11b9e568c56..a8eb6f15b43 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeOperationCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeOperationCompartmentEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -31,7 +31,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartme import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -55,6 +54,7 @@ public class DataTypeOperationCompartmentEditPart extends ResizeableListCompartm /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; } @@ -62,6 +62,7 @@ public class DataTypeOperationCompartmentEditPart extends ResizeableListCompartm /** * @generated */ + @Override public String getCompartmentName() { return Messages.DataTypeOperationCompartmentEditPart_title; } @@ -69,6 +70,7 @@ public class DataTypeOperationCompartmentEditPart extends ResizeableListCompartm /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -76,16 +78,16 @@ public class DataTypeOperationCompartmentEditPart extends ResizeableListCompartm installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DataTypeOperationCompartmentCanonicalEditPolicy()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DataTypeOperationCompartmentCanonicalEditPolicy()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); } /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -95,6 +97,7 @@ public class DataTypeOperationCompartmentEditPart extends ResizeableListCompartm /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -103,6 +106,7 @@ public class DataTypeOperationCompartmentEditPart extends ResizeableListCompartm /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -117,6 +121,7 @@ public class DataTypeOperationCompartmentEditPart extends ResizeableListCompartm /** * @generated */ + @Override protected void refreshBounds() { int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); @@ -124,12 +129,16 @@ public class DataTypeOperationCompartmentEditPart extends ResizeableListCompartm int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeOperationCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeOperationCompartmentEditPartCN.java index ab7af36ef76..4c9c562aea5 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeOperationCompartmentEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeOperationCompartmentEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -31,7 +31,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartme import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -55,6 +54,7 @@ public class DataTypeOperationCompartmentEditPartCN extends ResizeableListCompar /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; } @@ -62,6 +62,7 @@ public class DataTypeOperationCompartmentEditPartCN extends ResizeableListCompar /** * @generated */ + @Override public String getCompartmentName() { return Messages.DataTypeOperationCompartmentEditPartCN_title; } @@ -69,6 +70,7 @@ public class DataTypeOperationCompartmentEditPartCN extends ResizeableListCompar /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -76,16 +78,16 @@ public class DataTypeOperationCompartmentEditPartCN extends ResizeableListCompar installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DataTypeOperationCompartmentCanonicalEditPolicyCN()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DataTypeOperationCompartmentCanonicalEditPolicyCN()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); } /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -95,6 +97,7 @@ public class DataTypeOperationCompartmentEditPartCN extends ResizeableListCompar /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -103,6 +106,7 @@ public class DataTypeOperationCompartmentEditPartCN extends ResizeableListCompar /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -117,6 +121,7 @@ public class DataTypeOperationCompartmentEditPartCN extends ResizeableListCompar /** * @generated */ + @Override protected void refreshBounds() { int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); @@ -124,12 +129,16 @@ public class DataTypeOperationCompartmentEditPartCN extends ResizeableListCompar int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DefaultNamedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DefaultNamedElementEditPart.java index 951047c76d8..2c934f9dae3 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DefaultNamedElementEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DefaultNamedElementEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -71,6 +71,7 @@ public class DefaultNamedElementEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); @@ -79,8 +80,7 @@ public class DefaultNamedElementEditPart extends RoundedCompartmentEditPart { installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE); @@ -115,9 +115,11 @@ public class DefaultNamedElementEditPart extends RoundedCompartmentEditPart { } /** - *Papyrus codeGen - *@generated - **/ + * Papyrus codeGen + * + * @generated + **/ + @Override protected void handleNotificationEvent(Notification event) { super.handleNotificationEvent(event); @@ -126,14 +128,17 @@ public class DefaultNamedElementEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected IFigure createNodeShape() { return primaryShape = new RoundedCompartmentFigure(); } /** * org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure + * * @generated */ + @Override public RoundedCompartmentFigure getPrimaryShape() { return (RoundedCompartmentFigure) primaryShape; } @@ -147,6 +152,7 @@ public class DefaultNamedElementEditPart extends RoundedCompartmentEditPart { return true; } + return false; } @@ -163,6 +169,7 @@ public class DefaultNamedElementEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -173,6 +180,7 @@ public class DefaultNamedElementEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -183,6 +191,7 @@ public class DefaultNamedElementEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { return getContentPane(); } @@ -190,6 +199,7 @@ public class DefaultNamedElementEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected NodeFigure createNodePlate() { RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(100, 50); return result; @@ -197,12 +207,13 @@ public class DefaultNamedElementEditPart extends RoundedCompartmentEditPart { /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected NodeFigure createNodeFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); @@ -211,9 +222,12 @@ public class DefaultNamedElementEditPart extends RoundedCompartmentEditPart { /** * Default implementation treats passed figure as content pane. * Respects layout one may have set for generated figure. - * @param nodeShape instance of generated figure class + * + * @param nodeShape + * instance of generated figure class * @generated */ + @Override protected IFigure setupContentPane(IFigure nodeShape) { if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); @@ -226,6 +240,7 @@ public class DefaultNamedElementEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override public IFigure getContentPane() { if (contentPane != null) { return contentPane; @@ -236,6 +251,7 @@ public class DefaultNamedElementEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected void setForegroundColor(Color color) { if (primaryShape != null) { primaryShape.setForegroundColor(color); @@ -245,6 +261,7 @@ public class DefaultNamedElementEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected void setLineWidth(int width) { super.setLineWidth(width); } @@ -252,6 +269,7 @@ public class DefaultNamedElementEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected void setLineType(int style) { if (primaryShape instanceof IPapyrusNodeFigure) { ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); @@ -261,6 +279,7 @@ public class DefaultNamedElementEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override public EditPart getPrimaryChildEditPart() { return getChildBySemanticHint(UMLVisualIDRegistry.getType(DefaultNamedElementNameEditPart.VISUAL_ID)); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DefaultNamedElementNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DefaultNamedElementNameEditPart.java index f3ccc929898..a9f1c15b506 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DefaultNamedElementNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DefaultNamedElementNameEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,20 +64,12 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -115,12 +113,14 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -135,6 +135,7 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy()); @@ -208,6 +209,7 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -215,6 +217,7 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -222,6 +225,7 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -237,8 +241,7 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -248,7 +251,8 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -260,6 +264,7 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -275,11 +280,13 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -293,6 +300,7 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -302,14 +310,12 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), - DefaultNamedElementNameEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), DefaultNamedElementNameEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -327,6 +333,7 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -337,6 +344,7 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -344,10 +352,10 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.NamedElement_DefaultShape, getParserElement(), this, - VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.NamedElement_DefaultShape, getParserElement(), this, VISUAL_ID); } return parser; } @@ -407,6 +415,7 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -434,18 +443,13 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -457,8 +461,7 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -484,10 +487,9 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -503,6 +505,7 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -544,7 +547,8 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -561,7 +565,8 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -570,11 +575,15 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -582,6 +591,7 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -589,6 +599,7 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -604,6 +615,7 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -617,6 +629,7 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -639,7 +652,7 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -658,7 +671,7 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -671,7 +684,7 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -681,43 +694,42 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -726,13 +738,11 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -749,6 +759,7 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -757,6 +768,7 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -765,6 +777,7 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); @@ -775,10 +788,10 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -795,8 +808,7 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } super.handleNotificationEvent(event); @@ -805,6 +817,7 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -818,6 +831,7 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void activate() { super.activate(); addOwnerElementListeners(); @@ -834,6 +848,7 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void deactivate() { removeOwnerElementListeners(); super.deactivate(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyBranchEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyBranchEditPart.java index 883f732d994..1f4dbfacc31 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyBranchEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyBranchEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -24,8 +24,8 @@ import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNode import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure; /** - * @generated - */ + * @generated + */ public class DependencyBranchEditPart extends ConnectionEditPart implements ITreeBranchEditPart { /** @@ -43,6 +43,7 @@ public class DependencyBranchEditPart extends ConnectionEditPart implements ITre /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); @@ -51,12 +52,13 @@ public class DependencyBranchEditPart extends ConnectionEditPart implements ITre /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected Connection createConnectionFigure() { return new DashedEdgeFigure(); } @@ -64,6 +66,7 @@ public class DependencyBranchEditPart extends ConnectionEditPart implements ITre /** * @generated */ + @Override public DashedEdgeFigure getPrimaryShape() { return (DashedEdgeFigure) getFigure(); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyEditPart.java index 905923ab5eb..9fed2262cc6 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -27,8 +27,8 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLink import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure; /** - * @generated - */ + * @generated + */ public class DependencyEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart { /** @@ -46,11 +46,11 @@ public class DependencyEditPart extends UMLConnectionNodeEditPart implements ITr /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeLinkLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); } @@ -59,11 +59,12 @@ public class DependencyEditPart extends UMLConnectionNodeEditPart implements ITr */ protected boolean addFixedChild(EditPart childEditPart) { if (childEditPart instanceof DependencyNameEditPart) { - ((DependencyNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel()); + ((DependencyNameEditPart) childEditPart).setLabel( + getPrimaryShape().getNameLabel()); } if (childEditPart instanceof AppliedStereotypeDependencyEditPart) { - ((AppliedStereotypeDependencyEditPart) childEditPart) - .setLabel(getPrimaryShape().getAppliedStereotypeLabel()); + ((AppliedStereotypeDependencyEditPart) childEditPart).setLabel( + getPrimaryShape().getAppliedStereotypeLabel()); } return false; } @@ -71,6 +72,7 @@ public class DependencyEditPart extends UMLConnectionNodeEditPart implements ITr /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -94,6 +96,7 @@ public class DependencyEditPart extends UMLConnectionNodeEditPart implements ITr /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -103,12 +106,13 @@ public class DependencyEditPart extends UMLConnectionNodeEditPart implements ITr /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected Connection createConnectionFigure() { return new DashedEdgeFigure(); } @@ -116,6 +120,7 @@ public class DependencyEditPart extends UMLConnectionNodeEditPart implements ITr /** * @generated */ + @Override public DashedEdgeFigure getPrimaryShape() { return (DashedEdgeFigure) getFigure(); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyFloatingNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyFloatingNameEditPart.java index 52bc66f7c0f..4e134001d3c 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyFloatingNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyFloatingNameEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -50,6 +50,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -60,11 +65,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -115,12 +115,14 @@ public class DependencyFloatingNameEditPart extends FloatingLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -129,10 +131,7 @@ public class DependencyFloatingNameEditPart extends FloatingLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyFloatingNameEditPart.VISUAL_ID), - new Point(0, 0)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyFloatingNameEditPart.VISUAL_ID), new Point(0, 0)); } /** @@ -145,6 +144,7 @@ public class DependencyFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); @@ -156,6 +156,7 @@ public class DependencyFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IBorderItemLocator getBorderItemLocator() { IFigure parentFigure = getFigure().getParent(); if (parentFigure != null && parentFigure.getLayoutManager() != null) { @@ -168,6 +169,7 @@ public class DependencyFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public void refreshBounds() { int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); @@ -242,6 +244,7 @@ public class DependencyFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -249,6 +252,7 @@ public class DependencyFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -281,7 +285,8 @@ public class DependencyFloatingNameEditPart extends FloatingLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -293,6 +298,7 @@ public class DependencyFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -308,11 +314,13 @@ public class DependencyFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -326,6 +334,7 @@ public class DependencyFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -335,14 +344,12 @@ public class DependencyFloatingNameEditPart extends FloatingLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), - DependencyFloatingNameEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), DependencyFloatingNameEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -360,6 +367,7 @@ public class DependencyFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -370,6 +378,7 @@ public class DependencyFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -377,6 +386,7 @@ public class DependencyFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Dependency_Shape, getParserElement(), this, VISUAL_ID); @@ -439,6 +449,7 @@ public class DependencyFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -466,18 +477,13 @@ public class DependencyFloatingNameEditPart extends FloatingLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -489,8 +495,7 @@ public class DependencyFloatingNameEditPart extends FloatingLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -516,10 +521,9 @@ public class DependencyFloatingNameEditPart extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -535,6 +539,7 @@ public class DependencyFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -576,7 +581,8 @@ public class DependencyFloatingNameEditPart extends FloatingLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -593,7 +599,8 @@ public class DependencyFloatingNameEditPart extends FloatingLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -602,11 +609,15 @@ public class DependencyFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -614,6 +625,7 @@ public class DependencyFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -621,6 +633,7 @@ public class DependencyFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -636,6 +649,7 @@ public class DependencyFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -649,6 +663,7 @@ public class DependencyFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -671,7 +686,7 @@ public class DependencyFloatingNameEditPart extends FloatingLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -690,7 +705,7 @@ public class DependencyFloatingNameEditPart extends FloatingLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -703,7 +718,7 @@ public class DependencyFloatingNameEditPart extends FloatingLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -713,43 +728,42 @@ public class DependencyFloatingNameEditPart extends FloatingLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -758,13 +772,11 @@ public class DependencyFloatingNameEditPart extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -781,6 +793,7 @@ public class DependencyFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -790,10 +803,10 @@ public class DependencyFloatingNameEditPart extends FloatingLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -816,6 +829,7 @@ public class DependencyFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyNameEditPart.java index fe167da4b56..405fafd8215 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyNameEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,12 +64,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -114,12 +114,14 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -128,10 +130,7 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry - .getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyNameEditPart.VISUAL_ID), - new Point(0, 40)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DependencyNameEditPart.VISUAL_ID), new Point(0, 40)); } /** @@ -155,6 +154,7 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public int getKeyPoint() { return ConnectionLocator.MIDDLE; } @@ -225,6 +225,7 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -232,6 +233,7 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -239,6 +241,7 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -264,7 +267,8 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -276,6 +280,7 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -291,11 +296,13 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -309,6 +316,7 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -318,13 +326,12 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), DependencyNameEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), DependencyNameEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -342,6 +349,7 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -352,6 +360,7 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -359,6 +368,7 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Dependency_Edge, getParserElement(), this, VISUAL_ID); @@ -421,6 +431,7 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -448,18 +459,13 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -471,8 +477,7 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -498,10 +503,9 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -517,6 +521,7 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -558,7 +563,8 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -575,7 +581,8 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -584,11 +591,15 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -596,6 +607,7 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -603,6 +615,7 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -618,6 +631,7 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -631,6 +645,7 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -653,7 +668,7 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -672,7 +687,7 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -685,7 +700,7 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -695,43 +710,42 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -740,13 +754,11 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -763,6 +775,7 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -772,10 +785,10 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -799,6 +812,7 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -807,6 +821,7 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getLabelRole() { return "Name";//$NON-NLS-1$ } @@ -814,6 +829,7 @@ public class DependencyNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getIconPathRole() { return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png";//$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyNodeEditPart.java index 5a5b37fb803..e9c95638843 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyNodeEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyNodeEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -83,6 +83,7 @@ public class DependencyNodeEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); @@ -143,9 +144,11 @@ public class DependencyNodeEditPart extends RoundedCompartmentEditPart { } /** - *Papyrus codeGen - *@generated - **/ + * Papyrus codeGen + * + * @generated + **/ + @Override protected void handleNotificationEvent(Notification event) { /* * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart @@ -154,7 +157,8 @@ public class DependencyNodeEditPart extends RoundedCompartmentEditPart { if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) { Object notifier = event.getNotifier(); List<?> modelChildren = ((View) getModel()).getChildren(); - if (false == notifier instanceof Edge && false == notifier instanceof BasicCompartment) { + if (false == notifier instanceof Edge + && false == notifier instanceof BasicCompartment) { if (modelChildren.contains(event.getNotifier())) { return; } @@ -167,14 +171,17 @@ public class DependencyNodeEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected IFigure createNodeShape() { return primaryShape = new RoundedCompartmentFigure(); } /** * org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure + * * @generated */ + @Override public RoundedCompartmentFigure getPrimaryShape() { return (RoundedCompartmentFigure) primaryShape; } @@ -182,6 +189,7 @@ public class DependencyNodeEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) { if (borderItemEditPart instanceof MultiDependencyLabelEditPart) { BorderItemLocator locator = new BorderItemLocator(getMainFigure(), PositionConstants.SOUTH); @@ -198,6 +206,7 @@ public class DependencyNodeEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected NodeFigure createNodePlate() { RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(10, 10); return result; @@ -205,12 +214,13 @@ public class DependencyNodeEditPart extends RoundedCompartmentEditPart { /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected NodeFigure createMainFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); @@ -219,9 +229,12 @@ public class DependencyNodeEditPart extends RoundedCompartmentEditPart { /** * Default implementation treats passed figure as content pane. * Respects layout one may have set for generated figure. - * @param nodeShape instance of generated figure class + * + * @param nodeShape + * instance of generated figure class * @generated */ + @Override protected IFigure setupContentPane(IFigure nodeShape) { return nodeShape; // use nodeShape itself as contentPane } @@ -229,6 +242,7 @@ public class DependencyNodeEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override public IFigure getContentPane() { if (contentPane != null) { return contentPane; @@ -239,6 +253,7 @@ public class DependencyNodeEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected void setForegroundColor(Color color) { if (primaryShape != null) { primaryShape.setForegroundColor(color); @@ -248,6 +263,7 @@ public class DependencyNodeEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected void setLineWidth(int width) { super.setLineWidth(width); } @@ -255,6 +271,7 @@ public class DependencyNodeEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected void setLineType(int style) { if (primaryShape instanceof IPapyrusNodeFigure) { ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); @@ -264,6 +281,7 @@ public class DependencyNodeEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override public EditPart getPrimaryChildEditPart() { return getChildBySemanticHint(UMLVisualIDRegistry.getType(MultiDependencyLabelEditPart.VISUAL_ID)); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DiagramNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DiagramNameEditPart.java index 3bed8db1af8..48aa2087e87 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DiagramNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DiagramNameEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -50,6 +50,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -60,11 +65,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -115,12 +115,14 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -129,10 +131,7 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry - .getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DiagramNameEditPart.VISUAL_ID), - new Point(0, 0)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DiagramNameEditPart.VISUAL_ID), new Point(0, 0)); } /** @@ -145,6 +144,7 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); @@ -155,6 +155,7 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart /** * @generated */ + @Override public IBorderItemLocator getBorderItemLocator() { IFigure parentFigure = getFigure().getParent(); if (parentFigure != null && parentFigure.getLayoutManager() != null) { @@ -167,6 +168,7 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart /** * @generated */ + @Override public void refreshBounds() { int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); @@ -241,6 +243,7 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -248,6 +251,7 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -280,7 +284,8 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -292,6 +297,7 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -307,11 +313,13 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -325,6 +333,7 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -334,13 +343,12 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), DiagramNameEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), DiagramNameEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -358,6 +366,7 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -368,6 +377,7 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -375,6 +385,7 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Diagram_ShortcutShape, getParserElement(), this, VISUAL_ID); @@ -437,6 +448,7 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -464,18 +476,13 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -487,8 +494,7 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -514,10 +520,9 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -533,6 +538,7 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -574,7 +580,8 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -591,7 +598,8 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -600,11 +608,15 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -612,6 +624,7 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -619,6 +632,7 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -634,6 +648,7 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -647,6 +662,7 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -669,7 +685,7 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -688,7 +704,7 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -701,7 +717,7 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -711,43 +727,42 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -756,13 +771,11 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -779,6 +792,7 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -788,10 +802,10 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -814,6 +828,7 @@ public class DiagramNameEditPart extends AbstractShortcutDiagramNameEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DurationObservationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DurationObservationEditPart.java index 2808789a644..58f3dab3289 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DurationObservationEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DurationObservationEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -85,6 +85,7 @@ public class DurationObservationEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); @@ -92,8 +93,7 @@ public class DurationObservationEditPart extends RoundedCompartmentEditPart { installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeIconlDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeIconlDisplayEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy()); installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy()); @@ -147,9 +147,11 @@ public class DurationObservationEditPart extends RoundedCompartmentEditPart { } /** - *Papyrus codeGen - *@generated - **/ + * Papyrus codeGen + * + * @generated + **/ + @Override protected void handleNotificationEvent(Notification event) { /* * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart @@ -158,7 +160,8 @@ public class DurationObservationEditPart extends RoundedCompartmentEditPart { if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) { Object notifier = event.getNotifier(); List<?> modelChildren = ((View) getModel()).getChildren(); - if (false == notifier instanceof Edge && false == notifier instanceof BasicCompartment) { + if (false == notifier instanceof Edge + && false == notifier instanceof BasicCompartment) { if (modelChildren.contains(event.getNotifier())) { return; } @@ -171,14 +174,17 @@ public class DurationObservationEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected IFigure createNodeShape() { return primaryShape = new RoundedCompartmentFigure(); } /** * org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure + * * @generated */ + @Override public RoundedCompartmentFigure getPrimaryShape() { return (RoundedCompartmentFigure) primaryShape; } @@ -186,6 +192,7 @@ public class DurationObservationEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) { if (borderItemEditPart instanceof DurationObservationStereotypeLabelEditPart) { BorderItemLocator locator = new BorderItemLocator(getMainFigure(), PositionConstants.SOUTH); @@ -202,6 +209,7 @@ public class DurationObservationEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected NodeFigure createNodePlate() { RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40); return result; @@ -209,12 +217,13 @@ public class DurationObservationEditPart extends RoundedCompartmentEditPart { /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected NodeFigure createMainFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); @@ -223,9 +232,12 @@ public class DurationObservationEditPart extends RoundedCompartmentEditPart { /** * Default implementation treats passed figure as content pane. * Respects layout one may have set for generated figure. - * @param nodeShape instance of generated figure class + * + * @param nodeShape + * instance of generated figure class * @generated */ + @Override protected IFigure setupContentPane(IFigure nodeShape) { return nodeShape; // use nodeShape itself as contentPane } @@ -233,6 +245,7 @@ public class DurationObservationEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override public IFigure getContentPane() { if (contentPane != null) { return contentPane; @@ -243,6 +256,7 @@ public class DurationObservationEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected void setForegroundColor(Color color) { if (primaryShape != null) { primaryShape.setForegroundColor(color); @@ -252,6 +266,7 @@ public class DurationObservationEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected void setLineWidth(int width) { super.setLineWidth(width); } @@ -259,6 +274,7 @@ public class DurationObservationEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected void setLineType(int style) { if (primaryShape instanceof IPapyrusNodeFigure) { ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); @@ -268,6 +284,7 @@ public class DurationObservationEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override public EditPart getPrimaryChildEditPart() { return getChildBySemanticHint(UMLVisualIDRegistry.getType(DurationObservationFloatingNameEditPart.VISUAL_ID)); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DurationObservationFloatingNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DurationObservationFloatingNameEditPart.java index 0f861a01b7d..f2631297a37 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DurationObservationFloatingNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DurationObservationFloatingNameEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -50,6 +50,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -60,11 +65,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -115,12 +115,14 @@ public class DurationObservationFloatingNameEditPart extends FloatingLabelEditPa /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -129,9 +131,7 @@ public class DurationObservationFloatingNameEditPart extends FloatingLabelEditPa * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DurationObservationFloatingNameEditPart.VISUAL_ID), - new Point(0, 0)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DurationObservationFloatingNameEditPart.VISUAL_ID), new Point(0, 0)); } /** @@ -144,6 +144,7 @@ public class DurationObservationFloatingNameEditPart extends FloatingLabelEditPa /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); @@ -155,6 +156,7 @@ public class DurationObservationFloatingNameEditPart extends FloatingLabelEditPa /** * @generated */ + @Override public IBorderItemLocator getBorderItemLocator() { IFigure parentFigure = getFigure().getParent(); if (parentFigure != null && parentFigure.getLayoutManager() != null) { @@ -167,6 +169,7 @@ public class DurationObservationFloatingNameEditPart extends FloatingLabelEditPa /** * @generated */ + @Override public void refreshBounds() { int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); @@ -241,6 +244,7 @@ public class DurationObservationFloatingNameEditPart extends FloatingLabelEditPa /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -248,6 +252,7 @@ public class DurationObservationFloatingNameEditPart extends FloatingLabelEditPa /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -280,7 +285,8 @@ public class DurationObservationFloatingNameEditPart extends FloatingLabelEditPa String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -292,6 +298,7 @@ public class DurationObservationFloatingNameEditPart extends FloatingLabelEditPa /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -307,11 +314,13 @@ public class DurationObservationFloatingNameEditPart extends FloatingLabelEditPa /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -325,6 +334,7 @@ public class DurationObservationFloatingNameEditPart extends FloatingLabelEditPa /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -334,16 +344,12 @@ public class DurationObservationFloatingNameEditPart extends FloatingLabelEditPa final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - DurationObservationFloatingNameEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), DurationObservationFloatingNameEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -361,6 +367,7 @@ public class DurationObservationFloatingNameEditPart extends FloatingLabelEditPa /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -371,6 +378,7 @@ public class DurationObservationFloatingNameEditPart extends FloatingLabelEditPa /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -378,10 +386,10 @@ public class DurationObservationFloatingNameEditPart extends FloatingLabelEditPa /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.DurationObservation_Shape, getParserElement(), this, - VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.DurationObservation_Shape, getParserElement(), this, VISUAL_ID); } return parser; } @@ -441,6 +449,7 @@ public class DurationObservationFloatingNameEditPart extends FloatingLabelEditPa /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -468,18 +477,13 @@ public class DurationObservationFloatingNameEditPart extends FloatingLabelEditPa initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -491,8 +495,7 @@ public class DurationObservationFloatingNameEditPart extends FloatingLabelEditPa @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -518,10 +521,9 @@ public class DurationObservationFloatingNameEditPart extends FloatingLabelEditPa @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -537,6 +539,7 @@ public class DurationObservationFloatingNameEditPart extends FloatingLabelEditPa /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -578,7 +581,8 @@ public class DurationObservationFloatingNameEditPart extends FloatingLabelEditPa * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -595,7 +599,8 @@ public class DurationObservationFloatingNameEditPart extends FloatingLabelEditPa * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -604,11 +609,15 @@ public class DurationObservationFloatingNameEditPart extends FloatingLabelEditPa /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -616,6 +625,7 @@ public class DurationObservationFloatingNameEditPart extends FloatingLabelEditPa /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -623,6 +633,7 @@ public class DurationObservationFloatingNameEditPart extends FloatingLabelEditPa /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -638,6 +649,7 @@ public class DurationObservationFloatingNameEditPart extends FloatingLabelEditPa /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -651,6 +663,7 @@ public class DurationObservationFloatingNameEditPart extends FloatingLabelEditPa /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -673,7 +686,7 @@ public class DurationObservationFloatingNameEditPart extends FloatingLabelEditPa /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -692,7 +705,7 @@ public class DurationObservationFloatingNameEditPart extends FloatingLabelEditPa /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -705,7 +718,7 @@ public class DurationObservationFloatingNameEditPart extends FloatingLabelEditPa /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -715,43 +728,42 @@ public class DurationObservationFloatingNameEditPart extends FloatingLabelEditPa /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -760,13 +772,11 @@ public class DurationObservationFloatingNameEditPart extends FloatingLabelEditPa @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -783,6 +793,7 @@ public class DurationObservationFloatingNameEditPart extends FloatingLabelEditPa /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -792,10 +803,10 @@ public class DurationObservationFloatingNameEditPart extends FloatingLabelEditPa refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -818,6 +829,7 @@ public class DurationObservationFloatingNameEditPart extends FloatingLabelEditPa /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DurationObservationStereotypeLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DurationObservationStereotypeLabelEditPart.java index a4826ba48b7..1e78fa5f87a 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DurationObservationStereotypeLabelEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DurationObservationStereotypeLabelEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -50,6 +50,10 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -60,10 +64,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -118,12 +118,14 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -132,9 +134,7 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DurationObservationStereotypeLabelEditPart.VISUAL_ID), - new Point(0, 0)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DurationObservationStereotypeLabelEditPart.VISUAL_ID), new Point(0, 0)); } /** @@ -147,18 +147,19 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeExternalNodeEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeExternalNodeEditPolicy()); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy()); } /** * @generated */ + @Override public IBorderItemLocator getBorderItemLocator() { IFigure parentFigure = getFigure().getParent(); if (parentFigure != null && parentFigure.getLayoutManager() != null) { @@ -171,6 +172,7 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi /** * @generated */ + @Override public void refreshBounds() { int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); @@ -245,6 +247,7 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -252,6 +255,7 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -284,7 +288,8 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -296,6 +301,7 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -311,11 +317,13 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -329,6 +337,7 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -338,15 +347,12 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - DurationObservationStereotypeLabelEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), DurationObservationStereotypeLabelEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -364,6 +370,7 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -374,6 +381,7 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -381,10 +389,10 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.DurationObservation_Shape, getParserElement(), this, - VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.DurationObservation_Shape, getParserElement(), this, VISUAL_ID); } return parser; } @@ -444,6 +452,7 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -471,18 +480,13 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -494,8 +498,7 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -521,10 +524,9 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -540,6 +542,7 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -581,7 +584,8 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -598,7 +602,8 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -607,11 +612,15 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -619,6 +628,7 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -626,6 +636,7 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -641,6 +652,7 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -654,6 +666,7 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -676,7 +689,7 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -695,7 +708,7 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -708,7 +721,7 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -718,43 +731,42 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -763,13 +775,11 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -786,6 +796,7 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -795,10 +806,10 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -821,6 +832,7 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); @@ -837,6 +849,7 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi /** * @generated */ + @Override public String getLabelRole() { return "Stereotype";//$NON-NLS-1$ } @@ -844,6 +857,7 @@ public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEdi /** * @generated */ + @Override public String getIconPathRole() { return "platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Stereotype.gif";//$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ElementImportAliasEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ElementImportAliasEditPart.java index cd426d7ade8..fb79a47861f 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ElementImportAliasEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ElementImportAliasEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,12 +64,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -114,12 +114,14 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -128,10 +130,7 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry - .getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportAliasEditPart.VISUAL_ID), - new Point(0, 40)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ElementImportAliasEditPart.VISUAL_ID), new Point(0, 40)); } /** @@ -155,6 +154,7 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public int getKeyPoint() { return ConnectionLocator.MIDDLE; } @@ -225,6 +225,7 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -232,6 +233,7 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -239,6 +241,7 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -264,7 +267,8 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -276,6 +280,7 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -291,11 +296,13 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -309,6 +316,7 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -318,13 +326,12 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), ElementImportAliasEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ElementImportAliasEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -342,6 +349,7 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -352,6 +360,7 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -359,6 +368,7 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.ElementImport_Edge, getParserElement(), this, VISUAL_ID); @@ -421,6 +431,7 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -448,18 +459,13 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -471,8 +477,7 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -498,10 +503,9 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -517,6 +521,7 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -558,7 +563,8 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -575,7 +581,8 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -584,11 +591,15 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -596,6 +607,7 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -603,6 +615,7 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -618,6 +631,7 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -631,6 +645,7 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -653,7 +668,7 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -672,7 +687,7 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -685,7 +700,7 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -695,43 +710,42 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -740,13 +754,11 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -763,6 +775,7 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -772,10 +785,10 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -799,6 +812,7 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -807,6 +821,7 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getLabelRole() { return "Alias";//$NON-NLS-1$ } @@ -814,6 +829,7 @@ public class ElementImportAliasEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getIconPathRole() { return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/alias.png";//$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ElementImportEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ElementImportEditPart.java index fde0bd87f37..9ff3b25263c 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ElementImportEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ElementImportEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -27,8 +27,8 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLink import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure; /** - * @generated - */ + * @generated + */ public class ElementImportEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart { /** @@ -46,11 +46,11 @@ public class ElementImportEditPart extends UMLConnectionNodeEditPart implements /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeLinkLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); } @@ -59,11 +59,12 @@ public class ElementImportEditPart extends UMLConnectionNodeEditPart implements */ protected boolean addFixedChild(EditPart childEditPart) { if (childEditPart instanceof ElementImportAliasEditPart) { - ((ElementImportAliasEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel()); + ((ElementImportAliasEditPart) childEditPart).setLabel( + getPrimaryShape().getNameLabel()); } if (childEditPart instanceof AppliedStereotypeElementImportEditPart) { - ((AppliedStereotypeElementImportEditPart) childEditPart) - .setLabel(getPrimaryShape().getAppliedStereotypeLabel()); + ((AppliedStereotypeElementImportEditPart) childEditPart).setLabel( + getPrimaryShape().getAppliedStereotypeLabel()); } return false; } @@ -71,6 +72,7 @@ public class ElementImportEditPart extends UMLConnectionNodeEditPart implements /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -94,6 +96,7 @@ public class ElementImportEditPart extends UMLConnectionNodeEditPart implements /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -103,12 +106,13 @@ public class ElementImportEditPart extends UMLConnectionNodeEditPart implements /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected Connection createConnectionFigure() { return new DashedEdgeFigure(); } @@ -116,6 +120,7 @@ public class ElementImportEditPart extends UMLConnectionNodeEditPart implements /** * @generated */ + @Override public DashedEdgeFigure getPrimaryShape() { return (DashedEdgeFigure) getFigure(); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEditPart.java index 633b8a50a96..fae77149cc0 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -95,6 +95,7 @@ public class EnumerationEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void createDefaultEditPolicies() { installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); super.createDefaultEditPolicies(); @@ -103,18 +104,15 @@ public class EnumerationEditPart extends ClassifierEditPart { installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.EnumerationCanonicalEditPolicy()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.EnumerationCanonicalEditPolicy()); installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); - installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, - new ShowHideCompartmentEditPolicy()); - installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, - new ShowHideClassifierContentsEditPolicy()); + installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy()); + installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy()); installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE); @@ -167,9 +165,11 @@ public class EnumerationEditPart extends ClassifierEditPart { } /** - *Papyrus codeGen - *@generated - **/ + * Papyrus codeGen + * + * @generated + **/ + @Override protected void handleNotificationEvent(Notification event) { /* * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart @@ -178,7 +178,8 @@ public class EnumerationEditPart extends ClassifierEditPart { if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) { Object notifier = event.getNotifier(); List<?> modelChildren = ((View) getModel()).getChildren(); - if (false == notifier instanceof Edge && false == notifier instanceof BasicCompartment) { + if (false == notifier instanceof Edge + && false == notifier instanceof BasicCompartment) { if (modelChildren.contains(event.getNotifier())) { return; } @@ -191,14 +192,17 @@ public class EnumerationEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected IFigure createNodeShape() { return primaryShape = new EnumerationFigure(); } /** * org.eclipse.papyrus.uml.diagram.common.figure.node.EnumerationFigure + * * @generated */ + @Override public EnumerationFigure getPrimaryShape() { return (EnumerationFigure) primaryShape; } @@ -212,21 +216,24 @@ public class EnumerationEditPart extends ClassifierEditPart { return true; } + if (childEditPart instanceof EnumerationEnumerationLiteralCompartmentEditPart) { IFigure pane = getPrimaryShape().getEnumerationLiteralCompartmentFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((EnumerationEnumerationLiteralCompartmentEditPart) childEditPart).getFigure()); return true; } - //Papyrus Gencode :precise the locator for a template signature + + + // Papyrus Gencode :precise the locator for a template signature if (childEditPart instanceof RedefinableTemplateSignatureEditPart) { IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST); - getBorderedFigure().getBorderItemContainer() - .add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator); + getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator); return true; } + return false; } @@ -243,8 +250,7 @@ public class EnumerationEditPart extends ClassifierEditPart { return true; } if (childEditPart instanceof RedefinableTemplateSignatureEditPart) { - getBorderedFigure().getBorderItemContainer() - .remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure()); + getBorderedFigure().getBorderItemContainer().remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure()); return true; } return false; @@ -253,6 +259,7 @@ public class EnumerationEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -263,6 +270,7 @@ public class EnumerationEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -273,6 +281,7 @@ public class EnumerationEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { if (editPart instanceof EnumerationEnumerationLiteralCompartmentEditPart) { return getPrimaryShape().getEnumerationLiteralCompartmentFigure(); @@ -286,6 +295,7 @@ public class EnumerationEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) { if (borderItemEditPart instanceof EnumerationFloatingNameEditPart) { IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure()); @@ -298,6 +308,7 @@ public class EnumerationEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected NodeFigure createNodePlate() { RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(100, 100); return result; @@ -305,12 +316,13 @@ public class EnumerationEditPart extends ClassifierEditPart { /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected NodeFigure createMainFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); @@ -319,9 +331,12 @@ public class EnumerationEditPart extends ClassifierEditPart { /** * Default implementation treats passed figure as content pane. * Respects layout one may have set for generated figure. - * @param nodeShape instance of generated figure class + * + * @param nodeShape + * instance of generated figure class * @generated */ + @Override protected IFigure setupContentPane(IFigure nodeShape) { if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); @@ -334,6 +349,7 @@ public class EnumerationEditPart extends ClassifierEditPart { /** * @generated */ + @Override public IFigure getContentPane() { if (contentPane != null) { return contentPane; @@ -344,6 +360,7 @@ public class EnumerationEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void setForegroundColor(Color color) { if (primaryShape != null) { primaryShape.setForegroundColor(color); @@ -353,6 +370,7 @@ public class EnumerationEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void setLineWidth(int width) { super.setLineWidth(width); } @@ -360,6 +378,7 @@ public class EnumerationEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void setLineType(int style) { if (primaryShape instanceof IPapyrusNodeFigure) { ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); @@ -369,6 +388,7 @@ public class EnumerationEditPart extends ClassifierEditPart { /** * @generated */ + @Override public EditPart getPrimaryChildEditPart() { return getChildBySemanticHint(UMLVisualIDRegistry.getType(EnumerationNameEditPart.VISUAL_ID)); } @@ -376,14 +396,13 @@ public class EnumerationEditPart extends ClassifierEditPart { /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { if (request instanceof CreateViewAndElementRequest) { - CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor() - .getCreateElementRequestAdapter(); + CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter(); IElementType type = (IElementType) adapter.getAdapter(IElementType.class); if (UMLElementTypes.isKindOf(type, UMLElementTypes.EnumerationLiteral_LiteralLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID)); } } return super.getTargetEditPart(request); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEditPartCN.java index b785aee3b1e..726962b0571 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -95,6 +95,7 @@ public class EnumerationEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void createDefaultEditPolicies() { installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); super.createDefaultEditPolicies(); @@ -103,18 +104,15 @@ public class EnumerationEditPartCN extends ClassifierEditPart { installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.EnumerationCanonicalEditPolicyCN()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.EnumerationCanonicalEditPolicyCN()); installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); - installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, - new ShowHideCompartmentEditPolicy()); - installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, - new ShowHideClassifierContentsEditPolicy()); + installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy()); + installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy()); installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE); @@ -167,9 +165,11 @@ public class EnumerationEditPartCN extends ClassifierEditPart { } /** - *Papyrus codeGen - *@generated - **/ + * Papyrus codeGen + * + * @generated + **/ + @Override protected void handleNotificationEvent(Notification event) { /* * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart @@ -178,7 +178,8 @@ public class EnumerationEditPartCN extends ClassifierEditPart { if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) { Object notifier = event.getNotifier(); List<?> modelChildren = ((View) getModel()).getChildren(); - if (false == notifier instanceof Edge && false == notifier instanceof BasicCompartment) { + if (false == notifier instanceof Edge + && false == notifier instanceof BasicCompartment) { if (modelChildren.contains(event.getNotifier())) { return; } @@ -191,14 +192,17 @@ public class EnumerationEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected IFigure createNodeShape() { return primaryShape = new EnumerationFigure(); } /** * org.eclipse.papyrus.uml.diagram.common.figure.node.EnumerationFigure + * * @generated */ + @Override public EnumerationFigure getPrimaryShape() { return (EnumerationFigure) primaryShape; } @@ -212,21 +216,24 @@ public class EnumerationEditPartCN extends ClassifierEditPart { return true; } + if (childEditPart instanceof EnumerationEnumerationLiteralCompartmentEditPartCN) { IFigure pane = getPrimaryShape().getEnumerationLiteralCompartmentFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((EnumerationEnumerationLiteralCompartmentEditPartCN) childEditPart).getFigure()); return true; } - //Papyrus Gencode :precise the locator for a template signature + + + // Papyrus Gencode :precise the locator for a template signature if (childEditPart instanceof RedefinableTemplateSignatureEditPart) { IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST); - getBorderedFigure().getBorderItemContainer() - .add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator); + getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator); return true; } + return false; } @@ -243,8 +250,7 @@ public class EnumerationEditPartCN extends ClassifierEditPart { return true; } if (childEditPart instanceof RedefinableTemplateSignatureEditPart) { - getBorderedFigure().getBorderItemContainer() - .remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure()); + getBorderedFigure().getBorderItemContainer().remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure()); return true; } return false; @@ -253,6 +259,7 @@ public class EnumerationEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -263,6 +270,7 @@ public class EnumerationEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -273,6 +281,7 @@ public class EnumerationEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { if (editPart instanceof EnumerationEnumerationLiteralCompartmentEditPartCN) { return getPrimaryShape().getEnumerationLiteralCompartmentFigure(); @@ -286,6 +295,7 @@ public class EnumerationEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) { if (borderItemEditPart instanceof EnumerationFloatingNameEditPartCN) { IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure()); @@ -298,6 +308,7 @@ public class EnumerationEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected NodeFigure createNodePlate() { RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(100, 100); return result; @@ -305,12 +316,13 @@ public class EnumerationEditPartCN extends ClassifierEditPart { /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected NodeFigure createMainFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); @@ -319,9 +331,12 @@ public class EnumerationEditPartCN extends ClassifierEditPart { /** * Default implementation treats passed figure as content pane. * Respects layout one may have set for generated figure. - * @param nodeShape instance of generated figure class + * + * @param nodeShape + * instance of generated figure class * @generated */ + @Override protected IFigure setupContentPane(IFigure nodeShape) { if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); @@ -334,6 +349,7 @@ public class EnumerationEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override public IFigure getContentPane() { if (contentPane != null) { return contentPane; @@ -344,6 +360,7 @@ public class EnumerationEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void setForegroundColor(Color color) { if (primaryShape != null) { primaryShape.setForegroundColor(color); @@ -353,6 +370,7 @@ public class EnumerationEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void setLineWidth(int width) { super.setLineWidth(width); } @@ -360,6 +378,7 @@ public class EnumerationEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void setLineType(int style) { if (primaryShape instanceof IPapyrusNodeFigure) { ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); @@ -369,6 +388,7 @@ public class EnumerationEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override public EditPart getPrimaryChildEditPart() { return getChildBySemanticHint(UMLVisualIDRegistry.getType(EnumerationNameEditPartCN.VISUAL_ID)); } @@ -376,14 +396,13 @@ public class EnumerationEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { if (request instanceof CreateViewAndElementRequest) { - CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor() - .getCreateElementRequestAdapter(); + CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter(); IElementType type = (IElementType) adapter.getAdapter(IElementType.class); if (UMLElementTypes.isKindOf(type, UMLElementTypes.EnumerationLiteral_LiteralLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID)); } } return super.getTargetEditPart(request); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java index 00a6bb13201..b49a8bc4eb8 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -32,7 +32,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPo import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -56,6 +55,7 @@ public class EnumerationEnumerationLiteralCompartmentEditPart extends ListCompar /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; } @@ -63,6 +63,7 @@ public class EnumerationEnumerationLiteralCompartmentEditPart extends ListCompar /** * @generated */ + @Override public String getCompartmentName() { return Messages.EnumerationEnumerationLiteralCompartmentEditPart_title; } @@ -70,6 +71,7 @@ public class EnumerationEnumerationLiteralCompartmentEditPart extends ListCompar /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -77,10 +79,9 @@ public class EnumerationEnumerationLiteralCompartmentEditPart extends ListCompar installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.EnumerationEnumerationLiteralCompartmentCanonicalEditPolicy()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.EnumerationEnumerationLiteralCompartmentCanonicalEditPolicy()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy()); } @@ -88,6 +89,7 @@ public class EnumerationEnumerationLiteralCompartmentEditPart extends ListCompar /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -97,6 +99,7 @@ public class EnumerationEnumerationLiteralCompartmentEditPart extends ListCompar /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -105,6 +108,7 @@ public class EnumerationEnumerationLiteralCompartmentEditPart extends ListCompar /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -126,12 +130,16 @@ public class EnumerationEnumerationLiteralCompartmentEditPart extends ListCompar int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java index 83f6e62ab11..de88bbf4791 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -32,7 +32,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPo import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -56,6 +55,7 @@ public class EnumerationEnumerationLiteralCompartmentEditPartCN extends ListComp /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; } @@ -63,6 +63,7 @@ public class EnumerationEnumerationLiteralCompartmentEditPartCN extends ListComp /** * @generated */ + @Override public String getCompartmentName() { return Messages.EnumerationEnumerationLiteralCompartmentEditPartCN_title; } @@ -70,6 +71,7 @@ public class EnumerationEnumerationLiteralCompartmentEditPartCN extends ListComp /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -77,10 +79,9 @@ public class EnumerationEnumerationLiteralCompartmentEditPartCN extends ListComp installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.EnumerationEnumerationLiteralCompartmentCanonicalEditPolicyCN()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.EnumerationEnumerationLiteralCompartmentCanonicalEditPolicyCN()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy()); } @@ -88,6 +89,7 @@ public class EnumerationEnumerationLiteralCompartmentEditPartCN extends ListComp /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -97,6 +99,7 @@ public class EnumerationEnumerationLiteralCompartmentEditPartCN extends ListComp /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -105,6 +108,7 @@ public class EnumerationEnumerationLiteralCompartmentEditPartCN extends ListComp /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -126,12 +130,16 @@ public class EnumerationEnumerationLiteralCompartmentEditPartCN extends ListComp int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationFloatingNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationFloatingNameEditPart.java index e7ee57fe64a..408d67e6a35 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationFloatingNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationFloatingNameEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -50,6 +50,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -60,11 +65,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -115,12 +115,14 @@ public class EnumerationFloatingNameEditPart extends FloatingLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -129,10 +131,7 @@ public class EnumerationFloatingNameEditPart extends FloatingLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationFloatingNameEditPart.VISUAL_ID), - new Point(0, 0)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationFloatingNameEditPart.VISUAL_ID), new Point(0, 0)); } /** @@ -145,6 +144,7 @@ public class EnumerationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); @@ -156,6 +156,7 @@ public class EnumerationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IBorderItemLocator getBorderItemLocator() { IFigure parentFigure = getFigure().getParent(); if (parentFigure != null && parentFigure.getLayoutManager() != null) { @@ -168,6 +169,7 @@ public class EnumerationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public void refreshBounds() { int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); @@ -242,6 +244,7 @@ public class EnumerationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -249,6 +252,7 @@ public class EnumerationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -281,7 +285,8 @@ public class EnumerationFloatingNameEditPart extends FloatingLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -293,6 +298,7 @@ public class EnumerationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -308,11 +314,13 @@ public class EnumerationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -326,6 +334,7 @@ public class EnumerationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -335,14 +344,12 @@ public class EnumerationFloatingNameEditPart extends FloatingLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), - EnumerationFloatingNameEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), EnumerationFloatingNameEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -360,6 +367,7 @@ public class EnumerationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -370,6 +378,7 @@ public class EnumerationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -377,6 +386,7 @@ public class EnumerationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Enumeration_Shape, getParserElement(), this, VISUAL_ID); @@ -439,6 +449,7 @@ public class EnumerationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -466,18 +477,13 @@ public class EnumerationFloatingNameEditPart extends FloatingLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -489,8 +495,7 @@ public class EnumerationFloatingNameEditPart extends FloatingLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -516,10 +521,9 @@ public class EnumerationFloatingNameEditPart extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -535,6 +539,7 @@ public class EnumerationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -576,7 +581,8 @@ public class EnumerationFloatingNameEditPart extends FloatingLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -593,7 +599,8 @@ public class EnumerationFloatingNameEditPart extends FloatingLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -602,11 +609,15 @@ public class EnumerationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -614,6 +625,7 @@ public class EnumerationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -621,6 +633,7 @@ public class EnumerationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -636,6 +649,7 @@ public class EnumerationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -649,6 +663,7 @@ public class EnumerationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -671,7 +686,7 @@ public class EnumerationFloatingNameEditPart extends FloatingLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -690,7 +705,7 @@ public class EnumerationFloatingNameEditPart extends FloatingLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -703,7 +718,7 @@ public class EnumerationFloatingNameEditPart extends FloatingLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -713,43 +728,42 @@ public class EnumerationFloatingNameEditPart extends FloatingLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -758,13 +772,11 @@ public class EnumerationFloatingNameEditPart extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -781,6 +793,7 @@ public class EnumerationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -790,10 +803,10 @@ public class EnumerationFloatingNameEditPart extends FloatingLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -816,6 +829,7 @@ public class EnumerationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationFloatingNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationFloatingNameEditPartCN.java index a9d8c98ca13..eb159b58931 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationFloatingNameEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationFloatingNameEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -50,6 +50,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -60,11 +65,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -115,12 +115,14 @@ public class EnumerationFloatingNameEditPartCN extends FloatingLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -129,10 +131,7 @@ public class EnumerationFloatingNameEditPartCN extends FloatingLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationFloatingNameEditPartCN.VISUAL_ID), - new Point(0, 0)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.EnumerationFloatingNameEditPartCN.VISUAL_ID), new Point(0, 0)); } /** @@ -145,6 +144,7 @@ public class EnumerationFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); @@ -156,6 +156,7 @@ public class EnumerationFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public IBorderItemLocator getBorderItemLocator() { IFigure parentFigure = getFigure().getParent(); if (parentFigure != null && parentFigure.getLayoutManager() != null) { @@ -168,6 +169,7 @@ public class EnumerationFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public void refreshBounds() { int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); @@ -242,6 +244,7 @@ public class EnumerationFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -249,6 +252,7 @@ public class EnumerationFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -281,7 +285,8 @@ public class EnumerationFloatingNameEditPartCN extends FloatingLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -293,6 +298,7 @@ public class EnumerationFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -308,11 +314,13 @@ public class EnumerationFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -326,6 +334,7 @@ public class EnumerationFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -335,16 +344,12 @@ public class EnumerationFloatingNameEditPartCN extends FloatingLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - EnumerationFloatingNameEditPartCN.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), EnumerationFloatingNameEditPartCN.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -362,6 +367,7 @@ public class EnumerationFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -372,6 +378,7 @@ public class EnumerationFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -379,6 +386,7 @@ public class EnumerationFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Enumeration_Shape_CN, getParserElement(), this, VISUAL_ID); @@ -441,6 +449,7 @@ public class EnumerationFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -468,18 +477,13 @@ public class EnumerationFloatingNameEditPartCN extends FloatingLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -491,8 +495,7 @@ public class EnumerationFloatingNameEditPartCN extends FloatingLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -518,10 +521,9 @@ public class EnumerationFloatingNameEditPartCN extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -537,6 +539,7 @@ public class EnumerationFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -578,7 +581,8 @@ public class EnumerationFloatingNameEditPartCN extends FloatingLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -595,7 +599,8 @@ public class EnumerationFloatingNameEditPartCN extends FloatingLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -604,11 +609,15 @@ public class EnumerationFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -616,6 +625,7 @@ public class EnumerationFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -623,6 +633,7 @@ public class EnumerationFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -638,6 +649,7 @@ public class EnumerationFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -651,6 +663,7 @@ public class EnumerationFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -673,7 +686,7 @@ public class EnumerationFloatingNameEditPartCN extends FloatingLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -692,7 +705,7 @@ public class EnumerationFloatingNameEditPartCN extends FloatingLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -705,7 +718,7 @@ public class EnumerationFloatingNameEditPartCN extends FloatingLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -715,43 +728,42 @@ public class EnumerationFloatingNameEditPartCN extends FloatingLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -760,13 +772,11 @@ public class EnumerationFloatingNameEditPartCN extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -783,6 +793,7 @@ public class EnumerationFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -792,10 +803,10 @@ public class EnumerationFloatingNameEditPartCN extends FloatingLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -818,6 +829,7 @@ public class EnumerationFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationLiteralEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationLiteralEditPart.java index e6183e1c64a..be5527d0d2e 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationLiteralEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationLiteralEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -54,6 +54,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -64,13 +70,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.LiteralEnumerationFigure; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeEnumerationLiteralDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy; @@ -82,7 +81,6 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereo import org.eclipse.papyrus.uml.diagram.common.editpolicies.EnumerationLiteralLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -127,12 +125,14 @@ public class EnumerationLiteralEditPart extends UMLCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -147,6 +147,7 @@ public class EnumerationLiteralEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -157,16 +158,15 @@ public class EnumerationLiteralEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy()); installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); - installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeEnumerationLiteralDisplayEditPolicy()); - installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, - new EnumerationLiteralLabelEditPolicy()); + installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeEnumerationLiteralDisplayEditPolicy()); + installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new EnumerationLiteralLabelEditPolicy()); } /** @@ -235,6 +235,7 @@ public class EnumerationLiteralEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -242,6 +243,7 @@ public class EnumerationLiteralEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -249,6 +251,7 @@ public class EnumerationLiteralEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -264,8 +267,7 @@ public class EnumerationLiteralEditPart extends UMLCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -275,7 +277,8 @@ public class EnumerationLiteralEditPart extends UMLCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -287,6 +290,7 @@ public class EnumerationLiteralEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -302,11 +306,13 @@ public class EnumerationLiteralEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -320,6 +326,7 @@ public class EnumerationLiteralEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -329,13 +336,12 @@ public class EnumerationLiteralEditPart extends UMLCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), EnumerationLiteralEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), EnumerationLiteralEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -353,6 +359,7 @@ public class EnumerationLiteralEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -363,6 +370,7 @@ public class EnumerationLiteralEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -370,10 +378,10 @@ public class EnumerationLiteralEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.EnumerationLiteral_LiteralLabel, getParserElement(), this, - VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.EnumerationLiteral_LiteralLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -433,6 +441,7 @@ public class EnumerationLiteralEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -460,18 +469,13 @@ public class EnumerationLiteralEditPart extends UMLCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -483,8 +487,7 @@ public class EnumerationLiteralEditPart extends UMLCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -510,10 +513,9 @@ public class EnumerationLiteralEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -529,6 +531,7 @@ public class EnumerationLiteralEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -570,7 +573,8 @@ public class EnumerationLiteralEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -587,7 +591,8 @@ public class EnumerationLiteralEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -596,11 +601,15 @@ public class EnumerationLiteralEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -608,6 +617,7 @@ public class EnumerationLiteralEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -615,6 +625,7 @@ public class EnumerationLiteralEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -630,6 +641,7 @@ public class EnumerationLiteralEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -643,6 +655,7 @@ public class EnumerationLiteralEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -665,7 +678,7 @@ public class EnumerationLiteralEditPart extends UMLCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -684,7 +697,7 @@ public class EnumerationLiteralEditPart extends UMLCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -697,7 +710,7 @@ public class EnumerationLiteralEditPart extends UMLCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -707,43 +720,42 @@ public class EnumerationLiteralEditPart extends UMLCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -752,13 +764,11 @@ public class EnumerationLiteralEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -775,6 +785,7 @@ public class EnumerationLiteralEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -783,6 +794,7 @@ public class EnumerationLiteralEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -791,6 +803,7 @@ public class EnumerationLiteralEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -800,10 +813,10 @@ public class EnumerationLiteralEditPart extends UMLCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -820,8 +833,7 @@ public class EnumerationLiteralEditPart extends UMLCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) { @@ -833,6 +845,7 @@ public class EnumerationLiteralEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationNameEditPart.java index 9e080b03e6e..1b4599d9907 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationNameEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,20 +64,12 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -115,12 +113,14 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -135,6 +135,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy()); @@ -208,6 +209,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -215,6 +217,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -222,6 +225,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -237,8 +241,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -248,7 +251,8 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -260,6 +264,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -275,11 +280,13 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -293,6 +300,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -302,13 +310,12 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), EnumerationNameEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), EnumerationNameEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -326,6 +333,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -336,6 +344,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -343,6 +352,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Enumeration_Shape, getParserElement(), this, VISUAL_ID); @@ -405,6 +415,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -432,18 +443,13 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -455,8 +461,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -482,10 +487,9 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -501,6 +505,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -542,7 +547,8 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -559,7 +565,8 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -568,11 +575,15 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -580,6 +591,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -587,6 +599,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -602,6 +615,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -615,6 +629,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -637,7 +652,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -656,7 +671,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -669,7 +684,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -679,43 +694,42 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -724,13 +738,11 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -747,6 +759,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -755,6 +768,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -763,6 +777,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); @@ -773,10 +788,10 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -793,8 +808,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } super.handleNotificationEvent(event); @@ -803,6 +817,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -816,6 +831,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void activate() { super.activate(); addOwnerElementListeners(); @@ -832,6 +848,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void deactivate() { removeOwnerElementListeners(); super.deactivate(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationNameEditPartCN.java index ba16a472333..e65e56016a4 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationNameEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationNameEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,20 +64,12 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -115,12 +113,14 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -135,6 +135,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy()); @@ -208,6 +209,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -215,6 +217,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -222,6 +225,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -237,8 +241,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -248,7 +251,8 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -260,6 +264,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -275,11 +280,13 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -293,6 +300,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -302,13 +310,12 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), EnumerationNameEditPartCN.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), EnumerationNameEditPartCN.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -326,6 +333,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -336,6 +344,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -343,6 +352,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Enumeration_Shape_CN, getParserElement(), this, VISUAL_ID); @@ -405,6 +415,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -432,18 +443,13 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -455,8 +461,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -482,10 +487,9 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -501,6 +505,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -542,7 +547,8 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -559,7 +565,8 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -568,11 +575,15 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -580,6 +591,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -587,6 +599,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -602,6 +615,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -615,6 +629,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -637,7 +652,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -656,7 +671,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -669,7 +684,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -679,43 +694,42 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -724,13 +738,11 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -747,6 +759,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -755,6 +768,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -763,6 +777,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); @@ -773,10 +788,10 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -793,8 +808,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } super.handleNotificationEvent(event); @@ -803,6 +817,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -816,6 +831,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void activate() { super.activate(); addOwnerElementListeners(); @@ -832,6 +848,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void deactivate() { removeOwnerElementListeners(); super.deactivate(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/GeneralizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/GeneralizationEditPart.java index 363d2755411..05e6dc08542 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/GeneralizationEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/GeneralizationEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -27,8 +27,8 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLink import org.eclipse.papyrus.uml.diagram.common.figure.edge.GeneralizationFigure; /** - * @generated - */ + * @generated + */ public class GeneralizationEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart { /** @@ -46,11 +46,11 @@ public class GeneralizationEditPart extends UMLConnectionNodeEditPart implements /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeLinkLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); } @@ -59,8 +59,8 @@ public class GeneralizationEditPart extends UMLConnectionNodeEditPart implements */ protected boolean addFixedChild(EditPart childEditPart) { if (childEditPart instanceof AppliedStereotyperGeneralizationEditPart) { - ((AppliedStereotyperGeneralizationEditPart) childEditPart) - .setLabel(getPrimaryShape().getAppliedStereotypeLabel()); + ((AppliedStereotyperGeneralizationEditPart) childEditPart).setLabel( + getPrimaryShape().getAppliedStereotypeLabel()); } return false; } @@ -68,6 +68,7 @@ public class GeneralizationEditPart extends UMLConnectionNodeEditPart implements /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -88,6 +89,7 @@ public class GeneralizationEditPart extends UMLConnectionNodeEditPart implements /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -97,12 +99,13 @@ public class GeneralizationEditPart extends UMLConnectionNodeEditPart implements /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected Connection createConnectionFigure() { return new GeneralizationFigure(); } @@ -110,6 +113,7 @@ public class GeneralizationEditPart extends UMLConnectionNodeEditPart implements /** * @generated */ + @Override public GeneralizationFigure getPrimaryShape() { return (GeneralizationFigure) getFigure(); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/GeneralizationSetEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/GeneralizationSetEditPart.java index 27929582995..34621e79a73 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/GeneralizationSetEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/GeneralizationSetEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -26,8 +26,8 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabe import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy; /** - * @generated - */ + * @generated + */ public class GeneralizationSetEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart { /** @@ -45,12 +45,12 @@ public class GeneralizationSetEditPart extends UMLConnectionNodeEditPart impleme /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); installEditPolicy("CustomDisplay", new GeneralizationSetLabelDisplayEditPolicy()); //$NON-NLS-1$ - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeLinkLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy()); } /** @@ -58,11 +58,12 @@ public class GeneralizationSetEditPart extends UMLConnectionNodeEditPart impleme */ protected boolean addFixedChild(EditPart childEditPart) { if (childEditPart instanceof ConstraintLabelEditPart) { - ((ConstraintLabelEditPart) childEditPart).setLabel(getPrimaryShape().getConstraintLabel()); + ((ConstraintLabelEditPart) childEditPart).setLabel( + getPrimaryShape().getConstraintLabel()); } if (childEditPart instanceof AppliedStereotypeGeneralizationSetLabelEditPart) { - ((AppliedStereotypeGeneralizationSetLabelEditPart) childEditPart) - .setLabel(getPrimaryShape().getAppliedStereotypeLabel()); + ((AppliedStereotypeGeneralizationSetLabelEditPart) childEditPart).setLabel( + getPrimaryShape().getAppliedStereotypeLabel()); } return false; } @@ -70,6 +71,7 @@ public class GeneralizationSetEditPart extends UMLConnectionNodeEditPart impleme /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -93,6 +95,7 @@ public class GeneralizationSetEditPart extends UMLConnectionNodeEditPart impleme /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -102,12 +105,13 @@ public class GeneralizationSetEditPart extends UMLConnectionNodeEditPart impleme /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected Connection createConnectionFigure() { return new GeneralizationSet(); } @@ -115,6 +119,7 @@ public class GeneralizationSetEditPart extends UMLConnectionNodeEditPart impleme /** * @generated */ + @Override public GeneralizationSet getPrimaryShape() { return (GeneralizationSet) getFigure(); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationFlowAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationFlowAppliedStereotypeEditPart.java index 80c3146e10b..f99cdf3bb14 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationFlowAppliedStereotypeEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationFlowAppliedStereotypeEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,13 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.NoSemanticParserEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,13 +65,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.NoSemanticParserEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -115,12 +115,14 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -129,9 +131,7 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowAppliedStereotypeEditPart.VISUAL_ID), - new Point(0, 15)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 15)); } /** @@ -156,6 +156,7 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override public int getKeyPoint() { return ConnectionLocator.MIDDLE; } @@ -226,6 +227,7 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -233,6 +235,7 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -240,6 +243,7 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -265,7 +269,8 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -277,6 +282,7 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -292,11 +298,13 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -310,6 +318,7 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -319,15 +328,12 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - InformationFlowAppliedStereotypeEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), InformationFlowAppliedStereotypeEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -345,6 +351,7 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -355,6 +362,7 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -362,6 +370,7 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.InformationFlow_Edge, getParserElement(), this, VISUAL_ID); @@ -424,6 +433,7 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -451,18 +461,13 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -474,8 +479,7 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -501,10 +505,9 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -520,6 +523,7 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -561,7 +565,8 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -578,7 +583,8 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -587,11 +593,15 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -599,6 +609,7 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -606,6 +617,7 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -621,6 +633,7 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -634,6 +647,7 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -656,7 +670,7 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -667,7 +681,7 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -680,7 +694,7 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -690,43 +704,42 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -735,13 +748,11 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -758,6 +769,7 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -767,10 +779,10 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -794,6 +806,7 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -802,6 +815,7 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override public String getLabelRole() { return "Stereotype";//$NON-NLS-1$ } @@ -809,6 +823,7 @@ public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPa /** * @generated */ + @Override public String getIconPathRole() { return "platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Stereotype.gif";//$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationFlowConveyedLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationFlowConveyedLabelEditPart.java index 1e68370f2bf..7b344856901 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationFlowConveyedLabelEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationFlowConveyedLabelEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,12 +64,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.InformationFlowCustomLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; @@ -114,12 +114,14 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -128,9 +130,7 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowConveyedLabelEditPart.VISUAL_ID), - new Point(0, 30)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowConveyedLabelEditPart.VISUAL_ID), new Point(0, 30)); } /** @@ -156,6 +156,7 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public int getKeyPoint() { return ConnectionLocator.MIDDLE; } @@ -226,6 +227,7 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -233,6 +235,7 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -240,6 +243,7 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -265,7 +269,8 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -277,6 +282,7 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -292,11 +298,13 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -310,6 +318,7 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -319,16 +328,12 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - InformationFlowConveyedLabelEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), InformationFlowConveyedLabelEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -346,6 +351,7 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -356,6 +362,7 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -363,6 +370,7 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.InformationFlow_Edge, getParserElement(), this, VISUAL_ID); @@ -425,6 +433,7 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -452,18 +461,13 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -475,8 +479,7 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -502,10 +505,9 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -521,6 +523,7 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -562,7 +565,8 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -579,7 +583,8 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -588,11 +593,15 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -600,6 +609,7 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -607,6 +617,7 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -622,6 +633,7 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -635,6 +647,7 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -657,7 +670,7 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -676,7 +689,7 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -689,7 +702,7 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -699,43 +712,42 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -744,13 +756,11 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -767,6 +777,7 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -776,10 +787,10 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -803,6 +814,7 @@ public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationFlowEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationFlowEditPart.java index eb9a171884a..29b1b108024 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationFlowEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationFlowEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -21,11 +21,12 @@ import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.InformationFlowFigure; import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart; +import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy; /** - * @generated - */ + * @generated + */ public class InformationFlowEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart { /** @@ -43,11 +44,11 @@ public class InformationFlowEditPart extends UMLConnectionNodeEditPart implement /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); - installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeLinkLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy()); } /** @@ -55,14 +56,16 @@ public class InformationFlowEditPart extends UMLConnectionNodeEditPart implement */ protected boolean addFixedChild(EditPart childEditPart) { if (childEditPart instanceof InformationFlowConveyedLabelEditPart) { - ((InformationFlowConveyedLabelEditPart) childEditPart).setLabel(getPrimaryShape().getConveyedLabel()); + ((InformationFlowConveyedLabelEditPart) childEditPart).setLabel( + getPrimaryShape().getConveyedLabel()); } if (childEditPart instanceof InformationFlowAppliedStereotypeEditPart) { - ((InformationFlowAppliedStereotypeEditPart) childEditPart) - .setLabel(getPrimaryShape().getAppliedStereotypeLabel()); + ((InformationFlowAppliedStereotypeEditPart) childEditPart).setLabel( + getPrimaryShape().getAppliedStereotypeLabel()); } if (childEditPart instanceof InformationFlowNameEditPart) { - ((InformationFlowNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel()); + ((InformationFlowNameEditPart) childEditPart).setLabel( + getPrimaryShape().getNameLabel()); } return false; } @@ -70,6 +73,7 @@ public class InformationFlowEditPart extends UMLConnectionNodeEditPart implement /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -96,6 +100,7 @@ public class InformationFlowEditPart extends UMLConnectionNodeEditPart implement /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -105,12 +110,13 @@ public class InformationFlowEditPart extends UMLConnectionNodeEditPart implement /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected Connection createConnectionFigure() { return new InformationFlowFigure(); } @@ -118,6 +124,7 @@ public class InformationFlowEditPart extends UMLConnectionNodeEditPart implement /** * @generated */ + @Override public InformationFlowFigure getPrimaryShape() { return (InformationFlowFigure) getFigure(); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationFlowNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationFlowNameEditPart.java index 4e1d9741c69..7fdb2d84d62 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationFlowNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationFlowNameEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,12 +64,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -114,12 +114,14 @@ public class InformationFlowNameEditPart extends PapyrusLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -128,10 +130,7 @@ public class InformationFlowNameEditPart extends PapyrusLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowNameEditPart.VISUAL_ID), - new Point(0, 40)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationFlowNameEditPart.VISUAL_ID), new Point(0, 40)); } /** @@ -155,6 +154,7 @@ public class InformationFlowNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public int getKeyPoint() { return ConnectionLocator.MIDDLE; } @@ -225,6 +225,7 @@ public class InformationFlowNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -232,6 +233,7 @@ public class InformationFlowNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -239,6 +241,7 @@ public class InformationFlowNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -264,7 +267,8 @@ public class InformationFlowNameEditPart extends PapyrusLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -276,6 +280,7 @@ public class InformationFlowNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -291,11 +296,13 @@ public class InformationFlowNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -309,6 +316,7 @@ public class InformationFlowNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -318,13 +326,12 @@ public class InformationFlowNameEditPart extends PapyrusLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), InformationFlowNameEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), InformationFlowNameEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -342,6 +349,7 @@ public class InformationFlowNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -352,6 +360,7 @@ public class InformationFlowNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -359,6 +368,7 @@ public class InformationFlowNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.InformationFlow_Edge, getParserElement(), this, VISUAL_ID); @@ -421,6 +431,7 @@ public class InformationFlowNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -448,18 +459,13 @@ public class InformationFlowNameEditPart extends PapyrusLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -471,8 +477,7 @@ public class InformationFlowNameEditPart extends PapyrusLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -498,10 +503,9 @@ public class InformationFlowNameEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -517,6 +521,7 @@ public class InformationFlowNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -558,7 +563,8 @@ public class InformationFlowNameEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -575,7 +581,8 @@ public class InformationFlowNameEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -584,11 +591,15 @@ public class InformationFlowNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -596,6 +607,7 @@ public class InformationFlowNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -603,6 +615,7 @@ public class InformationFlowNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -618,6 +631,7 @@ public class InformationFlowNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -631,6 +645,7 @@ public class InformationFlowNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -653,7 +668,7 @@ public class InformationFlowNameEditPart extends PapyrusLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -672,7 +687,7 @@ public class InformationFlowNameEditPart extends PapyrusLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -685,7 +700,7 @@ public class InformationFlowNameEditPart extends PapyrusLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -695,43 +710,42 @@ public class InformationFlowNameEditPart extends PapyrusLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -740,13 +754,11 @@ public class InformationFlowNameEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -763,6 +775,7 @@ public class InformationFlowNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -772,10 +785,10 @@ public class InformationFlowNameEditPart extends PapyrusLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -799,6 +812,7 @@ public class InformationFlowNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -807,6 +821,7 @@ public class InformationFlowNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getLabelRole() { return "Name";//$NON-NLS-1$ } @@ -814,6 +829,7 @@ public class InformationFlowNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getIconPathRole() { return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png";//$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemEditPart.java index dfa98813d37..d413d59dc84 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -84,6 +84,7 @@ public class InformationItemEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); @@ -92,8 +93,7 @@ public class InformationItemEditPart extends ClassifierEditPart { installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies @@ -145,9 +145,11 @@ public class InformationItemEditPart extends ClassifierEditPart { } /** - *Papyrus codeGen - *@generated - **/ + * Papyrus codeGen + * + * @generated + **/ + @Override protected void handleNotificationEvent(Notification event) { /* * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart @@ -156,7 +158,8 @@ public class InformationItemEditPart extends ClassifierEditPart { if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) { Object notifier = event.getNotifier(); List<?> modelChildren = ((View) getModel()).getChildren(); - if (false == notifier instanceof Edge && false == notifier instanceof BasicCompartment) { + if (false == notifier instanceof Edge + && false == notifier instanceof BasicCompartment) { if (modelChildren.contains(event.getNotifier())) { return; } @@ -169,14 +172,17 @@ public class InformationItemEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected IFigure createNodeShape() { return primaryShape = new InformationItemFigure(); } /** * org.eclipse.papyrus.uml.diagram.clazz.custom.figure.nodes.InformationItemFigure + * * @generated */ + @Override public InformationItemFigure getPrimaryShape() { return (InformationItemFigure) primaryShape; } @@ -190,6 +196,7 @@ public class InformationItemEditPart extends ClassifierEditPart { return true; } + return false; } @@ -206,6 +213,7 @@ public class InformationItemEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -216,6 +224,7 @@ public class InformationItemEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -226,6 +235,7 @@ public class InformationItemEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { if (editPart instanceof IBorderItemEditPart) { return getBorderedFigure().getBorderItemContainer(); @@ -236,6 +246,7 @@ public class InformationItemEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) { if (borderItemEditPart instanceof InformationItemFloatingNameEditPart) { IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure()); @@ -248,6 +259,7 @@ public class InformationItemEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected NodeFigure createNodePlate() { RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40); return result; @@ -255,12 +267,13 @@ public class InformationItemEditPart extends ClassifierEditPart { /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected NodeFigure createMainFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); @@ -269,9 +282,12 @@ public class InformationItemEditPart extends ClassifierEditPart { /** * Default implementation treats passed figure as content pane. * Respects layout one may have set for generated figure. - * @param nodeShape instance of generated figure class + * + * @param nodeShape + * instance of generated figure class * @generated */ + @Override protected IFigure setupContentPane(IFigure nodeShape) { if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); @@ -284,6 +300,7 @@ public class InformationItemEditPart extends ClassifierEditPart { /** * @generated */ + @Override public IFigure getContentPane() { if (contentPane != null) { return contentPane; @@ -294,6 +311,7 @@ public class InformationItemEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void setForegroundColor(Color color) { if (primaryShape != null) { primaryShape.setForegroundColor(color); @@ -303,6 +321,7 @@ public class InformationItemEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void setLineWidth(int width) { super.setLineWidth(width); } @@ -310,6 +329,7 @@ public class InformationItemEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void setLineType(int style) { if (primaryShape instanceof IPapyrusNodeFigure) { ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); @@ -319,6 +339,7 @@ public class InformationItemEditPart extends ClassifierEditPart { /** * @generated */ + @Override public EditPart getPrimaryChildEditPart() { return getChildBySemanticHint(UMLVisualIDRegistry.getType(InformationItemNameEditPart.VISUAL_ID)); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemEditPartCN.java index 7b184f1c320..8288d4c2022 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -84,6 +84,7 @@ public class InformationItemEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); @@ -92,8 +93,7 @@ public class InformationItemEditPartCN extends ClassifierEditPart { installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies @@ -145,9 +145,11 @@ public class InformationItemEditPartCN extends ClassifierEditPart { } /** - *Papyrus codeGen - *@generated - **/ + * Papyrus codeGen + * + * @generated + **/ + @Override protected void handleNotificationEvent(Notification event) { /* * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart @@ -156,7 +158,8 @@ public class InformationItemEditPartCN extends ClassifierEditPart { if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) { Object notifier = event.getNotifier(); List<?> modelChildren = ((View) getModel()).getChildren(); - if (false == notifier instanceof Edge && false == notifier instanceof BasicCompartment) { + if (false == notifier instanceof Edge + && false == notifier instanceof BasicCompartment) { if (modelChildren.contains(event.getNotifier())) { return; } @@ -169,14 +172,17 @@ public class InformationItemEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected IFigure createNodeShape() { return primaryShape = new InformationItemFigure(); } /** * org.eclipse.papyrus.uml.diagram.clazz.custom.figure.nodes.InformationItemFigure + * * @generated */ + @Override public InformationItemFigure getPrimaryShape() { return (InformationItemFigure) primaryShape; } @@ -190,6 +196,7 @@ public class InformationItemEditPartCN extends ClassifierEditPart { return true; } + return false; } @@ -206,6 +213,7 @@ public class InformationItemEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -216,6 +224,7 @@ public class InformationItemEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -226,6 +235,7 @@ public class InformationItemEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { if (editPart instanceof IBorderItemEditPart) { return getBorderedFigure().getBorderItemContainer(); @@ -236,6 +246,7 @@ public class InformationItemEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) { if (borderItemEditPart instanceof InformationItemFloatingNameEditPartCN) { IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure()); @@ -248,6 +259,7 @@ public class InformationItemEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected NodeFigure createNodePlate() { RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40); return result; @@ -255,12 +267,13 @@ public class InformationItemEditPartCN extends ClassifierEditPart { /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected NodeFigure createMainFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); @@ -269,9 +282,12 @@ public class InformationItemEditPartCN extends ClassifierEditPart { /** * Default implementation treats passed figure as content pane. * Respects layout one may have set for generated figure. - * @param nodeShape instance of generated figure class + * + * @param nodeShape + * instance of generated figure class * @generated */ + @Override protected IFigure setupContentPane(IFigure nodeShape) { if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); @@ -284,6 +300,7 @@ public class InformationItemEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override public IFigure getContentPane() { if (contentPane != null) { return contentPane; @@ -294,6 +311,7 @@ public class InformationItemEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void setForegroundColor(Color color) { if (primaryShape != null) { primaryShape.setForegroundColor(color); @@ -303,6 +321,7 @@ public class InformationItemEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void setLineWidth(int width) { super.setLineWidth(width); } @@ -310,6 +329,7 @@ public class InformationItemEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void setLineType(int style) { if (primaryShape instanceof IPapyrusNodeFigure) { ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); @@ -319,6 +339,7 @@ public class InformationItemEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override public EditPart getPrimaryChildEditPart() { return getChildBySemanticHint(UMLVisualIDRegistry.getType(InformationItemNameEditPartCN.VISUAL_ID)); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemFloatingNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemFloatingNameEditPart.java index bc18f120400..b9944f2173b 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemFloatingNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemFloatingNameEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -50,6 +50,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -60,11 +65,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -115,12 +115,14 @@ public class InformationItemFloatingNameEditPart extends FloatingLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -129,10 +131,7 @@ public class InformationItemFloatingNameEditPart extends FloatingLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationItemFloatingNameEditPart.VISUAL_ID), - new Point(0, 0)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationItemFloatingNameEditPart.VISUAL_ID), new Point(0, 0)); } /** @@ -145,6 +144,7 @@ public class InformationItemFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); @@ -156,6 +156,7 @@ public class InformationItemFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IBorderItemLocator getBorderItemLocator() { IFigure parentFigure = getFigure().getParent(); if (parentFigure != null && parentFigure.getLayoutManager() != null) { @@ -168,6 +169,7 @@ public class InformationItemFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public void refreshBounds() { int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); @@ -242,6 +244,7 @@ public class InformationItemFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -249,6 +252,7 @@ public class InformationItemFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -281,7 +285,8 @@ public class InformationItemFloatingNameEditPart extends FloatingLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -293,6 +298,7 @@ public class InformationItemFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -308,11 +314,13 @@ public class InformationItemFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -326,6 +334,7 @@ public class InformationItemFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -335,16 +344,12 @@ public class InformationItemFloatingNameEditPart extends FloatingLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - InformationItemFloatingNameEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), InformationItemFloatingNameEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -362,6 +367,7 @@ public class InformationItemFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -372,6 +378,7 @@ public class InformationItemFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -379,6 +386,7 @@ public class InformationItemFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.InformationItem_Shape, getParserElement(), this, VISUAL_ID); @@ -441,6 +449,7 @@ public class InformationItemFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -468,18 +477,13 @@ public class InformationItemFloatingNameEditPart extends FloatingLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -491,8 +495,7 @@ public class InformationItemFloatingNameEditPart extends FloatingLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -518,10 +521,9 @@ public class InformationItemFloatingNameEditPart extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -537,6 +539,7 @@ public class InformationItemFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -578,7 +581,8 @@ public class InformationItemFloatingNameEditPart extends FloatingLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -595,7 +599,8 @@ public class InformationItemFloatingNameEditPart extends FloatingLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -604,11 +609,15 @@ public class InformationItemFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -616,6 +625,7 @@ public class InformationItemFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -623,6 +633,7 @@ public class InformationItemFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -638,6 +649,7 @@ public class InformationItemFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -651,6 +663,7 @@ public class InformationItemFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -673,7 +686,7 @@ public class InformationItemFloatingNameEditPart extends FloatingLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -692,7 +705,7 @@ public class InformationItemFloatingNameEditPart extends FloatingLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -705,7 +718,7 @@ public class InformationItemFloatingNameEditPart extends FloatingLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -715,43 +728,42 @@ public class InformationItemFloatingNameEditPart extends FloatingLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -760,13 +772,11 @@ public class InformationItemFloatingNameEditPart extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -783,6 +793,7 @@ public class InformationItemFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -792,10 +803,10 @@ public class InformationItemFloatingNameEditPart extends FloatingLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -818,6 +829,7 @@ public class InformationItemFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemFloatingNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemFloatingNameEditPartCN.java index facd9367219..28b87ff320d 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemFloatingNameEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemFloatingNameEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -50,6 +50,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -60,11 +65,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -115,12 +115,14 @@ public class InformationItemFloatingNameEditPartCN extends FloatingLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -129,9 +131,7 @@ public class InformationItemFloatingNameEditPartCN extends FloatingLabelEditPart * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationItemFloatingNameEditPartCN.VISUAL_ID), - new Point(0, 0)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InformationItemFloatingNameEditPartCN.VISUAL_ID), new Point(0, 0)); } /** @@ -144,6 +144,7 @@ public class InformationItemFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); @@ -155,6 +156,7 @@ public class InformationItemFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public IBorderItemLocator getBorderItemLocator() { IFigure parentFigure = getFigure().getParent(); if (parentFigure != null && parentFigure.getLayoutManager() != null) { @@ -167,6 +169,7 @@ public class InformationItemFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public void refreshBounds() { int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); @@ -241,6 +244,7 @@ public class InformationItemFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -248,6 +252,7 @@ public class InformationItemFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -280,7 +285,8 @@ public class InformationItemFloatingNameEditPartCN extends FloatingLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -292,6 +298,7 @@ public class InformationItemFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -307,11 +314,13 @@ public class InformationItemFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -325,6 +334,7 @@ public class InformationItemFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -334,16 +344,12 @@ public class InformationItemFloatingNameEditPartCN extends FloatingLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - InformationItemFloatingNameEditPartCN.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), InformationItemFloatingNameEditPartCN.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -361,6 +367,7 @@ public class InformationItemFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -371,6 +378,7 @@ public class InformationItemFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -378,10 +386,10 @@ public class InformationItemFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.InformationItem_Shape_CN, getParserElement(), this, - VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.InformationItem_Shape_CN, getParserElement(), this, VISUAL_ID); } return parser; } @@ -441,6 +449,7 @@ public class InformationItemFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -468,18 +477,13 @@ public class InformationItemFloatingNameEditPartCN extends FloatingLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -491,8 +495,7 @@ public class InformationItemFloatingNameEditPartCN extends FloatingLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -518,10 +521,9 @@ public class InformationItemFloatingNameEditPartCN extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -537,6 +539,7 @@ public class InformationItemFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -578,7 +581,8 @@ public class InformationItemFloatingNameEditPartCN extends FloatingLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -595,7 +599,8 @@ public class InformationItemFloatingNameEditPartCN extends FloatingLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -604,11 +609,15 @@ public class InformationItemFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -616,6 +625,7 @@ public class InformationItemFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -623,6 +633,7 @@ public class InformationItemFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -638,6 +649,7 @@ public class InformationItemFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -651,6 +663,7 @@ public class InformationItemFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -673,7 +686,7 @@ public class InformationItemFloatingNameEditPartCN extends FloatingLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -692,7 +705,7 @@ public class InformationItemFloatingNameEditPartCN extends FloatingLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -705,7 +718,7 @@ public class InformationItemFloatingNameEditPartCN extends FloatingLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -715,43 +728,42 @@ public class InformationItemFloatingNameEditPartCN extends FloatingLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -760,13 +772,11 @@ public class InformationItemFloatingNameEditPartCN extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -783,6 +793,7 @@ public class InformationItemFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -792,10 +803,10 @@ public class InformationItemFloatingNameEditPartCN extends FloatingLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -818,6 +829,7 @@ public class InformationItemFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemNameEditPart.java index 53ac37e2130..1d75f3bbcdb 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemNameEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,20 +64,12 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -115,12 +113,14 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -135,6 +135,7 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy()); @@ -208,6 +209,7 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -215,6 +217,7 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -222,6 +225,7 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -237,8 +241,7 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -248,7 +251,8 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -260,6 +264,7 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -275,11 +280,13 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -293,6 +300,7 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -302,13 +310,12 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), InformationItemNameEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), InformationItemNameEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -326,6 +333,7 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -336,6 +344,7 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -343,6 +352,7 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.InformationItem_Shape, getParserElement(), this, VISUAL_ID); @@ -405,6 +415,7 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -432,18 +443,13 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -455,8 +461,7 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -482,10 +487,9 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -501,6 +505,7 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -542,7 +547,8 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -559,7 +565,8 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -568,11 +575,15 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -580,6 +591,7 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -587,6 +599,7 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -602,6 +615,7 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -615,6 +629,7 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -637,7 +652,7 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -656,7 +671,7 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -669,7 +684,7 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -679,43 +694,42 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -724,13 +738,11 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -747,6 +759,7 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -755,6 +768,7 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -763,6 +777,7 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); @@ -773,10 +788,10 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -793,8 +808,7 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } super.handleNotificationEvent(event); @@ -803,6 +817,7 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -816,6 +831,7 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void activate() { super.activate(); addOwnerElementListeners(); @@ -832,6 +848,7 @@ public class InformationItemNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void deactivate() { removeOwnerElementListeners(); super.deactivate(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemNameEditPartCN.java index e70f170dc46..12c81401ba9 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemNameEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemNameEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,20 +64,12 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -115,12 +113,14 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -135,6 +135,7 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy()); @@ -208,6 +209,7 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -215,6 +217,7 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -222,6 +225,7 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -237,8 +241,7 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -248,7 +251,8 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -260,6 +264,7 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -275,11 +280,13 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -293,6 +300,7 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -302,14 +310,12 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), - InformationItemNameEditPartCN.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), InformationItemNameEditPartCN.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -327,6 +333,7 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -337,6 +344,7 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -344,10 +352,10 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.InformationItem_Shape_CN, getParserElement(), this, - VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.InformationItem_Shape_CN, getParserElement(), this, VISUAL_ID); } return parser; } @@ -407,6 +415,7 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -434,18 +443,13 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -457,8 +461,7 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -484,10 +487,9 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -503,6 +505,7 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -544,7 +547,8 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -561,7 +565,8 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -570,11 +575,15 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -582,6 +591,7 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -589,6 +599,7 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -604,6 +615,7 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -617,6 +629,7 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -639,7 +652,7 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -658,7 +671,7 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -671,7 +684,7 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -681,43 +694,42 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -726,13 +738,11 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -749,6 +759,7 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -757,6 +768,7 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -765,6 +777,7 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); @@ -775,10 +788,10 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -795,8 +808,7 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } super.handleNotificationEvent(event); @@ -805,6 +817,7 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -818,6 +831,7 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void activate() { super.activate(); addOwnerElementListeners(); @@ -834,6 +848,7 @@ public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void deactivate() { removeOwnerElementListeners(); super.deactivate(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationEditPart.java index 846b380d022..7ecb00cc984 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -90,6 +90,7 @@ public class InstanceSpecificationEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected void createDefaultEditPolicies() { installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); super.createDefaultEditPolicies(); @@ -98,13 +99,10 @@ public class InstanceSpecificationEditPart extends RoundedCompartmentEditPart { installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); - installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, - new ShowHideCompartmentEditPolicy()); - installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, - new ShowHideClassifierContentsEditPolicy()); + installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy()); + installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy()); installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE); @@ -155,9 +153,11 @@ public class InstanceSpecificationEditPart extends RoundedCompartmentEditPart { } /** - *Papyrus codeGen - *@generated - **/ + * Papyrus codeGen + * + * @generated + **/ + @Override protected void handleNotificationEvent(Notification event) { /* * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart @@ -166,7 +166,8 @@ public class InstanceSpecificationEditPart extends RoundedCompartmentEditPart { if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) { Object notifier = event.getNotifier(); List<?> modelChildren = ((View) getModel()).getChildren(); - if (false == notifier instanceof Edge && false == notifier instanceof BasicCompartment) { + if (false == notifier instanceof Edge + && false == notifier instanceof BasicCompartment) { if (modelChildren.contains(event.getNotifier())) { return; } @@ -179,14 +180,17 @@ public class InstanceSpecificationEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected IFigure createNodeShape() { return primaryShape = new InstanceSpecificationFigure(); } /** * org.eclipse.papyrus.uml.diagram.common.figure.node.InstanceSpecificationFigure + * * @generated */ + @Override public InstanceSpecificationFigure getPrimaryShape() { return (InstanceSpecificationFigure) primaryShape; } @@ -200,9 +204,10 @@ public class InstanceSpecificationEditPart extends RoundedCompartmentEditPart { return true; } + if (childEditPart instanceof InstanceSpecificationSlotCompartmentEditPart) { IFigure pane = getPrimaryShape().getSlotCompartmentFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((InstanceSpecificationSlotCompartmentEditPart) childEditPart).getFigure()); return true; } @@ -228,6 +233,7 @@ public class InstanceSpecificationEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -238,6 +244,7 @@ public class InstanceSpecificationEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -248,6 +255,7 @@ public class InstanceSpecificationEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { if (editPart instanceof InstanceSpecificationSlotCompartmentEditPart) { return getPrimaryShape().getSlotCompartmentFigure(); @@ -261,6 +269,7 @@ public class InstanceSpecificationEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) { if (borderItemEditPart instanceof InstanceSpecificationFloatingNameEditPart) { IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure()); @@ -273,6 +282,7 @@ public class InstanceSpecificationEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected NodeFigure createNodePlate() { RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(100, 100); return result; @@ -280,12 +290,13 @@ public class InstanceSpecificationEditPart extends RoundedCompartmentEditPart { /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected NodeFigure createMainFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); @@ -294,9 +305,12 @@ public class InstanceSpecificationEditPart extends RoundedCompartmentEditPart { /** * Default implementation treats passed figure as content pane. * Respects layout one may have set for generated figure. - * @param nodeShape instance of generated figure class + * + * @param nodeShape + * instance of generated figure class * @generated */ + @Override protected IFigure setupContentPane(IFigure nodeShape) { if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); @@ -309,6 +323,7 @@ public class InstanceSpecificationEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override public IFigure getContentPane() { if (contentPane != null) { return contentPane; @@ -319,6 +334,7 @@ public class InstanceSpecificationEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected void setForegroundColor(Color color) { if (primaryShape != null) { primaryShape.setForegroundColor(color); @@ -328,6 +344,7 @@ public class InstanceSpecificationEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected void setLineWidth(int width) { super.setLineWidth(width); } @@ -335,6 +352,7 @@ public class InstanceSpecificationEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected void setLineType(int style) { if (primaryShape instanceof IPapyrusNodeFigure) { ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); @@ -344,6 +362,7 @@ public class InstanceSpecificationEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override public EditPart getPrimaryChildEditPart() { return getChildBySemanticHint(UMLVisualIDRegistry.getType(InstanceSpecificationNameEditPart.VISUAL_ID)); } @@ -351,14 +370,13 @@ public class InstanceSpecificationEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { if (request instanceof CreateViewAndElementRequest) { - CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor() - .getCreateElementRequestAdapter(); + CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter(); IElementType type = (IElementType) adapter.getAdapter(IElementType.class); if (UMLElementTypes.isKindOf(type, UMLElementTypes.Slot_SlotLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(InstanceSpecificationSlotCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(InstanceSpecificationSlotCompartmentEditPart.VISUAL_ID)); } } return super.getTargetEditPart(request); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationEditPartCN.java index 16845c29e31..dfa32482991 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -90,6 +90,7 @@ public class InstanceSpecificationEditPartCN extends RoundedCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); super.createDefaultEditPolicies(); @@ -98,13 +99,10 @@ public class InstanceSpecificationEditPartCN extends RoundedCompartmentEditPart installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); - installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, - new ShowHideCompartmentEditPolicy()); - installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, - new ShowHideClassifierContentsEditPolicy()); + installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy()); + installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy()); installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE); @@ -155,9 +153,11 @@ public class InstanceSpecificationEditPartCN extends RoundedCompartmentEditPart } /** - *Papyrus codeGen - *@generated - **/ + * Papyrus codeGen + * + * @generated + **/ + @Override protected void handleNotificationEvent(Notification event) { /* * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart @@ -166,7 +166,8 @@ public class InstanceSpecificationEditPartCN extends RoundedCompartmentEditPart if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) { Object notifier = event.getNotifier(); List<?> modelChildren = ((View) getModel()).getChildren(); - if (false == notifier instanceof Edge && false == notifier instanceof BasicCompartment) { + if (false == notifier instanceof Edge + && false == notifier instanceof BasicCompartment) { if (modelChildren.contains(event.getNotifier())) { return; } @@ -179,14 +180,17 @@ public class InstanceSpecificationEditPartCN extends RoundedCompartmentEditPart /** * @generated */ + @Override protected IFigure createNodeShape() { return primaryShape = new InstanceSpecificationFigure(); } /** * org.eclipse.papyrus.uml.diagram.common.figure.node.InstanceSpecificationFigure + * * @generated */ + @Override public InstanceSpecificationFigure getPrimaryShape() { return (InstanceSpecificationFigure) primaryShape; } @@ -200,9 +204,10 @@ public class InstanceSpecificationEditPartCN extends RoundedCompartmentEditPart return true; } + if (childEditPart instanceof InstanceSpecificationSlotCompartmentEditPartCN) { IFigure pane = getPrimaryShape().getSlotCompartmentFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((InstanceSpecificationSlotCompartmentEditPartCN) childEditPart).getFigure()); return true; } @@ -228,6 +233,7 @@ public class InstanceSpecificationEditPartCN extends RoundedCompartmentEditPart /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -238,6 +244,7 @@ public class InstanceSpecificationEditPartCN extends RoundedCompartmentEditPart /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -248,6 +255,7 @@ public class InstanceSpecificationEditPartCN extends RoundedCompartmentEditPart /** * @generated */ + @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { if (editPart instanceof InstanceSpecificationSlotCompartmentEditPartCN) { return getPrimaryShape().getSlotCompartmentFigure(); @@ -261,6 +269,7 @@ public class InstanceSpecificationEditPartCN extends RoundedCompartmentEditPart /** * @generated */ + @Override protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) { if (borderItemEditPart instanceof InstanceSpecificationFloatingNameEditPartCN) { IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure()); @@ -273,6 +282,7 @@ public class InstanceSpecificationEditPartCN extends RoundedCompartmentEditPart /** * @generated */ + @Override protected NodeFigure createNodePlate() { RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(100, 100); return result; @@ -280,12 +290,13 @@ public class InstanceSpecificationEditPartCN extends RoundedCompartmentEditPart /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected NodeFigure createMainFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); @@ -294,9 +305,12 @@ public class InstanceSpecificationEditPartCN extends RoundedCompartmentEditPart /** * Default implementation treats passed figure as content pane. * Respects layout one may have set for generated figure. - * @param nodeShape instance of generated figure class + * + * @param nodeShape + * instance of generated figure class * @generated */ + @Override protected IFigure setupContentPane(IFigure nodeShape) { if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); @@ -309,6 +323,7 @@ public class InstanceSpecificationEditPartCN extends RoundedCompartmentEditPart /** * @generated */ + @Override public IFigure getContentPane() { if (contentPane != null) { return contentPane; @@ -319,6 +334,7 @@ public class InstanceSpecificationEditPartCN extends RoundedCompartmentEditPart /** * @generated */ + @Override protected void setForegroundColor(Color color) { if (primaryShape != null) { primaryShape.setForegroundColor(color); @@ -328,6 +344,7 @@ public class InstanceSpecificationEditPartCN extends RoundedCompartmentEditPart /** * @generated */ + @Override protected void setLineWidth(int width) { super.setLineWidth(width); } @@ -335,6 +352,7 @@ public class InstanceSpecificationEditPartCN extends RoundedCompartmentEditPart /** * @generated */ + @Override protected void setLineType(int style) { if (primaryShape instanceof IPapyrusNodeFigure) { ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); @@ -344,6 +362,7 @@ public class InstanceSpecificationEditPartCN extends RoundedCompartmentEditPart /** * @generated */ + @Override public EditPart getPrimaryChildEditPart() { return getChildBySemanticHint(UMLVisualIDRegistry.getType(InstanceSpecificationNameEditPartCN.VISUAL_ID)); } @@ -351,14 +370,13 @@ public class InstanceSpecificationEditPartCN extends RoundedCompartmentEditPart /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { if (request instanceof CreateViewAndElementRequest) { - CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor() - .getCreateElementRequestAdapter(); + CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter(); IElementType type = (IElementType) adapter.getAdapter(IElementType.class); if (UMLElementTypes.isKindOf(type, UMLElementTypes.Slot_SlotLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(InstanceSpecificationSlotCompartmentEditPartCN.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(InstanceSpecificationSlotCompartmentEditPartCN.VISUAL_ID)); } } return super.getTargetEditPart(request); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationFloatingNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationFloatingNameEditPart.java index 3f2ef416a02..288116ab9ce 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationFloatingNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationFloatingNameEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -50,6 +50,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -60,11 +65,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -115,12 +115,14 @@ public class InstanceSpecificationFloatingNameEditPart extends FloatingLabelEdit /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -129,9 +131,7 @@ public class InstanceSpecificationFloatingNameEditPart extends FloatingLabelEdit * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationFloatingNameEditPart.VISUAL_ID), - new Point(0, 0)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationFloatingNameEditPart.VISUAL_ID), new Point(0, 0)); } /** @@ -144,6 +144,7 @@ public class InstanceSpecificationFloatingNameEditPart extends FloatingLabelEdit /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); @@ -155,6 +156,7 @@ public class InstanceSpecificationFloatingNameEditPart extends FloatingLabelEdit /** * @generated */ + @Override public IBorderItemLocator getBorderItemLocator() { IFigure parentFigure = getFigure().getParent(); if (parentFigure != null && parentFigure.getLayoutManager() != null) { @@ -167,6 +169,7 @@ public class InstanceSpecificationFloatingNameEditPart extends FloatingLabelEdit /** * @generated */ + @Override public void refreshBounds() { int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); @@ -241,6 +244,7 @@ public class InstanceSpecificationFloatingNameEditPart extends FloatingLabelEdit /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -248,6 +252,7 @@ public class InstanceSpecificationFloatingNameEditPart extends FloatingLabelEdit /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -280,7 +285,8 @@ public class InstanceSpecificationFloatingNameEditPart extends FloatingLabelEdit String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -292,6 +298,7 @@ public class InstanceSpecificationFloatingNameEditPart extends FloatingLabelEdit /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -307,11 +314,13 @@ public class InstanceSpecificationFloatingNameEditPart extends FloatingLabelEdit /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -325,6 +334,7 @@ public class InstanceSpecificationFloatingNameEditPart extends FloatingLabelEdit /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -334,15 +344,12 @@ public class InstanceSpecificationFloatingNameEditPart extends FloatingLabelEdit final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - InstanceSpecificationFloatingNameEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), InstanceSpecificationFloatingNameEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -360,6 +367,7 @@ public class InstanceSpecificationFloatingNameEditPart extends FloatingLabelEdit /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -370,6 +378,7 @@ public class InstanceSpecificationFloatingNameEditPart extends FloatingLabelEdit /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -377,10 +386,10 @@ public class InstanceSpecificationFloatingNameEditPart extends FloatingLabelEdit /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.InstanceSpecification_Shape, getParserElement(), this, - VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.InstanceSpecification_Shape, getParserElement(), this, VISUAL_ID); } return parser; } @@ -440,6 +449,7 @@ public class InstanceSpecificationFloatingNameEditPart extends FloatingLabelEdit /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -467,18 +477,13 @@ public class InstanceSpecificationFloatingNameEditPart extends FloatingLabelEdit initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -490,8 +495,7 @@ public class InstanceSpecificationFloatingNameEditPart extends FloatingLabelEdit @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -517,10 +521,9 @@ public class InstanceSpecificationFloatingNameEditPart extends FloatingLabelEdit @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -536,6 +539,7 @@ public class InstanceSpecificationFloatingNameEditPart extends FloatingLabelEdit /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -577,7 +581,8 @@ public class InstanceSpecificationFloatingNameEditPart extends FloatingLabelEdit * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -594,7 +599,8 @@ public class InstanceSpecificationFloatingNameEditPart extends FloatingLabelEdit * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -603,11 +609,15 @@ public class InstanceSpecificationFloatingNameEditPart extends FloatingLabelEdit /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -615,6 +625,7 @@ public class InstanceSpecificationFloatingNameEditPart extends FloatingLabelEdit /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -622,6 +633,7 @@ public class InstanceSpecificationFloatingNameEditPart extends FloatingLabelEdit /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -637,6 +649,7 @@ public class InstanceSpecificationFloatingNameEditPart extends FloatingLabelEdit /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -650,6 +663,7 @@ public class InstanceSpecificationFloatingNameEditPart extends FloatingLabelEdit /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -672,7 +686,7 @@ public class InstanceSpecificationFloatingNameEditPart extends FloatingLabelEdit /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -691,7 +705,7 @@ public class InstanceSpecificationFloatingNameEditPart extends FloatingLabelEdit /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -704,7 +718,7 @@ public class InstanceSpecificationFloatingNameEditPart extends FloatingLabelEdit /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -714,43 +728,42 @@ public class InstanceSpecificationFloatingNameEditPart extends FloatingLabelEdit /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -759,13 +772,11 @@ public class InstanceSpecificationFloatingNameEditPart extends FloatingLabelEdit @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -782,6 +793,7 @@ public class InstanceSpecificationFloatingNameEditPart extends FloatingLabelEdit /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -791,10 +803,10 @@ public class InstanceSpecificationFloatingNameEditPart extends FloatingLabelEdit refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -817,6 +829,7 @@ public class InstanceSpecificationFloatingNameEditPart extends FloatingLabelEdit /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationFloatingNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationFloatingNameEditPartCN.java index 23e30c21442..9368f928827 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationFloatingNameEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationFloatingNameEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -50,6 +50,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -60,11 +65,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -115,12 +115,14 @@ public class InstanceSpecificationFloatingNameEditPartCN extends FloatingLabelEd /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -129,9 +131,7 @@ public class InstanceSpecificationFloatingNameEditPartCN extends FloatingLabelEd * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationFloatingNameEditPartCN.VISUAL_ID), - new Point(0, 0)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationFloatingNameEditPartCN.VISUAL_ID), new Point(0, 0)); } /** @@ -144,6 +144,7 @@ public class InstanceSpecificationFloatingNameEditPartCN extends FloatingLabelEd /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); @@ -155,6 +156,7 @@ public class InstanceSpecificationFloatingNameEditPartCN extends FloatingLabelEd /** * @generated */ + @Override public IBorderItemLocator getBorderItemLocator() { IFigure parentFigure = getFigure().getParent(); if (parentFigure != null && parentFigure.getLayoutManager() != null) { @@ -167,6 +169,7 @@ public class InstanceSpecificationFloatingNameEditPartCN extends FloatingLabelEd /** * @generated */ + @Override public void refreshBounds() { int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); @@ -241,6 +244,7 @@ public class InstanceSpecificationFloatingNameEditPartCN extends FloatingLabelEd /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -248,6 +252,7 @@ public class InstanceSpecificationFloatingNameEditPartCN extends FloatingLabelEd /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -280,7 +285,8 @@ public class InstanceSpecificationFloatingNameEditPartCN extends FloatingLabelEd String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -292,6 +298,7 @@ public class InstanceSpecificationFloatingNameEditPartCN extends FloatingLabelEd /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -307,11 +314,13 @@ public class InstanceSpecificationFloatingNameEditPartCN extends FloatingLabelEd /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -325,6 +334,7 @@ public class InstanceSpecificationFloatingNameEditPartCN extends FloatingLabelEd /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -334,15 +344,12 @@ public class InstanceSpecificationFloatingNameEditPartCN extends FloatingLabelEd final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - InstanceSpecificationFloatingNameEditPartCN.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), InstanceSpecificationFloatingNameEditPartCN.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -360,6 +367,7 @@ public class InstanceSpecificationFloatingNameEditPartCN extends FloatingLabelEd /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -370,6 +378,7 @@ public class InstanceSpecificationFloatingNameEditPartCN extends FloatingLabelEd /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -377,10 +386,10 @@ public class InstanceSpecificationFloatingNameEditPartCN extends FloatingLabelEd /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.InstanceSpecification_Shape_CN, getParserElement(), this, - VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.InstanceSpecification_Shape_CN, getParserElement(), this, VISUAL_ID); } return parser; } @@ -440,6 +449,7 @@ public class InstanceSpecificationFloatingNameEditPartCN extends FloatingLabelEd /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -467,18 +477,13 @@ public class InstanceSpecificationFloatingNameEditPartCN extends FloatingLabelEd initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -490,8 +495,7 @@ public class InstanceSpecificationFloatingNameEditPartCN extends FloatingLabelEd @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -517,10 +521,9 @@ public class InstanceSpecificationFloatingNameEditPartCN extends FloatingLabelEd @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -536,6 +539,7 @@ public class InstanceSpecificationFloatingNameEditPartCN extends FloatingLabelEd /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -577,7 +581,8 @@ public class InstanceSpecificationFloatingNameEditPartCN extends FloatingLabelEd * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -594,7 +599,8 @@ public class InstanceSpecificationFloatingNameEditPartCN extends FloatingLabelEd * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -603,11 +609,15 @@ public class InstanceSpecificationFloatingNameEditPartCN extends FloatingLabelEd /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -615,6 +625,7 @@ public class InstanceSpecificationFloatingNameEditPartCN extends FloatingLabelEd /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -622,6 +633,7 @@ public class InstanceSpecificationFloatingNameEditPartCN extends FloatingLabelEd /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -637,6 +649,7 @@ public class InstanceSpecificationFloatingNameEditPartCN extends FloatingLabelEd /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -650,6 +663,7 @@ public class InstanceSpecificationFloatingNameEditPartCN extends FloatingLabelEd /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -672,7 +686,7 @@ public class InstanceSpecificationFloatingNameEditPartCN extends FloatingLabelEd /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -691,7 +705,7 @@ public class InstanceSpecificationFloatingNameEditPartCN extends FloatingLabelEd /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -704,7 +718,7 @@ public class InstanceSpecificationFloatingNameEditPartCN extends FloatingLabelEd /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -714,43 +728,42 @@ public class InstanceSpecificationFloatingNameEditPartCN extends FloatingLabelEd /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -759,13 +772,11 @@ public class InstanceSpecificationFloatingNameEditPartCN extends FloatingLabelEd @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -782,6 +793,7 @@ public class InstanceSpecificationFloatingNameEditPartCN extends FloatingLabelEd /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -791,10 +803,10 @@ public class InstanceSpecificationFloatingNameEditPartCN extends FloatingLabelEd refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -817,6 +829,7 @@ public class InstanceSpecificationFloatingNameEditPartCN extends FloatingLabelEd /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationLinkEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationLinkEditPart.java index 7abf1dbb2a9..314248cbbe8 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationLinkEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationLinkEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -25,8 +25,8 @@ import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNode import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart; /** - * @generated - */ + * @generated + */ public class InstanceSpecificationLinkEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart { /** @@ -44,6 +44,7 @@ public class InstanceSpecificationLinkEditPart extends UMLConnectionNodeEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); @@ -55,10 +56,12 @@ public class InstanceSpecificationLinkEditPart extends UMLConnectionNodeEditPart */ protected boolean addFixedChild(EditPart childEditPart) { if (childEditPart instanceof SourceISLinkLabelEditPart) { - ((SourceISLinkLabelEditPart) childEditPart).setLabel(getPrimaryShape().getSourceLabel()); + ((SourceISLinkLabelEditPart) childEditPart).setLabel( + getPrimaryShape().getSourceLabel()); } if (childEditPart instanceof TargetISLinkLabelEditPart) { - ((TargetISLinkLabelEditPart) childEditPart).setLabel(getPrimaryShape().getTargetLabel()); + ((TargetISLinkLabelEditPart) childEditPart).setLabel( + getPrimaryShape().getTargetLabel()); } return false; } @@ -66,6 +69,7 @@ public class InstanceSpecificationLinkEditPart extends UMLConnectionNodeEditPart /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -89,6 +93,7 @@ public class InstanceSpecificationLinkEditPart extends UMLConnectionNodeEditPart /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -98,12 +103,13 @@ public class InstanceSpecificationLinkEditPart extends UMLConnectionNodeEditPart /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected Connection createConnectionFigure() { return new InstanceSpecificationLinkFigure(); } @@ -111,6 +117,7 @@ public class InstanceSpecificationLinkEditPart extends UMLConnectionNodeEditPart /** * @generated */ + @Override public InstanceSpecificationLinkFigure getPrimaryShape() { return (InstanceSpecificationLinkFigure) getFigure(); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationNameEditPart.java index 1422225ba16..0cffe265d7f 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationNameEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,13 +64,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.InstanceSpecificationNameLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; @@ -72,7 +71,6 @@ import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -116,12 +114,14 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -136,13 +136,13 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy()); - installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, - new InstanceSpecificationNameLabelEditPolicy()); + installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new InstanceSpecificationNameLabelEditPolicy()); } /** @@ -211,6 +211,7 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -218,6 +219,7 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -225,6 +227,7 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -240,8 +243,7 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -251,7 +253,8 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -263,6 +266,7 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -278,11 +282,13 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -296,6 +302,7 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -305,16 +312,12 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - InstanceSpecificationNameEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), InstanceSpecificationNameEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -332,6 +335,7 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -342,6 +346,7 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -349,10 +354,10 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.InstanceSpecification_Shape, getParserElement(), this, - VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.InstanceSpecification_Shape, getParserElement(), this, VISUAL_ID); } return parser; } @@ -412,6 +417,7 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -439,18 +445,13 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -462,8 +463,7 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -489,10 +489,9 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -508,6 +507,7 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -549,7 +549,8 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -566,7 +567,8 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -575,11 +577,15 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -587,6 +593,7 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -594,6 +601,7 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -609,6 +617,7 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -622,6 +631,7 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -644,7 +654,7 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -663,7 +673,7 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -676,7 +686,7 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -686,43 +696,42 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -731,13 +740,11 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -754,6 +761,7 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -762,6 +770,7 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -770,6 +779,7 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); @@ -780,10 +790,10 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -800,8 +810,7 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } super.handleNotificationEvent(event); @@ -810,6 +819,7 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -823,6 +833,7 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar /** * @generated */ + @Override public void activate() { super.activate(); addOwnerElementListeners(); @@ -839,6 +850,7 @@ public class InstanceSpecificationNameEditPart extends PapyrusCompartmentEditPar /** * @generated */ + @Override public void deactivate() { removeOwnerElementListeners(); super.deactivate(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationNameEditPartCN.java index aca01f0249b..6e50fa865be 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationNameEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationNameEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -47,6 +47,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -57,11 +62,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.InstanceSpecificationNameLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; @@ -112,12 +112,14 @@ public class InstanceSpecificationNameEditPartCN extends PapyrusCompartmentEditP /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -132,13 +134,13 @@ public class InstanceSpecificationNameEditPartCN extends PapyrusCompartmentEditP /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy()); - installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, - new InstanceSpecificationNameLabelEditPolicy()); + installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new InstanceSpecificationNameLabelEditPolicy()); } /** @@ -207,6 +209,7 @@ public class InstanceSpecificationNameEditPartCN extends PapyrusCompartmentEditP /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -214,6 +217,7 @@ public class InstanceSpecificationNameEditPartCN extends PapyrusCompartmentEditP /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -221,6 +225,7 @@ public class InstanceSpecificationNameEditPartCN extends PapyrusCompartmentEditP /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -246,7 +251,8 @@ public class InstanceSpecificationNameEditPartCN extends PapyrusCompartmentEditP String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -258,6 +264,7 @@ public class InstanceSpecificationNameEditPartCN extends PapyrusCompartmentEditP /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -273,11 +280,13 @@ public class InstanceSpecificationNameEditPartCN extends PapyrusCompartmentEditP /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -291,6 +300,7 @@ public class InstanceSpecificationNameEditPartCN extends PapyrusCompartmentEditP /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -300,16 +310,12 @@ public class InstanceSpecificationNameEditPartCN extends PapyrusCompartmentEditP final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - InstanceSpecificationNameEditPartCN.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), InstanceSpecificationNameEditPartCN.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -327,6 +333,7 @@ public class InstanceSpecificationNameEditPartCN extends PapyrusCompartmentEditP /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -337,6 +344,7 @@ public class InstanceSpecificationNameEditPartCN extends PapyrusCompartmentEditP /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -344,10 +352,10 @@ public class InstanceSpecificationNameEditPartCN extends PapyrusCompartmentEditP /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.InstanceSpecification_Shape_CN, getParserElement(), this, - VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.InstanceSpecification_Shape_CN, getParserElement(), this, VISUAL_ID); } return parser; } @@ -407,6 +415,7 @@ public class InstanceSpecificationNameEditPartCN extends PapyrusCompartmentEditP /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -434,18 +443,13 @@ public class InstanceSpecificationNameEditPartCN extends PapyrusCompartmentEditP initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -457,8 +461,7 @@ public class InstanceSpecificationNameEditPartCN extends PapyrusCompartmentEditP @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -484,10 +487,9 @@ public class InstanceSpecificationNameEditPartCN extends PapyrusCompartmentEditP @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -503,6 +505,7 @@ public class InstanceSpecificationNameEditPartCN extends PapyrusCompartmentEditP /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -544,7 +547,8 @@ public class InstanceSpecificationNameEditPartCN extends PapyrusCompartmentEditP * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -561,7 +565,8 @@ public class InstanceSpecificationNameEditPartCN extends PapyrusCompartmentEditP * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -570,11 +575,15 @@ public class InstanceSpecificationNameEditPartCN extends PapyrusCompartmentEditP /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -582,6 +591,7 @@ public class InstanceSpecificationNameEditPartCN extends PapyrusCompartmentEditP /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -589,6 +599,7 @@ public class InstanceSpecificationNameEditPartCN extends PapyrusCompartmentEditP /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -604,6 +615,7 @@ public class InstanceSpecificationNameEditPartCN extends PapyrusCompartmentEditP /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -617,6 +629,7 @@ public class InstanceSpecificationNameEditPartCN extends PapyrusCompartmentEditP /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -639,7 +652,7 @@ public class InstanceSpecificationNameEditPartCN extends PapyrusCompartmentEditP /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -658,7 +671,7 @@ public class InstanceSpecificationNameEditPartCN extends PapyrusCompartmentEditP /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -671,7 +684,7 @@ public class InstanceSpecificationNameEditPartCN extends PapyrusCompartmentEditP /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -681,43 +694,42 @@ public class InstanceSpecificationNameEditPartCN extends PapyrusCompartmentEditP /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -726,13 +738,11 @@ public class InstanceSpecificationNameEditPartCN extends PapyrusCompartmentEditP @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -749,6 +759,7 @@ public class InstanceSpecificationNameEditPartCN extends PapyrusCompartmentEditP /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -757,6 +768,7 @@ public class InstanceSpecificationNameEditPartCN extends PapyrusCompartmentEditP /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -765,6 +777,7 @@ public class InstanceSpecificationNameEditPartCN extends PapyrusCompartmentEditP /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); @@ -775,10 +788,10 @@ public class InstanceSpecificationNameEditPartCN extends PapyrusCompartmentEditP refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -801,6 +814,7 @@ public class InstanceSpecificationNameEditPartCN extends PapyrusCompartmentEditP /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -814,6 +828,7 @@ public class InstanceSpecificationNameEditPartCN extends PapyrusCompartmentEditP /** * @generated */ + @Override public void activate() { super.activate(); addOwnerElementListeners(); @@ -830,6 +845,7 @@ public class InstanceSpecificationNameEditPartCN extends PapyrusCompartmentEditP /** * @generated */ + @Override public void deactivate() { removeOwnerElementListeners(); super.deactivate(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationSlotCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationSlotCompartmentEditPart.java index 6864e952c57..399df399fa4 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationSlotCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationSlotCompartmentEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -32,7 +32,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPo import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -56,6 +55,7 @@ public class InstanceSpecificationSlotCompartmentEditPart extends ListCompartmen /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; } @@ -63,6 +63,7 @@ public class InstanceSpecificationSlotCompartmentEditPart extends ListCompartmen /** * @generated */ + @Override public String getCompartmentName() { return Messages.InstanceSpecificationSlotCompartmentEditPart_title; } @@ -70,6 +71,7 @@ public class InstanceSpecificationSlotCompartmentEditPart extends ListCompartmen /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -77,10 +79,9 @@ public class InstanceSpecificationSlotCompartmentEditPart extends ListCompartmen installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InstanceSpecificationSlotCompartmentCanonicalEditPolicy()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InstanceSpecificationSlotCompartmentCanonicalEditPolicy()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy()); } @@ -88,6 +89,7 @@ public class InstanceSpecificationSlotCompartmentEditPart extends ListCompartmen /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -97,6 +99,7 @@ public class InstanceSpecificationSlotCompartmentEditPart extends ListCompartmen /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -105,6 +108,7 @@ public class InstanceSpecificationSlotCompartmentEditPart extends ListCompartmen /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -126,12 +130,16 @@ public class InstanceSpecificationSlotCompartmentEditPart extends ListCompartmen int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationSlotCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationSlotCompartmentEditPartCN.java index 12d95433627..79774ac20ff 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationSlotCompartmentEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationSlotCompartmentEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -32,7 +32,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPo import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -56,6 +55,7 @@ public class InstanceSpecificationSlotCompartmentEditPartCN extends ListCompartm /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; } @@ -63,6 +63,7 @@ public class InstanceSpecificationSlotCompartmentEditPartCN extends ListCompartm /** * @generated */ + @Override public String getCompartmentName() { return Messages.InstanceSpecificationSlotCompartmentEditPartCN_title; } @@ -70,6 +71,7 @@ public class InstanceSpecificationSlotCompartmentEditPartCN extends ListCompartm /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -77,10 +79,9 @@ public class InstanceSpecificationSlotCompartmentEditPartCN extends ListCompartm installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InstanceSpecificationSlotCompartmentCanonicalEditPolicyCN()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InstanceSpecificationSlotCompartmentCanonicalEditPolicyCN()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy()); } @@ -88,6 +89,7 @@ public class InstanceSpecificationSlotCompartmentEditPartCN extends ListCompartm /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -97,6 +99,7 @@ public class InstanceSpecificationSlotCompartmentEditPartCN extends ListCompartm /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -105,6 +108,7 @@ public class InstanceSpecificationSlotCompartmentEditPartCN extends ListCompartm /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -126,12 +130,16 @@ public class InstanceSpecificationSlotCompartmentEditPartCN extends ListCompartm int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceAttributeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceAttributeCompartmentEditPart.java index 2125438f831..4bb735896ca 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceAttributeCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceAttributeCompartmentEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -31,7 +31,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartme import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -55,6 +54,7 @@ public class InterfaceAttributeCompartmentEditPart extends ResizeableListCompart /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; } @@ -62,6 +62,7 @@ public class InterfaceAttributeCompartmentEditPart extends ResizeableListCompart /** * @generated */ + @Override public String getCompartmentName() { return Messages.InterfaceAttributeCompartmentEditPart_title; } @@ -69,6 +70,7 @@ public class InterfaceAttributeCompartmentEditPart extends ResizeableListCompart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -76,16 +78,16 @@ public class InterfaceAttributeCompartmentEditPart extends ResizeableListCompart installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceAttributeCompartmentCanonicalEditPolicy()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceAttributeCompartmentCanonicalEditPolicy()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); } /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -95,6 +97,7 @@ public class InterfaceAttributeCompartmentEditPart extends ResizeableListCompart /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -103,6 +106,7 @@ public class InterfaceAttributeCompartmentEditPart extends ResizeableListCompart /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -117,6 +121,7 @@ public class InterfaceAttributeCompartmentEditPart extends ResizeableListCompart /** * @generated */ + @Override protected void refreshBounds() { int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); @@ -124,12 +129,16 @@ public class InterfaceAttributeCompartmentEditPart extends ResizeableListCompart int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceAttributeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceAttributeCompartmentEditPartCN.java index 6276a9aa5c2..b327c00a2e2 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceAttributeCompartmentEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceAttributeCompartmentEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -31,7 +31,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartme import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -55,6 +54,7 @@ public class InterfaceAttributeCompartmentEditPartCN extends ResizeableListCompa /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; } @@ -62,6 +62,7 @@ public class InterfaceAttributeCompartmentEditPartCN extends ResizeableListCompa /** * @generated */ + @Override public String getCompartmentName() { return Messages.InterfaceAttributeCompartmentEditPartCN_title; } @@ -69,6 +70,7 @@ public class InterfaceAttributeCompartmentEditPartCN extends ResizeableListCompa /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -76,16 +78,16 @@ public class InterfaceAttributeCompartmentEditPartCN extends ResizeableListCompa installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceAttributeCompartmentCanonicalEditPolicyCN()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceAttributeCompartmentCanonicalEditPolicyCN()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); } /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -95,6 +97,7 @@ public class InterfaceAttributeCompartmentEditPartCN extends ResizeableListCompa /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -103,6 +106,7 @@ public class InterfaceAttributeCompartmentEditPartCN extends ResizeableListCompa /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -117,6 +121,7 @@ public class InterfaceAttributeCompartmentEditPartCN extends ResizeableListCompa /** * @generated */ + @Override protected void refreshBounds() { int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); @@ -124,12 +129,16 @@ public class InterfaceAttributeCompartmentEditPartCN extends ResizeableListCompa int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPart.java index 02bec1178d5..ec574d295b9 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -95,6 +95,7 @@ public class InterfaceEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void createDefaultEditPolicies() { installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); super.createDefaultEditPolicies(); @@ -103,18 +104,15 @@ public class InterfaceEditPart extends ClassifierEditPart { installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceCanonicalEditPolicy()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceCanonicalEditPolicy()); installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); - installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, - new ShowHideCompartmentEditPolicy()); - installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, - new ShowHideClassifierContentsEditPolicy()); + installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy()); + installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy()); installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE); @@ -167,9 +165,11 @@ public class InterfaceEditPart extends ClassifierEditPart { } /** - *Papyrus codeGen - *@generated - **/ + * Papyrus codeGen + * + * @generated + **/ + @Override protected void handleNotificationEvent(Notification event) { /* * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart @@ -178,7 +178,8 @@ public class InterfaceEditPart extends ClassifierEditPart { if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) { Object notifier = event.getNotifier(); List<?> modelChildren = ((View) getModel()).getChildren(); - if (false == notifier instanceof Edge && false == notifier instanceof BasicCompartment) { + if (false == notifier instanceof Edge + && false == notifier instanceof BasicCompartment) { if (modelChildren.contains(event.getNotifier())) { return; } @@ -191,14 +192,17 @@ public class InterfaceEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected IFigure createNodeShape() { return primaryShape = new InterfaceFigure(); } /** * org.eclipse.papyrus.uml.diagram.common.figure.node.InterfaceFigure + * * @generated */ + @Override public InterfaceFigure getPrimaryShape() { return (InterfaceFigure) primaryShape; } @@ -212,35 +216,38 @@ public class InterfaceEditPart extends ClassifierEditPart { return true; } + if (childEditPart instanceof InterfaceAttributeCompartmentEditPart) { IFigure pane = getPrimaryShape().getAttributeCompartmentFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((InterfaceAttributeCompartmentEditPart) childEditPart).getFigure()); return true; } if (childEditPart instanceof InterfaceOperationCompartmentEditPart) { IFigure pane = getPrimaryShape().getOperationCompartmentFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((InterfaceOperationCompartmentEditPart) childEditPart).getFigure()); return true; } if (childEditPart instanceof InterfaceNestedClassifierCompartmentEditPart) { IFigure pane = getPrimaryShape().getNestedClassifierFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((InterfaceNestedClassifierCompartmentEditPart) childEditPart).getFigure()); return true; } - //Papyrus Gencode :precise the locator for a template signature + + + // Papyrus Gencode :precise the locator for a template signature if (childEditPart instanceof RedefinableTemplateSignatureEditPart) { IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST); - getBorderedFigure().getBorderItemContainer() - .add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator); + getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator); return true; } + return false; } @@ -267,8 +274,7 @@ public class InterfaceEditPart extends ClassifierEditPart { return true; } if (childEditPart instanceof RedefinableTemplateSignatureEditPart) { - getBorderedFigure().getBorderItemContainer() - .remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure()); + getBorderedFigure().getBorderItemContainer().remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure()); return true; } return false; @@ -277,6 +283,7 @@ public class InterfaceEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -287,6 +294,7 @@ public class InterfaceEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -297,6 +305,7 @@ public class InterfaceEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { if (editPart instanceof InterfaceAttributeCompartmentEditPart) { return getPrimaryShape().getAttributeCompartmentFigure(); @@ -316,6 +325,7 @@ public class InterfaceEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) { if (borderItemEditPart instanceof InterfaceFloatingNameEditPart) { IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure()); @@ -328,6 +338,7 @@ public class InterfaceEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected NodeFigure createNodePlate() { RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(100, 100); return result; @@ -335,12 +346,13 @@ public class InterfaceEditPart extends ClassifierEditPart { /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected NodeFigure createMainFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); @@ -349,9 +361,12 @@ public class InterfaceEditPart extends ClassifierEditPart { /** * Default implementation treats passed figure as content pane. * Respects layout one may have set for generated figure. - * @param nodeShape instance of generated figure class + * + * @param nodeShape + * instance of generated figure class * @generated */ + @Override protected IFigure setupContentPane(IFigure nodeShape) { if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); @@ -364,6 +379,7 @@ public class InterfaceEditPart extends ClassifierEditPart { /** * @generated */ + @Override public IFigure getContentPane() { if (contentPane != null) { return contentPane; @@ -374,6 +390,7 @@ public class InterfaceEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void setForegroundColor(Color color) { if (primaryShape != null) { primaryShape.setForegroundColor(color); @@ -383,6 +400,7 @@ public class InterfaceEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void setLineWidth(int width) { super.setLineWidth(width); } @@ -390,6 +408,7 @@ public class InterfaceEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void setLineType(int style) { if (primaryShape instanceof IPapyrusNodeFigure) { ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); @@ -399,6 +418,7 @@ public class InterfaceEditPart extends ClassifierEditPart { /** * @generated */ + @Override public EditPart getPrimaryChildEditPart() { return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNameEditPart.VISUAL_ID)); } @@ -406,50 +426,40 @@ public class InterfaceEditPart extends ClassifierEditPart { /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { if (request instanceof CreateViewAndElementRequest) { - CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor() - .getCreateElementRequestAdapter(); + CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter(); IElementType type = (IElementType) adapter.getAdapter(IElementType.class); if (UMLElementTypes.isKindOf(type, UMLElementTypes.Property_InterfaceAttributeLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(InterfaceAttributeCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceAttributeCompartmentEditPart.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Operation_InterfaceOperationLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(InterfaceOperationCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceOperationCompartmentEditPart.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Reception_InterfaceReceptionLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(InterfaceOperationCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceOperationCompartmentEditPart.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Class_InterfaceNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Interface_InterfaceNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Enumeration_InterfaceNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.PrimitiveType_InterfaceNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.DataType_InterfaceNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Signal_InterfaceNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Component_InterfaceNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID)); } } return super.getTargetEditPart(request); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPartCN.java index fe4e3f66fb5..64603ad9782 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -96,6 +96,7 @@ public class InterfaceEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void createDefaultEditPolicies() { installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); super.createDefaultEditPolicies(); @@ -104,18 +105,15 @@ public class InterfaceEditPartCN extends ClassifierEditPart { installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceCanonicalEditPolicyCN()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceCanonicalEditPolicyCN()); installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$ - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); - installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, - new ShowHideCompartmentEditPolicy()); - installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, - new ShowHideClassifierContentsEditPolicy()); + installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy()); + installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies @@ -169,9 +167,11 @@ public class InterfaceEditPartCN extends ClassifierEditPart { } /** - *Papyrus codeGen - *@generated - **/ + * Papyrus codeGen + * + * @generated + **/ + @Override protected void handleNotificationEvent(Notification event) { /* * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart @@ -180,7 +180,8 @@ public class InterfaceEditPartCN extends ClassifierEditPart { if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) { Object notifier = event.getNotifier(); List<?> modelChildren = ((View) getModel()).getChildren(); - if (false == notifier instanceof Edge && false == notifier instanceof BasicCompartment) { + if (false == notifier instanceof Edge + && false == notifier instanceof BasicCompartment) { if (modelChildren.contains(event.getNotifier())) { return; } @@ -193,14 +194,17 @@ public class InterfaceEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected IFigure createNodeShape() { return primaryShape = new InterfaceFigure(); } /** * org.eclipse.papyrus.uml.diagram.common.figure.node.InterfaceFigure + * * @generated */ + @Override public InterfaceFigure getPrimaryShape() { return (InterfaceFigure) primaryShape; } @@ -214,35 +218,38 @@ public class InterfaceEditPartCN extends ClassifierEditPart { return true; } + if (childEditPart instanceof InterfaceAttributeCompartmentEditPartCN) { IFigure pane = getPrimaryShape().getAttributeCompartmentFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((InterfaceAttributeCompartmentEditPartCN) childEditPart).getFigure()); return true; } if (childEditPart instanceof InterfaceOperationCompartmentEditPartCN) { IFigure pane = getPrimaryShape().getOperationCompartmentFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((InterfaceOperationCompartmentEditPartCN) childEditPart).getFigure()); return true; } if (childEditPart instanceof InterfaceNestedClassifierCompartmentEditPartCN) { IFigure pane = getPrimaryShape().getNestedClassifierFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((InterfaceNestedClassifierCompartmentEditPartCN) childEditPart).getFigure()); return true; } - //Papyrus Gencode :precise the locator for a template signature + + + // Papyrus Gencode :precise the locator for a template signature if (childEditPart instanceof RedefinableTemplateSignatureEditPart) { IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST); - getBorderedFigure().getBorderItemContainer() - .add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator); + getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator); return true; } + return false; } @@ -269,8 +276,7 @@ public class InterfaceEditPartCN extends ClassifierEditPart { return true; } if (childEditPart instanceof RedefinableTemplateSignatureEditPart) { - getBorderedFigure().getBorderItemContainer() - .remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure()); + getBorderedFigure().getBorderItemContainer().remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure()); return true; } return false; @@ -279,6 +285,7 @@ public class InterfaceEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -289,6 +296,7 @@ public class InterfaceEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -299,6 +307,7 @@ public class InterfaceEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { if (editPart instanceof InterfaceAttributeCompartmentEditPartCN) { return getPrimaryShape().getAttributeCompartmentFigure(); @@ -318,6 +327,7 @@ public class InterfaceEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) { if (borderItemEditPart instanceof InterfaceFloatingNameEditPartCN) { IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure()); @@ -330,6 +340,7 @@ public class InterfaceEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected NodeFigure createNodePlate() { RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(100, 100); return result; @@ -337,12 +348,13 @@ public class InterfaceEditPartCN extends ClassifierEditPart { /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected NodeFigure createMainFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); @@ -351,9 +363,12 @@ public class InterfaceEditPartCN extends ClassifierEditPart { /** * Default implementation treats passed figure as content pane. * Respects layout one may have set for generated figure. - * @param nodeShape instance of generated figure class + * + * @param nodeShape + * instance of generated figure class * @generated */ + @Override protected IFigure setupContentPane(IFigure nodeShape) { if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); @@ -366,6 +381,7 @@ public class InterfaceEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override public IFigure getContentPane() { if (contentPane != null) { return contentPane; @@ -376,6 +392,7 @@ public class InterfaceEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void setForegroundColor(Color color) { if (primaryShape != null) { primaryShape.setForegroundColor(color); @@ -385,6 +402,7 @@ public class InterfaceEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void setLineWidth(int width) { super.setLineWidth(width); } @@ -392,6 +410,7 @@ public class InterfaceEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void setLineType(int style) { if (primaryShape instanceof IPapyrusNodeFigure) { ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); @@ -401,6 +420,7 @@ public class InterfaceEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override public EditPart getPrimaryChildEditPart() { return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNameEditPartCN.VISUAL_ID)); } @@ -408,50 +428,40 @@ public class InterfaceEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { if (request instanceof CreateViewAndElementRequest) { - CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor() - .getCreateElementRequestAdapter(); + CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter(); IElementType type = (IElementType) adapter.getAdapter(IElementType.class); if (UMLElementTypes.isKindOf(type, UMLElementTypes.Property_InterfaceAttributeLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(InterfaceAttributeCompartmentEditPartCN.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceAttributeCompartmentEditPartCN.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Operation_InterfaceOperationLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(InterfaceOperationCompartmentEditPartCN.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceOperationCompartmentEditPartCN.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Reception_InterfaceReceptionLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(InterfaceOperationCompartmentEditPartCN.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceOperationCompartmentEditPartCN.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Class_InterfaceNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Interface_InterfaceNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Enumeration_InterfaceNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.PrimitiveType_InterfaceNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.DataType_InterfaceNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Signal_InterfaceNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Component_InterfaceNestedClassifierLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID)); } } return super.getTargetEditPart(request); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceFloatingNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceFloatingNameEditPart.java index 84e82e97032..c0c9756e265 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceFloatingNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceFloatingNameEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -50,6 +50,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -60,11 +65,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -115,12 +115,14 @@ public class InterfaceFloatingNameEditPart extends FloatingLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -129,10 +131,7 @@ public class InterfaceFloatingNameEditPart extends FloatingLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceFloatingNameEditPart.VISUAL_ID), - new Point(0, 0)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceFloatingNameEditPart.VISUAL_ID), new Point(0, 0)); } /** @@ -145,6 +144,7 @@ public class InterfaceFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); @@ -156,6 +156,7 @@ public class InterfaceFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IBorderItemLocator getBorderItemLocator() { IFigure parentFigure = getFigure().getParent(); if (parentFigure != null && parentFigure.getLayoutManager() != null) { @@ -168,6 +169,7 @@ public class InterfaceFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public void refreshBounds() { int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); @@ -242,6 +244,7 @@ public class InterfaceFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -249,6 +252,7 @@ public class InterfaceFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -281,7 +285,8 @@ public class InterfaceFloatingNameEditPart extends FloatingLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -293,6 +298,7 @@ public class InterfaceFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -308,11 +314,13 @@ public class InterfaceFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -326,6 +334,7 @@ public class InterfaceFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -335,14 +344,12 @@ public class InterfaceFloatingNameEditPart extends FloatingLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), - InterfaceFloatingNameEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), InterfaceFloatingNameEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -360,6 +367,7 @@ public class InterfaceFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -370,6 +378,7 @@ public class InterfaceFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -377,6 +386,7 @@ public class InterfaceFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Interface_Shape, getParserElement(), this, VISUAL_ID); @@ -439,6 +449,7 @@ public class InterfaceFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -466,18 +477,13 @@ public class InterfaceFloatingNameEditPart extends FloatingLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -489,8 +495,7 @@ public class InterfaceFloatingNameEditPart extends FloatingLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -516,10 +521,9 @@ public class InterfaceFloatingNameEditPart extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -535,6 +539,7 @@ public class InterfaceFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -576,7 +581,8 @@ public class InterfaceFloatingNameEditPart extends FloatingLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -593,7 +599,8 @@ public class InterfaceFloatingNameEditPart extends FloatingLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -602,11 +609,15 @@ public class InterfaceFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -614,6 +625,7 @@ public class InterfaceFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -621,6 +633,7 @@ public class InterfaceFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -636,6 +649,7 @@ public class InterfaceFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -649,6 +663,7 @@ public class InterfaceFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -671,7 +686,7 @@ public class InterfaceFloatingNameEditPart extends FloatingLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -690,7 +705,7 @@ public class InterfaceFloatingNameEditPart extends FloatingLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -703,7 +718,7 @@ public class InterfaceFloatingNameEditPart extends FloatingLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -713,43 +728,42 @@ public class InterfaceFloatingNameEditPart extends FloatingLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -758,13 +772,11 @@ public class InterfaceFloatingNameEditPart extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -781,6 +793,7 @@ public class InterfaceFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -790,10 +803,10 @@ public class InterfaceFloatingNameEditPart extends FloatingLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -816,6 +829,7 @@ public class InterfaceFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceFloatingNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceFloatingNameEditPartCN.java index 0395b8f42b3..1901f5dff70 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceFloatingNameEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceFloatingNameEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -50,6 +50,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -60,11 +65,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -115,12 +115,14 @@ public class InterfaceFloatingNameEditPartCN extends FloatingLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -129,10 +131,7 @@ public class InterfaceFloatingNameEditPartCN extends FloatingLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceFloatingNameEditPartCN.VISUAL_ID), - new Point(0, 0)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceFloatingNameEditPartCN.VISUAL_ID), new Point(0, 0)); } /** @@ -145,6 +144,7 @@ public class InterfaceFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); @@ -156,6 +156,7 @@ public class InterfaceFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public IBorderItemLocator getBorderItemLocator() { IFigure parentFigure = getFigure().getParent(); if (parentFigure != null && parentFigure.getLayoutManager() != null) { @@ -168,6 +169,7 @@ public class InterfaceFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public void refreshBounds() { int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); @@ -242,6 +244,7 @@ public class InterfaceFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -249,6 +252,7 @@ public class InterfaceFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -281,7 +285,8 @@ public class InterfaceFloatingNameEditPartCN extends FloatingLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -293,6 +298,7 @@ public class InterfaceFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -308,11 +314,13 @@ public class InterfaceFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -326,6 +334,7 @@ public class InterfaceFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -335,14 +344,12 @@ public class InterfaceFloatingNameEditPartCN extends FloatingLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), - InterfaceFloatingNameEditPartCN.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), InterfaceFloatingNameEditPartCN.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -360,6 +367,7 @@ public class InterfaceFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -370,6 +378,7 @@ public class InterfaceFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -377,6 +386,7 @@ public class InterfaceFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Interface_Shape_CN, getParserElement(), this, VISUAL_ID); @@ -439,6 +449,7 @@ public class InterfaceFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -466,18 +477,13 @@ public class InterfaceFloatingNameEditPartCN extends FloatingLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -489,8 +495,7 @@ public class InterfaceFloatingNameEditPartCN extends FloatingLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -516,10 +521,9 @@ public class InterfaceFloatingNameEditPartCN extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -535,6 +539,7 @@ public class InterfaceFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -576,7 +581,8 @@ public class InterfaceFloatingNameEditPartCN extends FloatingLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -593,7 +599,8 @@ public class InterfaceFloatingNameEditPartCN extends FloatingLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -602,11 +609,15 @@ public class InterfaceFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -614,6 +625,7 @@ public class InterfaceFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -621,6 +633,7 @@ public class InterfaceFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -636,6 +649,7 @@ public class InterfaceFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -649,6 +663,7 @@ public class InterfaceFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -671,7 +686,7 @@ public class InterfaceFloatingNameEditPartCN extends FloatingLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -690,7 +705,7 @@ public class InterfaceFloatingNameEditPartCN extends FloatingLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -703,7 +718,7 @@ public class InterfaceFloatingNameEditPartCN extends FloatingLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -713,43 +728,42 @@ public class InterfaceFloatingNameEditPartCN extends FloatingLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -758,13 +772,11 @@ public class InterfaceFloatingNameEditPartCN extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -781,6 +793,7 @@ public class InterfaceFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -790,10 +803,10 @@ public class InterfaceFloatingNameEditPartCN extends FloatingLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -816,6 +829,7 @@ public class InterfaceFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceNameEditPart.java index e957fd7b797..f573e29df06 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceNameEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,20 +64,12 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -115,12 +113,14 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -135,6 +135,7 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy()); @@ -208,6 +209,7 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -215,6 +217,7 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -222,6 +225,7 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -237,8 +241,7 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -248,7 +251,8 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -260,6 +264,7 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -275,11 +280,13 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -293,6 +300,7 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -302,13 +310,12 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), InterfaceNameEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), InterfaceNameEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -326,6 +333,7 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -336,6 +344,7 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -343,6 +352,7 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Interface_Shape, getParserElement(), this, VISUAL_ID); @@ -405,6 +415,7 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -432,18 +443,13 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -455,8 +461,7 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -482,10 +487,9 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -501,6 +505,7 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -542,7 +547,8 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -559,7 +565,8 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -568,11 +575,15 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -580,6 +591,7 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -587,6 +599,7 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -602,6 +615,7 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -615,6 +629,7 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -637,7 +652,7 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -656,7 +671,7 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -669,7 +684,7 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -679,43 +694,42 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -724,13 +738,11 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -747,6 +759,7 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -755,6 +768,7 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -763,6 +777,7 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); @@ -773,10 +788,10 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -793,8 +808,7 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } super.handleNotificationEvent(event); @@ -803,6 +817,7 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -816,6 +831,7 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void activate() { super.activate(); addOwnerElementListeners(); @@ -832,6 +848,7 @@ public class InterfaceNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void deactivate() { removeOwnerElementListeners(); super.deactivate(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceNameEditPartCN.java index d6bd646155d..56c8af2eeae 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceNameEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceNameEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,20 +64,12 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -115,12 +113,14 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -135,6 +135,7 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy()); @@ -208,6 +209,7 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -215,6 +217,7 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -222,6 +225,7 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -237,8 +241,7 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -248,7 +251,8 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -260,6 +264,7 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -275,11 +280,13 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -293,6 +300,7 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -302,13 +310,12 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), InterfaceNameEditPartCN.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), InterfaceNameEditPartCN.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -326,6 +333,7 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -336,6 +344,7 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -343,6 +352,7 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Interface_Shape_CN, getParserElement(), this, VISUAL_ID); @@ -405,6 +415,7 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -432,18 +443,13 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -455,8 +461,7 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -482,10 +487,9 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -501,6 +505,7 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -542,7 +547,8 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -559,7 +565,8 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -568,11 +575,15 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -580,6 +591,7 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -587,6 +599,7 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -602,6 +615,7 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -615,6 +629,7 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -637,7 +652,7 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -656,7 +671,7 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -669,7 +684,7 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -679,43 +694,42 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -724,13 +738,11 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -747,6 +759,7 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -755,6 +768,7 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -763,6 +777,7 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); @@ -773,10 +788,10 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -793,8 +808,7 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } super.handleNotificationEvent(event); @@ -803,6 +817,7 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -816,6 +831,7 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void activate() { super.activate(); addOwnerElementListeners(); @@ -832,6 +848,7 @@ public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void deactivate() { removeOwnerElementListeners(); super.deactivate(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceNestedClassifierCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceNestedClassifierCompartmentEditPart.java index 84e60ee535a..472b0362708 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceNestedClassifierCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceNestedClassifierCompartmentEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -32,7 +32,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentS import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedClazzCompartmentCreationEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -56,6 +55,7 @@ public class InterfaceNestedClassifierCompartmentEditPart extends ResizeableList /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; } @@ -63,6 +63,7 @@ public class InterfaceNestedClassifierCompartmentEditPart extends ResizeableList /** * @generated */ + @Override public String getCompartmentName() { return Messages.InterfaceNestedClassifierCompartmentEditPart_title; } @@ -70,6 +71,7 @@ public class InterfaceNestedClassifierCompartmentEditPart extends ResizeableList /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -77,10 +79,9 @@ public class InterfaceNestedClassifierCompartmentEditPart extends ResizeableList installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceNestedClassifierCompartmentCanonicalEditPolicy()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceNestedClassifierCompartmentCanonicalEditPolicy()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); installEditPolicy(EditPolicyRoles.CREATION_ROLE, new NestedClazzCompartmentCreationEditPolicy()); } @@ -88,6 +89,7 @@ public class InterfaceNestedClassifierCompartmentEditPart extends ResizeableList /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -97,6 +99,7 @@ public class InterfaceNestedClassifierCompartmentEditPart extends ResizeableList /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -105,6 +108,7 @@ public class InterfaceNestedClassifierCompartmentEditPart extends ResizeableList /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -119,6 +123,7 @@ public class InterfaceNestedClassifierCompartmentEditPart extends ResizeableList /** * @generated */ + @Override protected void refreshBounds() { int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); @@ -126,12 +131,16 @@ public class InterfaceNestedClassifierCompartmentEditPart extends ResizeableList int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceNestedClassifierCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceNestedClassifierCompartmentEditPartCN.java index 590070481e3..506e514b8f1 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceNestedClassifierCompartmentEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceNestedClassifierCompartmentEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -32,7 +32,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentS import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedClazzCompartmentCreationEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -56,6 +55,7 @@ public class InterfaceNestedClassifierCompartmentEditPartCN extends ResizeableLi /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; } @@ -63,6 +63,7 @@ public class InterfaceNestedClassifierCompartmentEditPartCN extends ResizeableLi /** * @generated */ + @Override public String getCompartmentName() { return Messages.InterfaceNestedClassifierCompartmentEditPartCN_title; } @@ -70,6 +71,7 @@ public class InterfaceNestedClassifierCompartmentEditPartCN extends ResizeableLi /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -77,10 +79,9 @@ public class InterfaceNestedClassifierCompartmentEditPartCN extends ResizeableLi installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceNestedClassifierCompartmentCanonicalEditPolicyCN()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceNestedClassifierCompartmentCanonicalEditPolicyCN()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); installEditPolicy(EditPolicyRoles.CREATION_ROLE, new NestedClazzCompartmentCreationEditPolicy()); } @@ -88,6 +89,7 @@ public class InterfaceNestedClassifierCompartmentEditPartCN extends ResizeableLi /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -97,6 +99,7 @@ public class InterfaceNestedClassifierCompartmentEditPartCN extends ResizeableLi /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -105,6 +108,7 @@ public class InterfaceNestedClassifierCompartmentEditPartCN extends ResizeableLi /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -119,6 +123,7 @@ public class InterfaceNestedClassifierCompartmentEditPartCN extends ResizeableLi /** * @generated */ + @Override protected void refreshBounds() { int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); @@ -126,12 +131,16 @@ public class InterfaceNestedClassifierCompartmentEditPartCN extends ResizeableLi int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceOperationCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceOperationCompartmentEditPart.java index 9b0a9cfcd01..a8d98b69665 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceOperationCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceOperationCompartmentEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -31,7 +31,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartme import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -55,6 +54,7 @@ public class InterfaceOperationCompartmentEditPart extends ResizeableListCompart /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; } @@ -62,6 +62,7 @@ public class InterfaceOperationCompartmentEditPart extends ResizeableListCompart /** * @generated */ + @Override public String getCompartmentName() { return Messages.InterfaceOperationCompartmentEditPart_title; } @@ -69,6 +70,7 @@ public class InterfaceOperationCompartmentEditPart extends ResizeableListCompart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -76,16 +78,16 @@ public class InterfaceOperationCompartmentEditPart extends ResizeableListCompart installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceOperationCompartmentCanonicalEditPolicy()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceOperationCompartmentCanonicalEditPolicy()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); } /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -95,6 +97,7 @@ public class InterfaceOperationCompartmentEditPart extends ResizeableListCompart /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -103,6 +106,7 @@ public class InterfaceOperationCompartmentEditPart extends ResizeableListCompart /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -117,6 +121,7 @@ public class InterfaceOperationCompartmentEditPart extends ResizeableListCompart /** * @generated */ + @Override protected void refreshBounds() { int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); @@ -124,12 +129,16 @@ public class InterfaceOperationCompartmentEditPart extends ResizeableListCompart int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceOperationCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceOperationCompartmentEditPartCN.java index 0b03364e9cd..d7e6346f476 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceOperationCompartmentEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceOperationCompartmentEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -31,7 +31,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartme import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -55,6 +54,7 @@ public class InterfaceOperationCompartmentEditPartCN extends ResizeableListCompa /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; } @@ -62,6 +62,7 @@ public class InterfaceOperationCompartmentEditPartCN extends ResizeableListCompa /** * @generated */ + @Override public String getCompartmentName() { return Messages.InterfaceOperationCompartmentEditPartCN_title; } @@ -69,6 +70,7 @@ public class InterfaceOperationCompartmentEditPartCN extends ResizeableListCompa /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -76,16 +78,16 @@ public class InterfaceOperationCompartmentEditPartCN extends ResizeableListCompa installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceOperationCompartmentCanonicalEditPolicyCN()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InterfaceOperationCompartmentCanonicalEditPolicyCN()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); } /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -95,6 +97,7 @@ public class InterfaceOperationCompartmentEditPartCN extends ResizeableListCompa /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -103,6 +106,7 @@ public class InterfaceOperationCompartmentEditPartCN extends ResizeableListCompa /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -117,6 +121,7 @@ public class InterfaceOperationCompartmentEditPartCN extends ResizeableListCompa /** * @generated */ + @Override protected void refreshBounds() { int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); @@ -124,12 +129,16 @@ public class InterfaceOperationCompartmentEditPartCN extends ResizeableListCompa int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceRealizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceRealizationEditPart.java index 3b490615597..d447100bf59 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceRealizationEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceRealizationEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -27,8 +27,8 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLink import org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure; /** - * @generated - */ + * @generated + */ public class InterfaceRealizationEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart { /** @@ -46,11 +46,11 @@ public class InterfaceRealizationEditPart extends UMLConnectionNodeEditPart impl /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeLinkLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); } @@ -59,11 +59,12 @@ public class InterfaceRealizationEditPart extends UMLConnectionNodeEditPart impl */ protected boolean addFixedChild(EditPart childEditPart) { if (childEditPart instanceof AppliedStereotypeInterfaceRealizationEditPart) { - ((AppliedStereotypeInterfaceRealizationEditPart) childEditPart) - .setLabel(getPrimaryShape().getAppliedStereotypeLabel()); + ((AppliedStereotypeInterfaceRealizationEditPart) childEditPart).setLabel( + getPrimaryShape().getAppliedStereotypeLabel()); } if (childEditPart instanceof InterfaceRealizationNameEditPart) { - ((InterfaceRealizationNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel()); + ((InterfaceRealizationNameEditPart) childEditPart).setLabel( + getPrimaryShape().getNameLabel()); } return false; } @@ -71,6 +72,7 @@ public class InterfaceRealizationEditPart extends UMLConnectionNodeEditPart impl /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -94,6 +96,7 @@ public class InterfaceRealizationEditPart extends UMLConnectionNodeEditPart impl /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -103,12 +106,13 @@ public class InterfaceRealizationEditPart extends UMLConnectionNodeEditPart impl /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected Connection createConnectionFigure() { return new InterfaceRealizationFigure(); } @@ -116,6 +120,7 @@ public class InterfaceRealizationEditPart extends UMLConnectionNodeEditPart impl /** * @generated */ + @Override public InterfaceRealizationFigure getPrimaryShape() { return (InterfaceRealizationFigure) getFigure(); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceRealizationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceRealizationNameEditPart.java index 8fd4d6fab78..f7f7d1d1adb 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceRealizationNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceRealizationNameEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,12 +64,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -114,12 +114,14 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -128,10 +130,7 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceRealizationNameEditPart.VISUAL_ID), - new Point(0, 60)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceRealizationNameEditPart.VISUAL_ID), new Point(0, 60)); } /** @@ -155,6 +154,7 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public int getKeyPoint() { return ConnectionLocator.MIDDLE; } @@ -225,6 +225,7 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -232,6 +233,7 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -239,6 +241,7 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -264,7 +267,8 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -276,6 +280,7 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -291,11 +296,13 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -309,6 +316,7 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -318,16 +326,12 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - InterfaceRealizationNameEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), InterfaceRealizationNameEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -345,6 +349,7 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -355,6 +360,7 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -362,10 +368,10 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.InterfaceRealization_Edge, getParserElement(), this, - VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.InterfaceRealization_Edge, getParserElement(), this, VISUAL_ID); } return parser; } @@ -425,6 +431,7 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -452,18 +459,13 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -475,8 +477,7 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -502,10 +503,9 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -521,6 +521,7 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -562,7 +563,8 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -579,7 +581,8 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -588,11 +591,15 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -600,6 +607,7 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -607,6 +615,7 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -622,6 +631,7 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -635,6 +645,7 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -657,7 +668,7 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -676,7 +687,7 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -689,7 +700,7 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -699,43 +710,42 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -744,13 +754,11 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -767,6 +775,7 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -776,10 +785,10 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -803,6 +812,7 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -811,6 +821,7 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getLabelRole() { return "Name";//$NON-NLS-1$ } @@ -818,6 +829,7 @@ public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getIconPathRole() { return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png";//$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPart.java index f49154505be..da90184b593 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -20,7 +20,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.AbstractShowHideRel import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ShowHideRelatedLinkEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -49,6 +48,7 @@ public class ModelEditPart extends PapyrusDiagramEditPart { /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); @@ -56,13 +56,11 @@ public class ModelEditPart extends PapyrusDiagramEditPart { installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelCanonicalEditPolicy()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelCanonicalEditPolicy()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); - installEditPolicy(AbstractShowHideRelatedLinkEditPolicy.SHOW_HIDE_RELATED_LINK_ROLE, - new ShowHideRelatedLinkEditPolicy()); + installEditPolicy(AbstractShowHideRelatedLinkEditPolicy.SHOW_HIDE_RELATED_LINK_ROLE, new ShowHideRelatedLinkEditPolicy()); // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPartCN.java index d8c1b85ba84..594e0c3982f 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -80,6 +80,7 @@ public class ModelEditPartCN extends PackageEditPart { /** * @generated */ + @Override protected void createDefaultEditPolicies() { installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); super.createDefaultEditPolicies(); @@ -88,16 +89,14 @@ public class ModelEditPartCN extends PackageEditPart { installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelCanonicalEditPolicyCN()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelCanonicalEditPolicyCN()); installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); - installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, - new ShowHideCompartmentEditPolicy()); + installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE); @@ -141,9 +140,11 @@ public class ModelEditPartCN extends PackageEditPart { } /** - *Papyrus codeGen - *@generated - **/ + * Papyrus codeGen + * + * @generated + **/ + @Override protected void handleNotificationEvent(Notification event) { super.handleNotificationEvent(event); @@ -152,14 +153,17 @@ public class ModelEditPartCN extends PackageEditPart { /** * @generated */ + @Override protected IFigure createNodeShape() { return primaryShape = new PackageFigure(); } /** * org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure + * * @generated */ + @Override public PackageFigure getPrimaryShape() { return (PackageFigure) primaryShape; } @@ -173,29 +177,34 @@ public class ModelEditPartCN extends PackageEditPart { return true; } + if (childEditPart instanceof ModelPackageableElementCompartmentEditPartCN) { IFigure pane = getPrimaryShape().getPackageableElementFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((ModelPackageableElementCompartmentEditPartCN) childEditPart).getFigure()); return true; } - //Papyrus Gencode :precise the locator for a template signature + + + // Papyrus Gencode :precise the locator for a template signature if (childEditPart instanceof RedefinableTemplateSignatureEditPart) { IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST); - getBorderedFigure().getBorderItemContainer() - .add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator); + getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator); return true; } - //Papyrus Gencode :precise the locator for a template signature + + + + // Papyrus Gencode :precise the locator for a template signature if (childEditPart instanceof TemplateSignatureEditPart) { IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST); - getBorderedFigure().getBorderItemContainer().add(((TemplateSignatureEditPart) childEditPart).getFigure(), - locator); + getBorderedFigure().getBorderItemContainer().add(((TemplateSignatureEditPart) childEditPart).getFigure(), locator); return true; } + return false; } @@ -212,13 +221,11 @@ public class ModelEditPartCN extends PackageEditPart { return true; } if (childEditPart instanceof RedefinableTemplateSignatureEditPart) { - getBorderedFigure().getBorderItemContainer() - .remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure()); + getBorderedFigure().getBorderItemContainer().remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure()); return true; } if (childEditPart instanceof TemplateSignatureEditPart) { - getBorderedFigure().getBorderItemContainer() - .remove(((TemplateSignatureEditPart) childEditPart).getFigure()); + getBorderedFigure().getBorderItemContainer().remove(((TemplateSignatureEditPart) childEditPart).getFigure()); return true; } return false; @@ -227,6 +234,7 @@ public class ModelEditPartCN extends PackageEditPart { /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -237,6 +245,7 @@ public class ModelEditPartCN extends PackageEditPart { /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -247,6 +256,7 @@ public class ModelEditPartCN extends PackageEditPart { /** * @generated */ + @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { if (editPart instanceof ModelPackageableElementCompartmentEditPartCN) { return getPrimaryShape().getPackageableElementFigure(); @@ -260,6 +270,7 @@ public class ModelEditPartCN extends PackageEditPart { /** * @generated */ + @Override protected NodeFigure createNodePlate() { RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(200, 100); return result; @@ -267,12 +278,13 @@ public class ModelEditPartCN extends PackageEditPart { /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected NodeFigure createMainFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); @@ -281,9 +293,12 @@ public class ModelEditPartCN extends PackageEditPart { /** * Default implementation treats passed figure as content pane. * Respects layout one may have set for generated figure. - * @param nodeShape instance of generated figure class + * + * @param nodeShape + * instance of generated figure class * @generated */ + @Override protected IFigure setupContentPane(IFigure nodeShape) { if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); @@ -296,6 +311,7 @@ public class ModelEditPartCN extends PackageEditPart { /** * @generated */ + @Override public IFigure getContentPane() { if (contentPane != null) { return contentPane; @@ -306,6 +322,7 @@ public class ModelEditPartCN extends PackageEditPart { /** * @generated */ + @Override protected void setForegroundColor(Color color) { if (primaryShape != null) { primaryShape.setForegroundColor(color); @@ -315,6 +332,7 @@ public class ModelEditPartCN extends PackageEditPart { /** * @generated */ + @Override protected void setLineWidth(int width) { super.setLineWidth(width); } @@ -322,6 +340,7 @@ public class ModelEditPartCN extends PackageEditPart { /** * @generated */ + @Override protected void setLineType(int style) { if (primaryShape instanceof IPapyrusNodeFigure) { ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); @@ -331,6 +350,7 @@ public class ModelEditPartCN extends PackageEditPart { /** * @generated */ + @Override public EditPart getPrimaryChildEditPart() { return getChildBySemanticHint(UMLVisualIDRegistry.getType(ModelNameEditPartCN.VISUAL_ID)); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPartTN.java index 11b18f1af3a..ee254892aa6 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPartTN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPartTN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -80,6 +80,7 @@ public class ModelEditPartTN extends PackageEditPart { /** * @generated */ + @Override protected void createDefaultEditPolicies() { installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); super.createDefaultEditPolicies(); @@ -88,16 +89,14 @@ public class ModelEditPartTN extends PackageEditPart { installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelCanonicalEditPolicyTN()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelCanonicalEditPolicyTN()); installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); - installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, - new ShowHideCompartmentEditPolicy()); + installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE); @@ -141,9 +140,11 @@ public class ModelEditPartTN extends PackageEditPart { } /** - *Papyrus codeGen - *@generated - **/ + * Papyrus codeGen + * + * @generated + **/ + @Override protected void handleNotificationEvent(Notification event) { super.handleNotificationEvent(event); @@ -152,14 +153,17 @@ public class ModelEditPartTN extends PackageEditPart { /** * @generated */ + @Override protected IFigure createNodeShape() { return primaryShape = new PackageFigure(); } /** * org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure + * * @generated */ + @Override public PackageFigure getPrimaryShape() { return (PackageFigure) primaryShape; } @@ -173,29 +177,34 @@ public class ModelEditPartTN extends PackageEditPart { return true; } + if (childEditPart instanceof ModelPackageableElementCompartmentEditPartTN) { IFigure pane = getPrimaryShape().getPackageableElementFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((ModelPackageableElementCompartmentEditPartTN) childEditPart).getFigure()); return true; } - //Papyrus Gencode :precise the locator for a template signature + + + // Papyrus Gencode :precise the locator for a template signature if (childEditPart instanceof RedefinableTemplateSignatureEditPart) { IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST); - getBorderedFigure().getBorderItemContainer() - .add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator); + getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator); return true; } - //Papyrus Gencode :precise the locator for a template signature + + + + // Papyrus Gencode :precise the locator for a template signature if (childEditPart instanceof TemplateSignatureEditPart) { IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST); - getBorderedFigure().getBorderItemContainer().add(((TemplateSignatureEditPart) childEditPart).getFigure(), - locator); + getBorderedFigure().getBorderItemContainer().add(((TemplateSignatureEditPart) childEditPart).getFigure(), locator); return true; } + return false; } @@ -212,13 +221,11 @@ public class ModelEditPartTN extends PackageEditPart { return true; } if (childEditPart instanceof RedefinableTemplateSignatureEditPart) { - getBorderedFigure().getBorderItemContainer() - .remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure()); + getBorderedFigure().getBorderItemContainer().remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure()); return true; } if (childEditPart instanceof TemplateSignatureEditPart) { - getBorderedFigure().getBorderItemContainer() - .remove(((TemplateSignatureEditPart) childEditPart).getFigure()); + getBorderedFigure().getBorderItemContainer().remove(((TemplateSignatureEditPart) childEditPart).getFigure()); return true; } return false; @@ -227,6 +234,7 @@ public class ModelEditPartTN extends PackageEditPart { /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -237,6 +245,7 @@ public class ModelEditPartTN extends PackageEditPart { /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -247,6 +256,7 @@ public class ModelEditPartTN extends PackageEditPart { /** * @generated */ + @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { if (editPart instanceof ModelPackageableElementCompartmentEditPartTN) { return getPrimaryShape().getPackageableElementFigure(); @@ -260,6 +270,7 @@ public class ModelEditPartTN extends PackageEditPart { /** * @generated */ + @Override protected NodeFigure createNodePlate() { RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(200, 100); return result; @@ -267,12 +278,13 @@ public class ModelEditPartTN extends PackageEditPart { /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected NodeFigure createMainFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); @@ -281,9 +293,12 @@ public class ModelEditPartTN extends PackageEditPart { /** * Default implementation treats passed figure as content pane. * Respects layout one may have set for generated figure. - * @param nodeShape instance of generated figure class + * + * @param nodeShape + * instance of generated figure class * @generated */ + @Override protected IFigure setupContentPane(IFigure nodeShape) { if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); @@ -296,6 +311,7 @@ public class ModelEditPartTN extends PackageEditPart { /** * @generated */ + @Override public IFigure getContentPane() { if (contentPane != null) { return contentPane; @@ -306,6 +322,7 @@ public class ModelEditPartTN extends PackageEditPart { /** * @generated */ + @Override protected void setForegroundColor(Color color) { if (primaryShape != null) { primaryShape.setForegroundColor(color); @@ -315,6 +332,7 @@ public class ModelEditPartTN extends PackageEditPart { /** * @generated */ + @Override protected void setLineWidth(int width) { super.setLineWidth(width); } @@ -322,6 +340,7 @@ public class ModelEditPartTN extends PackageEditPart { /** * @generated */ + @Override protected void setLineType(int style) { if (primaryShape instanceof IPapyrusNodeFigure) { ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); @@ -331,6 +350,7 @@ public class ModelEditPartTN extends PackageEditPart { /** * @generated */ + @Override public EditPart getPrimaryChildEditPart() { return getChildBySemanticHint(UMLVisualIDRegistry.getType(ModelNameEditPartTN.VISUAL_ID)); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelNameEditPartCN.java index 9d81379789e..c188056ce37 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelNameEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelNameEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,20 +64,12 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -115,12 +113,14 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -135,6 +135,7 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy()); @@ -208,6 +209,7 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -215,6 +217,7 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -222,6 +225,7 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -237,8 +241,7 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -248,7 +251,8 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -260,6 +264,7 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -275,11 +280,13 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -293,6 +300,7 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -302,13 +310,12 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), ModelNameEditPartCN.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ModelNameEditPartCN.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -326,6 +333,7 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -336,6 +344,7 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -343,6 +352,7 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Model_Shape_CN, getParserElement(), this, VISUAL_ID); @@ -405,6 +415,7 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -432,18 +443,13 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -455,8 +461,7 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -482,10 +487,9 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -501,6 +505,7 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -542,7 +547,8 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -559,7 +565,8 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -568,11 +575,15 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -580,6 +591,7 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -587,6 +599,7 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -602,6 +615,7 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -615,6 +629,7 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -637,7 +652,7 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -656,7 +671,7 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -669,7 +684,7 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -679,43 +694,42 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -724,13 +738,11 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -747,6 +759,7 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -755,6 +768,7 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -763,6 +777,7 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); @@ -773,10 +788,10 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -793,8 +808,7 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } super.handleNotificationEvent(event); @@ -803,6 +817,7 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -816,6 +831,7 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void activate() { super.activate(); addOwnerElementListeners(); @@ -832,6 +848,7 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void deactivate() { removeOwnerElementListeners(); super.deactivate(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelNameEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelNameEditPartTN.java index 4aca0f292b2..7da32f577d1 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelNameEditPartTN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelNameEditPartTN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,20 +64,12 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -115,12 +113,14 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -135,6 +135,7 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy()); @@ -208,6 +209,7 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -215,6 +217,7 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -222,6 +225,7 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -237,8 +241,7 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -248,7 +251,8 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -260,6 +264,7 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -275,11 +280,13 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -293,6 +300,7 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -302,13 +310,12 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), ModelNameEditPartTN.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ModelNameEditPartTN.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -326,6 +333,7 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -336,6 +344,7 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -343,6 +352,7 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Model_Shape, getParserElement(), this, VISUAL_ID); @@ -405,6 +415,7 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -432,18 +443,13 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -455,8 +461,7 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -482,10 +487,9 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -501,6 +505,7 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -542,7 +547,8 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -559,7 +565,8 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -568,11 +575,15 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -580,6 +591,7 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -587,6 +599,7 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -602,6 +615,7 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -615,6 +629,7 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -637,7 +652,7 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -656,7 +671,7 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -669,7 +684,7 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -679,43 +694,42 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -724,13 +738,11 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -747,6 +759,7 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -755,6 +768,7 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -763,6 +777,7 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); @@ -773,10 +788,10 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -793,8 +808,7 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } super.handleNotificationEvent(event); @@ -803,6 +817,7 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -816,6 +831,7 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void activate() { super.activate(); addOwnerElementListeners(); @@ -832,6 +848,7 @@ public class ModelNameEditPartTN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void deactivate() { removeOwnerElementListeners(); super.deactivate(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelPackageableElementCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelPackageableElementCompartmentEditPartCN.java index e8dec68802b..7a328426717 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelPackageableElementCompartmentEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelPackageableElementCompartmentEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -33,7 +33,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEdit import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.AbstractPackageableElementCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomContainmentCreationEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -58,6 +57,7 @@ public class ModelPackageableElementCompartmentEditPartCN extends AbstractPackag /** * @generated */ + @Override public String getCompartmentName() { return Messages.ModelPackageableElementCompartmentEditPartCN_title; } @@ -65,6 +65,7 @@ public class ModelPackageableElementCompartmentEditPartCN extends AbstractPackag /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -72,10 +73,9 @@ public class ModelPackageableElementCompartmentEditPartCN extends AbstractPackag installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelPackageableElementCompartmentCanonicalEditPolicyCN()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelPackageableElementCompartmentCanonicalEditPolicyCN()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy()); installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CustomContainmentCreationEditPolicy()); @@ -85,6 +85,7 @@ public class ModelPackageableElementCompartmentEditPartCN extends AbstractPackag /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -94,6 +95,7 @@ public class ModelPackageableElementCompartmentEditPartCN extends AbstractPackag /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -102,6 +104,7 @@ public class ModelPackageableElementCompartmentEditPartCN extends AbstractPackag /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -123,12 +126,16 @@ public class ModelPackageableElementCompartmentEditPartCN extends AbstractPackag int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelPackageableElementCompartmentEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelPackageableElementCompartmentEditPartTN.java index 7125979167e..ca61810cc65 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelPackageableElementCompartmentEditPartTN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelPackageableElementCompartmentEditPartTN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -33,7 +33,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEdit import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.AbstractPackageableElementCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomContainmentCreationEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -58,6 +57,7 @@ public class ModelPackageableElementCompartmentEditPartTN extends AbstractPackag /** * @generated */ + @Override public String getCompartmentName() { return Messages.ModelPackageableElementCompartmentEditPartTN_title; } @@ -65,6 +65,7 @@ public class ModelPackageableElementCompartmentEditPartTN extends AbstractPackag /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -72,10 +73,9 @@ public class ModelPackageableElementCompartmentEditPartTN extends AbstractPackag installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelPackageableElementCompartmentCanonicalEditPolicyTN()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ModelPackageableElementCompartmentCanonicalEditPolicyTN()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy()); installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CustomContainmentCreationEditPolicy()); @@ -85,6 +85,7 @@ public class ModelPackageableElementCompartmentEditPartTN extends AbstractPackag /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -94,6 +95,7 @@ public class ModelPackageableElementCompartmentEditPartTN extends AbstractPackag /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -102,6 +104,7 @@ public class ModelPackageableElementCompartmentEditPartTN extends AbstractPackag /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -123,12 +126,16 @@ public class ModelPackageableElementCompartmentEditPartTN extends AbstractPackag int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/MultiDependencyLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/MultiDependencyLabelEditPart.java index 14751978176..cee03b71a9a 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/MultiDependencyLabelEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/MultiDependencyLabelEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -50,6 +50,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -60,12 +66,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -115,12 +115,14 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -129,10 +131,7 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.MultiDependencyLabelEditPart.VISUAL_ID), - new Point(0, 0)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.MultiDependencyLabelEditPart.VISUAL_ID), new Point(0, 0)); } /** @@ -145,6 +144,7 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); @@ -155,6 +155,7 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IBorderItemLocator getBorderItemLocator() { IFigure parentFigure = getFigure().getParent(); if (parentFigure != null && parentFigure.getLayoutManager() != null) { @@ -167,6 +168,7 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void refreshBounds() { int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); @@ -241,6 +243,7 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -248,6 +251,7 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -280,7 +284,8 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -292,6 +297,7 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -307,11 +313,13 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -325,6 +333,7 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -334,14 +343,12 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), - MultiDependencyLabelEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), MultiDependencyLabelEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -359,6 +366,7 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -369,6 +377,7 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -376,6 +385,7 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Dependency_Shape, getParserElement(), this, VISUAL_ID); @@ -438,6 +448,7 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -465,18 +476,13 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -488,8 +494,7 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -515,10 +520,9 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -534,6 +538,7 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -575,7 +580,8 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -592,7 +598,8 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -601,11 +608,15 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -613,6 +624,7 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -620,6 +632,7 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -635,6 +648,7 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -648,6 +662,7 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -670,7 +685,7 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -689,7 +704,7 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -702,7 +717,7 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -712,43 +727,42 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -757,13 +771,11 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -780,6 +792,7 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -789,10 +802,10 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -815,6 +828,7 @@ public class MultiDependencyLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedClassForClassEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedClassForClassEditPart.java index ddf47f2fca1..f59298d9383 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedClassForClassEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedClassForClassEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -54,6 +54,13 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -64,14 +71,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeNestedLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedLabelMaskManagedEditPolicy; @@ -83,7 +82,6 @@ import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -128,12 +126,14 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -148,6 +148,7 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -158,6 +159,7 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); @@ -165,10 +167,8 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); - installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNestedLabelDisplayEditPolicy()); - installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, - new NestedLabelMaskManagedEditPolicy()); + installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNestedLabelDisplayEditPolicy()); + installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new NestedLabelMaskManagedEditPolicy()); } /** @@ -237,6 +237,7 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -244,6 +245,7 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -251,6 +253,7 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -266,8 +269,7 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -277,7 +279,8 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -289,6 +292,7 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -304,11 +308,13 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -322,6 +328,7 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -331,13 +338,12 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), NestedClassForClassEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), NestedClassForClassEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -355,6 +361,7 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -365,6 +372,7 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -372,10 +380,10 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.Class_ClassNestedClassifierLabel, getParserElement(), this, - VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.Class_ClassNestedClassifierLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -435,6 +443,7 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -462,18 +471,13 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -485,8 +489,7 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -512,10 +515,9 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -531,6 +533,7 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -572,7 +575,8 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -589,7 +593,8 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -598,11 +603,15 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -610,6 +619,7 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -617,6 +627,7 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -632,6 +643,7 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -645,6 +657,7 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -667,7 +680,7 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -686,7 +699,7 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -699,7 +712,7 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -709,43 +722,42 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -754,13 +766,11 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -777,6 +787,7 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -785,6 +796,7 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -793,6 +805,7 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -802,10 +815,10 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -822,8 +835,7 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) { @@ -835,6 +847,7 @@ public class NestedClassForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedClassForComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedClassForComponentEditPart.java index 5a5c6a5faa1..12df8e967af 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedClassForComponentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedClassForComponentEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -54,6 +54,13 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -64,14 +71,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeNestedLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedLabelMaskManagedEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy; @@ -82,7 +81,6 @@ import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -127,12 +125,14 @@ public class NestedClassForComponentEditPart extends UMLCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -147,6 +147,7 @@ public class NestedClassForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -157,16 +158,15 @@ public class NestedClassForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy()); installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); - installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNestedLabelDisplayEditPolicy()); - installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, - new NestedLabelMaskManagedEditPolicy()); + installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNestedLabelDisplayEditPolicy()); + installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new NestedLabelMaskManagedEditPolicy()); } /** @@ -235,6 +235,7 @@ public class NestedClassForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -242,6 +243,7 @@ public class NestedClassForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -249,6 +251,7 @@ public class NestedClassForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -264,8 +267,7 @@ public class NestedClassForComponentEditPart extends UMLCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -275,7 +277,8 @@ public class NestedClassForComponentEditPart extends UMLCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -287,6 +290,7 @@ public class NestedClassForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -302,11 +306,13 @@ public class NestedClassForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -320,6 +326,7 @@ public class NestedClassForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -329,14 +336,12 @@ public class NestedClassForComponentEditPart extends UMLCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), - NestedClassForComponentEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), NestedClassForComponentEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -354,6 +359,7 @@ public class NestedClassForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -364,6 +370,7 @@ public class NestedClassForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -371,10 +378,10 @@ public class NestedClassForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.Class_ComponentNestedClassifierLabel, getParserElement(), - this, VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.Class_ComponentNestedClassifierLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -434,6 +441,7 @@ public class NestedClassForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -461,18 +469,13 @@ public class NestedClassForComponentEditPart extends UMLCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -484,8 +487,7 @@ public class NestedClassForComponentEditPart extends UMLCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -511,10 +513,9 @@ public class NestedClassForComponentEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -530,6 +531,7 @@ public class NestedClassForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -571,7 +573,8 @@ public class NestedClassForComponentEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -588,7 +591,8 @@ public class NestedClassForComponentEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -597,11 +601,15 @@ public class NestedClassForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -609,6 +617,7 @@ public class NestedClassForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -616,6 +625,7 @@ public class NestedClassForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -631,6 +641,7 @@ public class NestedClassForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -644,6 +655,7 @@ public class NestedClassForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -666,7 +678,7 @@ public class NestedClassForComponentEditPart extends UMLCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -685,7 +697,7 @@ public class NestedClassForComponentEditPart extends UMLCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -698,7 +710,7 @@ public class NestedClassForComponentEditPart extends UMLCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -708,43 +720,42 @@ public class NestedClassForComponentEditPart extends UMLCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -753,13 +764,11 @@ public class NestedClassForComponentEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -776,6 +785,7 @@ public class NestedClassForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -784,6 +794,7 @@ public class NestedClassForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -792,6 +803,7 @@ public class NestedClassForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -801,10 +813,10 @@ public class NestedClassForComponentEditPart extends UMLCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -821,8 +833,7 @@ public class NestedClassForComponentEditPart extends UMLCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) { @@ -834,6 +845,7 @@ public class NestedClassForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedClassForInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedClassForInterfaceEditPart.java index 7b31bda24ed..7aff270072f 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedClassForInterfaceEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedClassForInterfaceEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -54,6 +54,13 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -64,14 +71,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeNestedLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedLabelMaskManagedEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy; @@ -82,7 +81,6 @@ import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -127,12 +125,14 @@ public class NestedClassForInterfaceEditPart extends UMLCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -147,6 +147,7 @@ public class NestedClassForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -157,16 +158,15 @@ public class NestedClassForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy()); installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); - installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNestedLabelDisplayEditPolicy()); - installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, - new NestedLabelMaskManagedEditPolicy()); + installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNestedLabelDisplayEditPolicy()); + installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new NestedLabelMaskManagedEditPolicy()); } /** @@ -235,6 +235,7 @@ public class NestedClassForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -242,6 +243,7 @@ public class NestedClassForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -249,6 +251,7 @@ public class NestedClassForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -264,8 +267,7 @@ public class NestedClassForInterfaceEditPart extends UMLCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -275,7 +277,8 @@ public class NestedClassForInterfaceEditPart extends UMLCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -287,6 +290,7 @@ public class NestedClassForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -302,11 +306,13 @@ public class NestedClassForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -320,6 +326,7 @@ public class NestedClassForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -329,14 +336,12 @@ public class NestedClassForInterfaceEditPart extends UMLCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), - NestedClassForInterfaceEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), NestedClassForInterfaceEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -354,6 +359,7 @@ public class NestedClassForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -364,6 +370,7 @@ public class NestedClassForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -371,10 +378,10 @@ public class NestedClassForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.Class_InterfaceNestedClassifierLabel, getParserElement(), - this, VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.Class_InterfaceNestedClassifierLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -434,6 +441,7 @@ public class NestedClassForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -461,18 +469,13 @@ public class NestedClassForInterfaceEditPart extends UMLCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -484,8 +487,7 @@ public class NestedClassForInterfaceEditPart extends UMLCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -511,10 +513,9 @@ public class NestedClassForInterfaceEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -530,6 +531,7 @@ public class NestedClassForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -571,7 +573,8 @@ public class NestedClassForInterfaceEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -588,7 +591,8 @@ public class NestedClassForInterfaceEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -597,11 +601,15 @@ public class NestedClassForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -609,6 +617,7 @@ public class NestedClassForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -616,6 +625,7 @@ public class NestedClassForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -631,6 +641,7 @@ public class NestedClassForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -644,6 +655,7 @@ public class NestedClassForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -666,7 +678,7 @@ public class NestedClassForInterfaceEditPart extends UMLCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -685,7 +697,7 @@ public class NestedClassForInterfaceEditPart extends UMLCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -698,7 +710,7 @@ public class NestedClassForInterfaceEditPart extends UMLCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -708,43 +720,42 @@ public class NestedClassForInterfaceEditPart extends UMLCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -753,13 +764,11 @@ public class NestedClassForInterfaceEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -776,6 +785,7 @@ public class NestedClassForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -784,6 +794,7 @@ public class NestedClassForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -792,6 +803,7 @@ public class NestedClassForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -801,10 +813,10 @@ public class NestedClassForInterfaceEditPart extends UMLCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -821,8 +833,7 @@ public class NestedClassForInterfaceEditPart extends UMLCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) { @@ -834,6 +845,7 @@ public class NestedClassForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedComponentForClassEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedComponentForClassEditPart.java index 354dd377bfe..2c28006641e 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedComponentForClassEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedComponentForClassEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -54,6 +54,13 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -64,14 +71,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeNestedLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedLabelMaskManagedEditPolicy; @@ -83,7 +82,6 @@ import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -128,12 +126,14 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -148,6 +148,7 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -158,6 +159,7 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); @@ -165,10 +167,8 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); - installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNestedLabelDisplayEditPolicy()); - installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, - new NestedLabelMaskManagedEditPolicy()); + installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNestedLabelDisplayEditPolicy()); + installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new NestedLabelMaskManagedEditPolicy()); } /** @@ -237,6 +237,7 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -244,6 +245,7 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -251,6 +253,7 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -266,8 +269,7 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -277,7 +279,8 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -289,6 +292,7 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -304,11 +308,13 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -322,6 +328,7 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -331,14 +338,12 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), - NestedComponentForClassEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), NestedComponentForClassEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -356,6 +361,7 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -366,6 +372,7 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -373,10 +380,10 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.Component_ClassNestedClassifierLabel, getParserElement(), - this, VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.Component_ClassNestedClassifierLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -436,6 +443,7 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -463,18 +471,13 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -486,8 +489,7 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -513,10 +515,9 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -532,6 +533,7 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -573,7 +575,8 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -590,7 +593,8 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -599,11 +603,15 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -611,6 +619,7 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -618,6 +627,7 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -633,6 +643,7 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -646,6 +657,7 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -668,7 +680,7 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -687,7 +699,7 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -700,7 +712,7 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -710,43 +722,42 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -755,13 +766,11 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -778,6 +787,7 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -786,6 +796,7 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -794,6 +805,7 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -803,10 +815,10 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -823,8 +835,7 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) { @@ -836,6 +847,7 @@ public class NestedComponentForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedComponentForComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedComponentForComponentEditPart.java index f785524830c..5f2bdcce1bd 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedComponentForComponentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedComponentForComponentEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -54,6 +54,13 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -64,14 +71,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeNestedLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedLabelMaskManagedEditPolicy; @@ -83,7 +82,6 @@ import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -128,12 +126,14 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -148,6 +148,7 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -158,6 +159,7 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); @@ -165,10 +167,8 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); - installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNestedLabelDisplayEditPolicy()); - installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, - new NestedLabelMaskManagedEditPolicy()); + installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNestedLabelDisplayEditPolicy()); + installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new NestedLabelMaskManagedEditPolicy()); } /** @@ -237,6 +237,7 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -244,6 +245,7 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -251,6 +253,7 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -266,8 +269,7 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -277,7 +279,8 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -289,6 +292,7 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -304,11 +308,13 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -322,6 +328,7 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -331,16 +338,12 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - NestedComponentForComponentEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), NestedComponentForComponentEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -358,6 +361,7 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -368,6 +372,7 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -375,10 +380,10 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.Component_ComponentNestedClassifierLabel, getParserElement(), - this, VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.Component_ComponentNestedClassifierLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -438,6 +443,7 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -465,18 +471,13 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -488,8 +489,7 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -515,10 +515,9 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -534,6 +533,7 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -575,7 +575,8 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -592,7 +593,8 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -601,11 +603,15 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -613,6 +619,7 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -620,6 +627,7 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -635,6 +643,7 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -648,6 +657,7 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -670,7 +680,7 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -689,7 +699,7 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -702,7 +712,7 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -712,43 +722,42 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -757,13 +766,11 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -780,6 +787,7 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -788,6 +796,7 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -796,6 +805,7 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -805,10 +815,10 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -825,8 +835,7 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) { @@ -838,6 +847,7 @@ public class NestedComponentForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedComponentForInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedComponentForInterfaceEditPart.java index 6b8cdf185a0..64deb6384d5 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedComponentForInterfaceEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedComponentForInterfaceEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -54,6 +54,13 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -64,14 +71,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeNestedLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedLabelMaskManagedEditPolicy; @@ -83,7 +82,6 @@ import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -128,12 +126,14 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -148,6 +148,7 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -158,6 +159,7 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); @@ -165,10 +167,8 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); - installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNestedLabelDisplayEditPolicy()); - installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, - new NestedLabelMaskManagedEditPolicy()); + installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNestedLabelDisplayEditPolicy()); + installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new NestedLabelMaskManagedEditPolicy()); } /** @@ -237,6 +237,7 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -244,6 +245,7 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -251,6 +253,7 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -266,8 +269,7 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -277,7 +279,8 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -289,6 +292,7 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -304,11 +308,13 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -322,6 +328,7 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -331,16 +338,12 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - NestedComponentForInterfaceEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), NestedComponentForInterfaceEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -358,6 +361,7 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -368,6 +372,7 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -375,10 +380,10 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.Component_InterfaceNestedClassifierLabel, getParserElement(), - this, VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.Component_InterfaceNestedClassifierLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -438,6 +443,7 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -465,18 +471,13 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -488,8 +489,7 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -515,10 +515,9 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -534,6 +533,7 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -575,7 +575,8 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -592,7 +593,8 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -601,11 +603,15 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -613,6 +619,7 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -620,6 +627,7 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -635,6 +643,7 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -648,6 +657,7 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -670,7 +680,7 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -689,7 +699,7 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -702,7 +712,7 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -712,43 +722,42 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -757,13 +766,11 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -780,6 +787,7 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -788,6 +796,7 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -796,6 +805,7 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -805,10 +815,10 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -825,8 +835,7 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) { @@ -838,6 +847,7 @@ public class NestedComponentForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedDataTypeForClassEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedDataTypeForClassEditPart.java index 14ebcbc36a7..ed1b56790ae 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedDataTypeForClassEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedDataTypeForClassEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -54,6 +54,13 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -64,14 +71,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeNestedLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedLabelMaskManagedEditPolicy; @@ -83,7 +82,6 @@ import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -128,12 +126,14 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -148,6 +148,7 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -158,6 +159,7 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); @@ -165,10 +167,8 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); - installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNestedLabelDisplayEditPolicy()); - installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, - new NestedLabelMaskManagedEditPolicy()); + installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNestedLabelDisplayEditPolicy()); + installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new NestedLabelMaskManagedEditPolicy()); } /** @@ -237,6 +237,7 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -244,6 +245,7 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -251,6 +253,7 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -266,8 +269,7 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -277,7 +279,8 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -289,6 +292,7 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -304,11 +308,13 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -322,6 +328,7 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -331,14 +338,12 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), - NestedDataTypeForClassEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), NestedDataTypeForClassEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -356,6 +361,7 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -366,6 +372,7 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -373,10 +380,10 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.DataType_ClassNestedClassifierLabel, getParserElement(), this, - VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.DataType_ClassNestedClassifierLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -436,6 +443,7 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -463,18 +471,13 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -486,8 +489,7 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -513,10 +515,9 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -532,6 +533,7 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -573,7 +575,8 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -590,7 +593,8 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -599,11 +603,15 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -611,6 +619,7 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -618,6 +627,7 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -633,6 +643,7 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -646,6 +657,7 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -668,7 +680,7 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -687,7 +699,7 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -700,7 +712,7 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -710,43 +722,42 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -755,13 +766,11 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -778,6 +787,7 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -786,6 +796,7 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -794,6 +805,7 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -803,10 +815,10 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -823,8 +835,7 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) { @@ -836,6 +847,7 @@ public class NestedDataTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedDataTypeForComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedDataTypeForComponentEditPart.java index e41d9c87d5f..7f28ea438b2 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedDataTypeForComponentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedDataTypeForComponentEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -54,6 +54,13 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -64,14 +71,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeNestedLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedLabelMaskManagedEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy; @@ -82,7 +81,6 @@ import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -127,12 +125,14 @@ public class NestedDataTypeForComponentEditPart extends UMLCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -147,6 +147,7 @@ public class NestedDataTypeForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -157,16 +158,15 @@ public class NestedDataTypeForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy()); installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); - installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNestedLabelDisplayEditPolicy()); - installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, - new NestedLabelMaskManagedEditPolicy()); + installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNestedLabelDisplayEditPolicy()); + installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new NestedLabelMaskManagedEditPolicy()); } /** @@ -235,6 +235,7 @@ public class NestedDataTypeForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -242,6 +243,7 @@ public class NestedDataTypeForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -249,6 +251,7 @@ public class NestedDataTypeForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -264,8 +267,7 @@ public class NestedDataTypeForComponentEditPart extends UMLCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -275,7 +277,8 @@ public class NestedDataTypeForComponentEditPart extends UMLCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -287,6 +290,7 @@ public class NestedDataTypeForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -302,11 +306,13 @@ public class NestedDataTypeForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -320,6 +326,7 @@ public class NestedDataTypeForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -329,16 +336,12 @@ public class NestedDataTypeForComponentEditPart extends UMLCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - NestedDataTypeForComponentEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), NestedDataTypeForComponentEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -356,6 +359,7 @@ public class NestedDataTypeForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -366,6 +370,7 @@ public class NestedDataTypeForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -373,10 +378,10 @@ public class NestedDataTypeForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.DataType_ComponentNestedClassifierLabel, getParserElement(), - this, VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.DataType_ComponentNestedClassifierLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -436,6 +441,7 @@ public class NestedDataTypeForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -463,18 +469,13 @@ public class NestedDataTypeForComponentEditPart extends UMLCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -486,8 +487,7 @@ public class NestedDataTypeForComponentEditPart extends UMLCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -513,10 +513,9 @@ public class NestedDataTypeForComponentEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -532,6 +531,7 @@ public class NestedDataTypeForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -573,7 +573,8 @@ public class NestedDataTypeForComponentEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -590,7 +591,8 @@ public class NestedDataTypeForComponentEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -599,11 +601,15 @@ public class NestedDataTypeForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -611,6 +617,7 @@ public class NestedDataTypeForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -618,6 +625,7 @@ public class NestedDataTypeForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -633,6 +641,7 @@ public class NestedDataTypeForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -646,6 +655,7 @@ public class NestedDataTypeForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -668,7 +678,7 @@ public class NestedDataTypeForComponentEditPart extends UMLCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -687,7 +697,7 @@ public class NestedDataTypeForComponentEditPart extends UMLCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -700,7 +710,7 @@ public class NestedDataTypeForComponentEditPart extends UMLCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -710,43 +720,42 @@ public class NestedDataTypeForComponentEditPart extends UMLCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -755,13 +764,11 @@ public class NestedDataTypeForComponentEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -778,6 +785,7 @@ public class NestedDataTypeForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -786,6 +794,7 @@ public class NestedDataTypeForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -794,6 +803,7 @@ public class NestedDataTypeForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -803,10 +813,10 @@ public class NestedDataTypeForComponentEditPart extends UMLCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -823,8 +833,7 @@ public class NestedDataTypeForComponentEditPart extends UMLCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) { @@ -836,6 +845,7 @@ public class NestedDataTypeForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedDataTypeForInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedDataTypeForInterfaceEditPart.java index 44365a3ef0a..07f8d820f45 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedDataTypeForInterfaceEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedDataTypeForInterfaceEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -54,6 +54,13 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -64,14 +71,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeNestedLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedLabelMaskManagedEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy; @@ -82,7 +81,6 @@ import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -127,12 +125,14 @@ public class NestedDataTypeForInterfaceEditPart extends UMLCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -147,6 +147,7 @@ public class NestedDataTypeForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -157,16 +158,15 @@ public class NestedDataTypeForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy()); installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); - installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNestedLabelDisplayEditPolicy()); - installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, - new NestedLabelMaskManagedEditPolicy()); + installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNestedLabelDisplayEditPolicy()); + installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new NestedLabelMaskManagedEditPolicy()); } /** @@ -235,6 +235,7 @@ public class NestedDataTypeForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -242,6 +243,7 @@ public class NestedDataTypeForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -249,6 +251,7 @@ public class NestedDataTypeForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -264,8 +267,7 @@ public class NestedDataTypeForInterfaceEditPart extends UMLCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -275,7 +277,8 @@ public class NestedDataTypeForInterfaceEditPart extends UMLCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -287,6 +290,7 @@ public class NestedDataTypeForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -302,11 +306,13 @@ public class NestedDataTypeForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -320,6 +326,7 @@ public class NestedDataTypeForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -329,16 +336,12 @@ public class NestedDataTypeForInterfaceEditPart extends UMLCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - NestedDataTypeForInterfaceEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), NestedDataTypeForInterfaceEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -356,6 +359,7 @@ public class NestedDataTypeForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -366,6 +370,7 @@ public class NestedDataTypeForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -373,10 +378,10 @@ public class NestedDataTypeForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.DataType_InterfaceNestedClassifierLabel, getParserElement(), - this, VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.DataType_InterfaceNestedClassifierLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -436,6 +441,7 @@ public class NestedDataTypeForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -463,18 +469,13 @@ public class NestedDataTypeForInterfaceEditPart extends UMLCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -486,8 +487,7 @@ public class NestedDataTypeForInterfaceEditPart extends UMLCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -513,10 +513,9 @@ public class NestedDataTypeForInterfaceEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -532,6 +531,7 @@ public class NestedDataTypeForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -573,7 +573,8 @@ public class NestedDataTypeForInterfaceEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -590,7 +591,8 @@ public class NestedDataTypeForInterfaceEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -599,11 +601,15 @@ public class NestedDataTypeForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -611,6 +617,7 @@ public class NestedDataTypeForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -618,6 +625,7 @@ public class NestedDataTypeForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -633,6 +641,7 @@ public class NestedDataTypeForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -646,6 +655,7 @@ public class NestedDataTypeForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -668,7 +678,7 @@ public class NestedDataTypeForInterfaceEditPart extends UMLCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -687,7 +697,7 @@ public class NestedDataTypeForInterfaceEditPart extends UMLCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -700,7 +710,7 @@ public class NestedDataTypeForInterfaceEditPart extends UMLCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -710,43 +720,42 @@ public class NestedDataTypeForInterfaceEditPart extends UMLCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -755,13 +764,11 @@ public class NestedDataTypeForInterfaceEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -778,6 +785,7 @@ public class NestedDataTypeForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -786,6 +794,7 @@ public class NestedDataTypeForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -794,6 +803,7 @@ public class NestedDataTypeForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -803,10 +813,10 @@ public class NestedDataTypeForInterfaceEditPart extends UMLCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -823,8 +833,7 @@ public class NestedDataTypeForInterfaceEditPart extends UMLCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) { @@ -836,6 +845,7 @@ public class NestedDataTypeForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedEnumerationForClassEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedEnumerationForClassEditPart.java index 3fe170e4b5a..5884d6fd606 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedEnumerationForClassEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedEnumerationForClassEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -54,6 +54,13 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -64,14 +71,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeNestedLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedLabelMaskManagedEditPolicy; @@ -83,7 +82,6 @@ import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -128,12 +126,14 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -148,6 +148,7 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -158,6 +159,7 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); @@ -165,10 +167,8 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); - installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNestedLabelDisplayEditPolicy()); - installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, - new NestedLabelMaskManagedEditPolicy()); + installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNestedLabelDisplayEditPolicy()); + installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new NestedLabelMaskManagedEditPolicy()); } /** @@ -237,6 +237,7 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -244,6 +245,7 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -251,6 +253,7 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -266,8 +269,7 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -277,7 +279,8 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -289,6 +292,7 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -304,11 +308,13 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -322,6 +328,7 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -331,16 +338,12 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - NestedEnumerationForClassEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), NestedEnumerationForClassEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -358,6 +361,7 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -368,6 +372,7 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -375,10 +380,10 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.Enumeration_ClassNestedClassifierLabel, getParserElement(), - this, VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.Enumeration_ClassNestedClassifierLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -438,6 +443,7 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -465,18 +471,13 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -488,8 +489,7 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -515,10 +515,9 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -534,6 +533,7 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -575,7 +575,8 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -592,7 +593,8 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -601,11 +603,15 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -613,6 +619,7 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -620,6 +627,7 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -635,6 +643,7 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -648,6 +657,7 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -670,7 +680,7 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -689,7 +699,7 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -702,7 +712,7 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -712,43 +722,42 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -757,13 +766,11 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -780,6 +787,7 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -788,6 +796,7 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -796,6 +805,7 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -805,10 +815,10 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -825,8 +835,7 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) { @@ -838,6 +847,7 @@ public class NestedEnumerationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedEnumerationForComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedEnumerationForComponentEditPart.java index e032028d257..240ef83609c 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedEnumerationForComponentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedEnumerationForComponentEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -54,6 +54,13 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -64,14 +71,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeNestedLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedLabelMaskManagedEditPolicy; @@ -83,7 +82,6 @@ import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -128,12 +126,14 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -148,6 +148,7 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -158,6 +159,7 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); @@ -165,10 +167,8 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); - installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNestedLabelDisplayEditPolicy()); - installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, - new NestedLabelMaskManagedEditPolicy()); + installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNestedLabelDisplayEditPolicy()); + installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new NestedLabelMaskManagedEditPolicy()); } /** @@ -237,6 +237,7 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -244,6 +245,7 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -251,6 +253,7 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -266,8 +269,7 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -277,7 +279,8 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -289,6 +292,7 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -304,11 +308,13 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -322,6 +328,7 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -331,16 +338,12 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - NestedEnumerationForComponentEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), NestedEnumerationForComponentEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -358,6 +361,7 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -368,6 +372,7 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -375,10 +380,10 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.Enumeration_ComponentNestedClassifierLabel, - getParserElement(), this, VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.Enumeration_ComponentNestedClassifierLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -438,6 +443,7 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -465,18 +471,13 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -488,8 +489,7 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -515,10 +515,9 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -534,6 +533,7 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -575,7 +575,8 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -592,7 +593,8 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -601,11 +603,15 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -613,6 +619,7 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -620,6 +627,7 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -635,6 +643,7 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -648,6 +657,7 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -670,7 +680,7 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -689,7 +699,7 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -702,7 +712,7 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -712,43 +722,42 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -757,13 +766,11 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -780,6 +787,7 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -788,6 +796,7 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -796,6 +805,7 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -805,10 +815,10 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -825,8 +835,7 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) { @@ -838,6 +847,7 @@ public class NestedEnumerationForComponentEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedEnumerationForInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedEnumerationForInterfaceEditPart.java index a0a1cab64c6..d762a3e98f1 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedEnumerationForInterfaceEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedEnumerationForInterfaceEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -54,6 +54,13 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -64,14 +71,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeNestedLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedLabelMaskManagedEditPolicy; @@ -83,7 +82,6 @@ import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -128,12 +126,14 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -148,6 +148,7 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -158,6 +159,7 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); @@ -165,10 +167,8 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); - installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNestedLabelDisplayEditPolicy()); - installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, - new NestedLabelMaskManagedEditPolicy()); + installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNestedLabelDisplayEditPolicy()); + installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new NestedLabelMaskManagedEditPolicy()); } /** @@ -237,6 +237,7 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -244,6 +245,7 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -251,6 +253,7 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -266,8 +269,7 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -277,7 +279,8 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -289,6 +292,7 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -304,11 +308,13 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -322,6 +328,7 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -331,16 +338,12 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - NestedEnumerationForInterfaceEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), NestedEnumerationForInterfaceEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -358,6 +361,7 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -368,6 +372,7 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -375,10 +380,10 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.Enumeration_InterfaceNestedClassifierLabel, - getParserElement(), this, VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.Enumeration_InterfaceNestedClassifierLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -438,6 +443,7 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -465,18 +471,13 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -488,8 +489,7 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -515,10 +515,9 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -534,6 +533,7 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -575,7 +575,8 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -592,7 +593,8 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -601,11 +603,15 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -613,6 +619,7 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -620,6 +627,7 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -635,6 +643,7 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -648,6 +657,7 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -670,7 +680,7 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -689,7 +699,7 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -702,7 +712,7 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -712,43 +722,42 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -757,13 +766,11 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -780,6 +787,7 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -788,6 +796,7 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -796,6 +805,7 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -805,10 +815,10 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -825,8 +835,7 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) { @@ -838,6 +847,7 @@ public class NestedEnumerationForInterfaceEditPart extends UMLCompartmentEditPar /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedInterfaceForClassEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedInterfaceForClassEditPart.java index 767676ec3c1..49f50031f15 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedInterfaceForClassEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedInterfaceForClassEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -54,6 +54,13 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -64,14 +71,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeNestedLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedLabelMaskManagedEditPolicy; @@ -83,7 +82,6 @@ import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -128,12 +126,14 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -148,6 +148,7 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -158,6 +159,7 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); @@ -165,10 +167,8 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); - installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNestedLabelDisplayEditPolicy()); - installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, - new NestedLabelMaskManagedEditPolicy()); + installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNestedLabelDisplayEditPolicy()); + installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new NestedLabelMaskManagedEditPolicy()); } /** @@ -237,6 +237,7 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -244,6 +245,7 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -251,6 +253,7 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -266,8 +269,7 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -277,7 +279,8 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -289,6 +292,7 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -304,11 +308,13 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -322,6 +328,7 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -331,14 +338,12 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), - NestedInterfaceForClassEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), NestedInterfaceForClassEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -356,6 +361,7 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -366,6 +372,7 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -373,10 +380,10 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.Interface_ClassNestedClassifierLabel, getParserElement(), - this, VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.Interface_ClassNestedClassifierLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -436,6 +443,7 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -463,18 +471,13 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -486,8 +489,7 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -513,10 +515,9 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -532,6 +533,7 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -573,7 +575,8 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -590,7 +593,8 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -599,11 +603,15 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -611,6 +619,7 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -618,6 +627,7 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -633,6 +643,7 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -646,6 +657,7 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -668,7 +680,7 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -687,7 +699,7 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -700,7 +712,7 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -710,43 +722,42 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -755,13 +766,11 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -778,6 +787,7 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -786,6 +796,7 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -794,6 +805,7 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -803,10 +815,10 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -823,8 +835,7 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) { @@ -836,6 +847,7 @@ public class NestedInterfaceForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedInterfaceForComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedInterfaceForComponentEditPart.java index 36cf17c3784..69c0666ae4d 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedInterfaceForComponentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedInterfaceForComponentEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -54,6 +54,13 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -64,14 +71,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeNestedLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedLabelMaskManagedEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy; @@ -82,7 +81,6 @@ import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -127,12 +125,14 @@ public class NestedInterfaceForComponentEditPart extends UMLCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -147,6 +147,7 @@ public class NestedInterfaceForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -157,16 +158,15 @@ public class NestedInterfaceForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy()); installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); - installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNestedLabelDisplayEditPolicy()); - installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, - new NestedLabelMaskManagedEditPolicy()); + installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNestedLabelDisplayEditPolicy()); + installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new NestedLabelMaskManagedEditPolicy()); } /** @@ -235,6 +235,7 @@ public class NestedInterfaceForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -242,6 +243,7 @@ public class NestedInterfaceForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -249,6 +251,7 @@ public class NestedInterfaceForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -264,8 +267,7 @@ public class NestedInterfaceForComponentEditPart extends UMLCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -275,7 +277,8 @@ public class NestedInterfaceForComponentEditPart extends UMLCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -287,6 +290,7 @@ public class NestedInterfaceForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -302,11 +306,13 @@ public class NestedInterfaceForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -320,6 +326,7 @@ public class NestedInterfaceForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -329,16 +336,12 @@ public class NestedInterfaceForComponentEditPart extends UMLCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - NestedInterfaceForComponentEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), NestedInterfaceForComponentEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -356,6 +359,7 @@ public class NestedInterfaceForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -366,6 +370,7 @@ public class NestedInterfaceForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -373,10 +378,10 @@ public class NestedInterfaceForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.Interface_ComponentNestedClassifierLabel, getParserElement(), - this, VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.Interface_ComponentNestedClassifierLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -436,6 +441,7 @@ public class NestedInterfaceForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -463,18 +469,13 @@ public class NestedInterfaceForComponentEditPart extends UMLCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -486,8 +487,7 @@ public class NestedInterfaceForComponentEditPart extends UMLCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -513,10 +513,9 @@ public class NestedInterfaceForComponentEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -532,6 +531,7 @@ public class NestedInterfaceForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -573,7 +573,8 @@ public class NestedInterfaceForComponentEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -590,7 +591,8 @@ public class NestedInterfaceForComponentEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -599,11 +601,15 @@ public class NestedInterfaceForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -611,6 +617,7 @@ public class NestedInterfaceForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -618,6 +625,7 @@ public class NestedInterfaceForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -633,6 +641,7 @@ public class NestedInterfaceForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -646,6 +655,7 @@ public class NestedInterfaceForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -668,7 +678,7 @@ public class NestedInterfaceForComponentEditPart extends UMLCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -687,7 +697,7 @@ public class NestedInterfaceForComponentEditPart extends UMLCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -700,7 +710,7 @@ public class NestedInterfaceForComponentEditPart extends UMLCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -710,43 +720,42 @@ public class NestedInterfaceForComponentEditPart extends UMLCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -755,13 +764,11 @@ public class NestedInterfaceForComponentEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -778,6 +785,7 @@ public class NestedInterfaceForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -786,6 +794,7 @@ public class NestedInterfaceForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -794,6 +803,7 @@ public class NestedInterfaceForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -803,10 +813,10 @@ public class NestedInterfaceForComponentEditPart extends UMLCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -823,8 +833,7 @@ public class NestedInterfaceForComponentEditPart extends UMLCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) { @@ -836,6 +845,7 @@ public class NestedInterfaceForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedInterfaceForInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedInterfaceForInterfaceEditPart.java index 65663d468a9..c5105ab6611 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedInterfaceForInterfaceEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedInterfaceForInterfaceEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -54,6 +54,13 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -64,14 +71,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeNestedLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedLabelMaskManagedEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy; @@ -82,7 +81,6 @@ import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -127,12 +125,14 @@ public class NestedInterfaceForInterfaceEditPart extends UMLCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -147,6 +147,7 @@ public class NestedInterfaceForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -157,16 +158,15 @@ public class NestedInterfaceForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy()); installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); - installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNestedLabelDisplayEditPolicy()); - installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, - new NestedLabelMaskManagedEditPolicy()); + installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNestedLabelDisplayEditPolicy()); + installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new NestedLabelMaskManagedEditPolicy()); } /** @@ -235,6 +235,7 @@ public class NestedInterfaceForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -242,6 +243,7 @@ public class NestedInterfaceForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -249,6 +251,7 @@ public class NestedInterfaceForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -264,8 +267,7 @@ public class NestedInterfaceForInterfaceEditPart extends UMLCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -275,7 +277,8 @@ public class NestedInterfaceForInterfaceEditPart extends UMLCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -287,6 +290,7 @@ public class NestedInterfaceForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -302,11 +306,13 @@ public class NestedInterfaceForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -320,6 +326,7 @@ public class NestedInterfaceForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -329,16 +336,12 @@ public class NestedInterfaceForInterfaceEditPart extends UMLCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - NestedInterfaceForInterfaceEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), NestedInterfaceForInterfaceEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -356,6 +359,7 @@ public class NestedInterfaceForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -366,6 +370,7 @@ public class NestedInterfaceForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -373,10 +378,10 @@ public class NestedInterfaceForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.Interface_InterfaceNestedClassifierLabel, getParserElement(), - this, VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.Interface_InterfaceNestedClassifierLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -436,6 +441,7 @@ public class NestedInterfaceForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -463,18 +469,13 @@ public class NestedInterfaceForInterfaceEditPart extends UMLCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -486,8 +487,7 @@ public class NestedInterfaceForInterfaceEditPart extends UMLCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -513,10 +513,9 @@ public class NestedInterfaceForInterfaceEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -532,6 +531,7 @@ public class NestedInterfaceForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -573,7 +573,8 @@ public class NestedInterfaceForInterfaceEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -590,7 +591,8 @@ public class NestedInterfaceForInterfaceEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -599,11 +601,15 @@ public class NestedInterfaceForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -611,6 +617,7 @@ public class NestedInterfaceForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -618,6 +625,7 @@ public class NestedInterfaceForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -633,6 +641,7 @@ public class NestedInterfaceForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -646,6 +655,7 @@ public class NestedInterfaceForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -668,7 +678,7 @@ public class NestedInterfaceForInterfaceEditPart extends UMLCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -687,7 +697,7 @@ public class NestedInterfaceForInterfaceEditPart extends UMLCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -700,7 +710,7 @@ public class NestedInterfaceForInterfaceEditPart extends UMLCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -710,43 +720,42 @@ public class NestedInterfaceForInterfaceEditPart extends UMLCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -755,13 +764,11 @@ public class NestedInterfaceForInterfaceEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -778,6 +785,7 @@ public class NestedInterfaceForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -786,6 +794,7 @@ public class NestedInterfaceForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -794,6 +803,7 @@ public class NestedInterfaceForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -803,10 +813,10 @@ public class NestedInterfaceForInterfaceEditPart extends UMLCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -823,8 +833,7 @@ public class NestedInterfaceForInterfaceEditPart extends UMLCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) { @@ -836,6 +845,7 @@ public class NestedInterfaceForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedPrimitiveTypeForClassEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedPrimitiveTypeForClassEditPart.java index f8ea4c106fc..7d77660b469 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedPrimitiveTypeForClassEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedPrimitiveTypeForClassEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -54,6 +54,13 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -64,14 +71,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeNestedLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedLabelMaskManagedEditPolicy; @@ -83,7 +82,6 @@ import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -128,12 +126,14 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -148,6 +148,7 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -158,6 +159,7 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); @@ -166,10 +168,8 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); - installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNestedLabelDisplayEditPolicy()); - installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, - new NestedLabelMaskManagedEditPolicy()); + installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNestedLabelDisplayEditPolicy()); + installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new NestedLabelMaskManagedEditPolicy()); } /** @@ -238,6 +238,7 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -245,6 +246,7 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -252,6 +254,7 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -267,8 +270,7 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -278,7 +280,8 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -290,6 +293,7 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -305,11 +309,13 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -323,6 +329,7 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -332,16 +339,12 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - NestedPrimitiveTypeForClassEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), NestedPrimitiveTypeForClassEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -359,6 +362,7 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -369,6 +373,7 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -376,10 +381,10 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.PrimitiveType_ClassNestedClassifierLabel, getParserElement(), - this, VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.PrimitiveType_ClassNestedClassifierLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -439,6 +444,7 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -466,18 +472,13 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -489,8 +490,7 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -516,10 +516,9 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -535,6 +534,7 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -576,7 +576,8 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -593,7 +594,8 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -602,11 +604,15 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -614,6 +620,7 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -621,6 +628,7 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -636,6 +644,7 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -649,6 +658,7 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -671,7 +681,7 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -690,7 +700,7 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -703,7 +713,7 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -713,43 +723,42 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -758,13 +767,11 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -781,6 +788,7 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -789,6 +797,7 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -797,6 +806,7 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -806,10 +816,10 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -826,8 +836,7 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) { @@ -839,6 +848,7 @@ public class NestedPrimitiveTypeForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedPrimitiveTypeForComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedPrimitiveTypeForComponentEditPart.java index 48919c89c7a..637d1e7a1d0 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedPrimitiveTypeForComponentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedPrimitiveTypeForComponentEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -54,6 +54,13 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -64,14 +71,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeNestedLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedLabelMaskManagedEditPolicy; @@ -83,7 +82,6 @@ import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -128,12 +126,14 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -148,6 +148,7 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -158,6 +159,7 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); @@ -165,10 +167,8 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); - installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNestedLabelDisplayEditPolicy()); - installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, - new NestedLabelMaskManagedEditPolicy()); + installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNestedLabelDisplayEditPolicy()); + installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new NestedLabelMaskManagedEditPolicy()); } /** @@ -237,6 +237,7 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -244,6 +245,7 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -251,6 +253,7 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -266,8 +269,7 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -277,7 +279,8 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -289,6 +292,7 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -304,11 +308,13 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -322,6 +328,7 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -331,16 +338,12 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - NestedPrimitiveTypeForComponentEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), NestedPrimitiveTypeForComponentEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -358,6 +361,7 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -368,6 +372,7 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -375,10 +380,10 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.PrimitiveType_ComponentNestedClassifierLabel, - getParserElement(), this, VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.PrimitiveType_ComponentNestedClassifierLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -438,6 +443,7 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -465,18 +471,13 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -488,8 +489,7 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -515,10 +515,9 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -534,6 +533,7 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -575,7 +575,8 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -592,7 +593,8 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -601,11 +603,15 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -613,6 +619,7 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -620,6 +627,7 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -635,6 +643,7 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -648,6 +657,7 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -670,7 +680,7 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -689,7 +699,7 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -702,7 +712,7 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -712,43 +722,42 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -757,13 +766,11 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -780,6 +787,7 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -788,6 +796,7 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -796,6 +805,7 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -805,10 +815,10 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -825,8 +835,7 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) { @@ -838,6 +847,7 @@ public class NestedPrimitiveTypeForComponentEditPart extends UMLCompartmentEditP /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedPrimitiveTypeForInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedPrimitiveTypeForInterfaceEditPart.java index 8e77af38688..1c08c913033 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedPrimitiveTypeForInterfaceEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedPrimitiveTypeForInterfaceEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -54,6 +54,13 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -64,14 +71,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeNestedLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedLabelMaskManagedEditPolicy; @@ -83,7 +82,6 @@ import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -128,12 +126,14 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -148,6 +148,7 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -158,6 +159,7 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); @@ -165,10 +167,8 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); - installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNestedLabelDisplayEditPolicy()); - installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, - new NestedLabelMaskManagedEditPolicy()); + installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNestedLabelDisplayEditPolicy()); + installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new NestedLabelMaskManagedEditPolicy()); } /** @@ -237,6 +237,7 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -244,6 +245,7 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -251,6 +253,7 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -266,8 +269,7 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -277,7 +279,8 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -289,6 +292,7 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -304,11 +308,13 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -322,6 +328,7 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -331,16 +338,12 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - NestedPrimitiveTypeForInterfaceEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), NestedPrimitiveTypeForInterfaceEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -358,6 +361,7 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -368,6 +372,7 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -375,10 +380,10 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.PrimitiveType_InterfaceNestedClassifierLabel, - getParserElement(), this, VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.PrimitiveType_InterfaceNestedClassifierLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -438,6 +443,7 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -465,18 +471,13 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -488,8 +489,7 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -515,10 +515,9 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -534,6 +533,7 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -575,7 +575,8 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -592,7 +593,8 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -601,11 +603,15 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -613,6 +619,7 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -620,6 +627,7 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -635,6 +643,7 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -648,6 +657,7 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -670,7 +680,7 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -689,7 +699,7 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -702,7 +712,7 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -712,43 +722,42 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -757,13 +766,11 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -780,6 +787,7 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -788,6 +796,7 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -796,6 +805,7 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -805,10 +815,10 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -825,8 +835,7 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) { @@ -838,6 +847,7 @@ public class NestedPrimitiveTypeForInterfaceEditPart extends UMLCompartmentEditP /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedSignalForClassEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedSignalForClassEditPart.java index caf7be0dd06..6f1dea62f97 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedSignalForClassEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedSignalForClassEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -54,6 +54,13 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -64,14 +71,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeNestedLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedLabelMaskManagedEditPolicy; @@ -83,7 +82,6 @@ import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -128,12 +126,14 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -148,6 +148,7 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -158,6 +159,7 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); @@ -165,10 +167,8 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); - installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNestedLabelDisplayEditPolicy()); - installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, - new NestedLabelMaskManagedEditPolicy()); + installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNestedLabelDisplayEditPolicy()); + installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new NestedLabelMaskManagedEditPolicy()); } /** @@ -237,6 +237,7 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -244,6 +245,7 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -251,6 +253,7 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -266,8 +269,7 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -277,7 +279,8 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -289,6 +292,7 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -304,11 +308,13 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -322,6 +328,7 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -331,14 +338,12 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), - NestedSignalForClassEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), NestedSignalForClassEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -356,6 +361,7 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -366,6 +372,7 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -373,10 +380,10 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.Signal_ClassNestedClassifierLabel, getParserElement(), this, - VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.Signal_ClassNestedClassifierLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -436,6 +443,7 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -463,18 +471,13 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -486,8 +489,7 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -513,10 +515,9 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -532,6 +533,7 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -573,7 +575,8 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -590,7 +593,8 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -599,11 +603,15 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -611,6 +619,7 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -618,6 +627,7 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -633,6 +643,7 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -646,6 +657,7 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -668,7 +680,7 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -687,7 +699,7 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -700,7 +712,7 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -710,43 +722,42 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -755,13 +766,11 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -778,6 +787,7 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -786,6 +796,7 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -794,6 +805,7 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -803,10 +815,10 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -823,8 +835,7 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) { @@ -836,6 +847,7 @@ public class NestedSignalForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedSignalForComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedSignalForComponentEditPart.java index 61771c26612..b9df0c6e806 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedSignalForComponentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedSignalForComponentEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -54,6 +54,13 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -64,14 +71,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeNestedLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedLabelMaskManagedEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy; @@ -82,7 +81,6 @@ import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -127,12 +125,14 @@ public class NestedSignalForComponentEditPart extends UMLCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -147,6 +147,7 @@ public class NestedSignalForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -157,16 +158,15 @@ public class NestedSignalForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy()); installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); - installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNestedLabelDisplayEditPolicy()); - installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, - new NestedLabelMaskManagedEditPolicy()); + installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNestedLabelDisplayEditPolicy()); + installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new NestedLabelMaskManagedEditPolicy()); } /** @@ -235,6 +235,7 @@ public class NestedSignalForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -242,6 +243,7 @@ public class NestedSignalForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -249,6 +251,7 @@ public class NestedSignalForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -264,8 +267,7 @@ public class NestedSignalForComponentEditPart extends UMLCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -275,7 +277,8 @@ public class NestedSignalForComponentEditPart extends UMLCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -287,6 +290,7 @@ public class NestedSignalForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -302,11 +306,13 @@ public class NestedSignalForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -320,6 +326,7 @@ public class NestedSignalForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -329,16 +336,12 @@ public class NestedSignalForComponentEditPart extends UMLCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - NestedSignalForComponentEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), NestedSignalForComponentEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -356,6 +359,7 @@ public class NestedSignalForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -366,6 +370,7 @@ public class NestedSignalForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -373,10 +378,10 @@ public class NestedSignalForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.Signal_ComponentNestedClassifierLabel, getParserElement(), - this, VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.Signal_ComponentNestedClassifierLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -436,6 +441,7 @@ public class NestedSignalForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -463,18 +469,13 @@ public class NestedSignalForComponentEditPart extends UMLCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -486,8 +487,7 @@ public class NestedSignalForComponentEditPart extends UMLCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -513,10 +513,9 @@ public class NestedSignalForComponentEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -532,6 +531,7 @@ public class NestedSignalForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -573,7 +573,8 @@ public class NestedSignalForComponentEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -590,7 +591,8 @@ public class NestedSignalForComponentEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -599,11 +601,15 @@ public class NestedSignalForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -611,6 +617,7 @@ public class NestedSignalForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -618,6 +625,7 @@ public class NestedSignalForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -633,6 +641,7 @@ public class NestedSignalForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -646,6 +655,7 @@ public class NestedSignalForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -668,7 +678,7 @@ public class NestedSignalForComponentEditPart extends UMLCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -687,7 +697,7 @@ public class NestedSignalForComponentEditPart extends UMLCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -700,7 +710,7 @@ public class NestedSignalForComponentEditPart extends UMLCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -710,43 +720,42 @@ public class NestedSignalForComponentEditPart extends UMLCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -755,13 +764,11 @@ public class NestedSignalForComponentEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -778,6 +785,7 @@ public class NestedSignalForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -786,6 +794,7 @@ public class NestedSignalForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -794,6 +803,7 @@ public class NestedSignalForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -803,10 +813,10 @@ public class NestedSignalForComponentEditPart extends UMLCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -823,8 +833,7 @@ public class NestedSignalForComponentEditPart extends UMLCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) { @@ -836,6 +845,7 @@ public class NestedSignalForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedSignalForInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedSignalForInterfaceEditPart.java index 018a90c3a62..cf30e43bc94 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedSignalForInterfaceEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/NestedSignalForInterfaceEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -54,6 +54,13 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -64,14 +71,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeNestedLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.NestedLabelMaskManagedEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy; @@ -82,7 +81,6 @@ import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractAppliedStereotypeDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -127,12 +125,14 @@ public class NestedSignalForInterfaceEditPart extends UMLCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -147,6 +147,7 @@ public class NestedSignalForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -157,16 +158,15 @@ public class NestedSignalForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy()); installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); - installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNestedLabelDisplayEditPolicy()); - installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, - new NestedLabelMaskManagedEditPolicy()); + installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNestedLabelDisplayEditPolicy()); + installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new NestedLabelMaskManagedEditPolicy()); } /** @@ -235,6 +235,7 @@ public class NestedSignalForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -242,6 +243,7 @@ public class NestedSignalForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -249,6 +251,7 @@ public class NestedSignalForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -264,8 +267,7 @@ public class NestedSignalForInterfaceEditPart extends UMLCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -275,7 +277,8 @@ public class NestedSignalForInterfaceEditPart extends UMLCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -287,6 +290,7 @@ public class NestedSignalForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -302,11 +306,13 @@ public class NestedSignalForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -320,6 +326,7 @@ public class NestedSignalForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -329,16 +336,12 @@ public class NestedSignalForInterfaceEditPart extends UMLCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - NestedSignalForInterfaceEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), NestedSignalForInterfaceEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -356,6 +359,7 @@ public class NestedSignalForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -366,6 +370,7 @@ public class NestedSignalForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -373,10 +378,10 @@ public class NestedSignalForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.Signal_InterfaceNestedClassifierLabel, getParserElement(), - this, VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.Signal_InterfaceNestedClassifierLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -436,6 +441,7 @@ public class NestedSignalForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -463,18 +469,13 @@ public class NestedSignalForInterfaceEditPart extends UMLCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -486,8 +487,7 @@ public class NestedSignalForInterfaceEditPart extends UMLCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -513,10 +513,9 @@ public class NestedSignalForInterfaceEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -532,6 +531,7 @@ public class NestedSignalForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -573,7 +573,8 @@ public class NestedSignalForInterfaceEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -590,7 +591,8 @@ public class NestedSignalForInterfaceEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -599,11 +601,15 @@ public class NestedSignalForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -611,6 +617,7 @@ public class NestedSignalForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -618,6 +625,7 @@ public class NestedSignalForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -633,6 +641,7 @@ public class NestedSignalForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -646,6 +655,7 @@ public class NestedSignalForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -668,7 +678,7 @@ public class NestedSignalForInterfaceEditPart extends UMLCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -687,7 +697,7 @@ public class NestedSignalForInterfaceEditPart extends UMLCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -700,7 +710,7 @@ public class NestedSignalForInterfaceEditPart extends UMLCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -710,43 +720,42 @@ public class NestedSignalForInterfaceEditPart extends UMLCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -755,13 +764,11 @@ public class NestedSignalForInterfaceEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -778,6 +785,7 @@ public class NestedSignalForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -786,6 +794,7 @@ public class NestedSignalForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -794,6 +803,7 @@ public class NestedSignalForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -803,10 +813,10 @@ public class NestedSignalForInterfaceEditPart extends UMLCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -823,8 +833,7 @@ public class NestedSignalForInterfaceEditPart extends UMLCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) { @@ -836,6 +845,7 @@ public class NestedSignalForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForClassEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForClassEditPart.java index 84329ec9972..5d34fcd750b 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForClassEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForClassEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -53,6 +53,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -63,11 +68,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.OperationFigure; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeOperationDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy; @@ -123,12 +123,14 @@ public class OperationForClassEditPart extends UMLCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -143,6 +145,7 @@ public class OperationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -153,14 +156,14 @@ public class OperationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy()); installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); - installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeOperationDisplayEditPolicy()); + installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeOperationDisplayEditPolicy()); installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new OperationLabelEditPolicy()); } @@ -230,6 +233,7 @@ public class OperationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -237,6 +241,7 @@ public class OperationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -244,6 +249,7 @@ public class OperationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -269,7 +275,8 @@ public class OperationForClassEditPart extends UMLCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -281,6 +288,7 @@ public class OperationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -296,11 +304,13 @@ public class OperationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -314,6 +324,7 @@ public class OperationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -323,13 +334,12 @@ public class OperationForClassEditPart extends UMLCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), OperationForClassEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), OperationForClassEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -347,6 +357,7 @@ public class OperationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -357,6 +368,7 @@ public class OperationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -364,10 +376,10 @@ public class OperationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.Operation_ClassOperationLabel, getParserElement(), this, - VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.Operation_ClassOperationLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -427,6 +439,7 @@ public class OperationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -454,18 +467,13 @@ public class OperationForClassEditPart extends UMLCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -477,8 +485,7 @@ public class OperationForClassEditPart extends UMLCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -504,10 +511,9 @@ public class OperationForClassEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -523,6 +529,7 @@ public class OperationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -564,7 +571,8 @@ public class OperationForClassEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -581,7 +589,8 @@ public class OperationForClassEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -590,11 +599,15 @@ public class OperationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -602,6 +615,7 @@ public class OperationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -609,6 +623,7 @@ public class OperationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -624,6 +639,7 @@ public class OperationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -637,6 +653,7 @@ public class OperationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -659,7 +676,7 @@ public class OperationForClassEditPart extends UMLCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -678,7 +695,7 @@ public class OperationForClassEditPart extends UMLCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -691,7 +708,7 @@ public class OperationForClassEditPart extends UMLCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -701,43 +718,42 @@ public class OperationForClassEditPart extends UMLCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -746,13 +762,11 @@ public class OperationForClassEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -769,6 +783,7 @@ public class OperationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -777,6 +792,7 @@ public class OperationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -785,6 +801,7 @@ public class OperationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -794,10 +811,10 @@ public class OperationForClassEditPart extends UMLCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -823,6 +840,7 @@ public class OperationForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForComponentEditPart.java index 56721e80e7a..bed54bd1b67 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForComponentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForComponentEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -53,6 +53,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -63,11 +68,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.OperationFigure; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeOperationDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy; @@ -123,12 +123,14 @@ public class OperationForComponentEditPart extends UMLCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -143,6 +145,7 @@ public class OperationForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -153,14 +156,14 @@ public class OperationForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy()); installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); - installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeOperationDisplayEditPolicy()); + installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeOperationDisplayEditPolicy()); installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new OperationLabelEditPolicy()); } @@ -230,6 +233,7 @@ public class OperationForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -237,6 +241,7 @@ public class OperationForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -244,6 +249,7 @@ public class OperationForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -269,7 +275,8 @@ public class OperationForComponentEditPart extends UMLCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -281,6 +288,7 @@ public class OperationForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -296,11 +304,13 @@ public class OperationForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -314,6 +324,7 @@ public class OperationForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -323,14 +334,12 @@ public class OperationForComponentEditPart extends UMLCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), - OperationForComponentEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), OperationForComponentEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -348,6 +357,7 @@ public class OperationForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -358,6 +368,7 @@ public class OperationForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -365,10 +376,10 @@ public class OperationForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.Operation_ComponentOperationLabel, getParserElement(), this, - VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.Operation_ComponentOperationLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -428,6 +439,7 @@ public class OperationForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -455,18 +467,13 @@ public class OperationForComponentEditPart extends UMLCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -478,8 +485,7 @@ public class OperationForComponentEditPart extends UMLCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -505,10 +511,9 @@ public class OperationForComponentEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -524,6 +529,7 @@ public class OperationForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -565,7 +571,8 @@ public class OperationForComponentEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -582,7 +589,8 @@ public class OperationForComponentEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -591,11 +599,15 @@ public class OperationForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -603,6 +615,7 @@ public class OperationForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -610,6 +623,7 @@ public class OperationForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -625,6 +639,7 @@ public class OperationForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -638,6 +653,7 @@ public class OperationForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -660,7 +676,7 @@ public class OperationForComponentEditPart extends UMLCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -679,7 +695,7 @@ public class OperationForComponentEditPart extends UMLCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -692,7 +708,7 @@ public class OperationForComponentEditPart extends UMLCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -702,43 +718,42 @@ public class OperationForComponentEditPart extends UMLCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -747,13 +762,11 @@ public class OperationForComponentEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -770,6 +783,7 @@ public class OperationForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -778,6 +792,7 @@ public class OperationForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -786,6 +801,7 @@ public class OperationForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -795,10 +811,10 @@ public class OperationForComponentEditPart extends UMLCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -824,6 +840,7 @@ public class OperationForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForDataTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForDataTypeEditPart.java index fbd991b3122..6053ace36cd 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForDataTypeEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForDataTypeEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -53,6 +53,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -63,11 +68,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.OperationFigure; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeOperationDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy; @@ -123,12 +123,14 @@ public class OperationForDataTypeEditPart extends UMLCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -143,6 +145,7 @@ public class OperationForDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -153,14 +156,14 @@ public class OperationForDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy()); installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); - installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeOperationDisplayEditPolicy()); + installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeOperationDisplayEditPolicy()); installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new OperationLabelEditPolicy()); } @@ -230,6 +233,7 @@ public class OperationForDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -237,6 +241,7 @@ public class OperationForDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -244,6 +249,7 @@ public class OperationForDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -269,7 +275,8 @@ public class OperationForDataTypeEditPart extends UMLCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -281,6 +288,7 @@ public class OperationForDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -296,11 +304,13 @@ public class OperationForDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -314,6 +324,7 @@ public class OperationForDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -323,14 +334,12 @@ public class OperationForDataTypeEditPart extends UMLCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), - OperationForDataTypeEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), OperationForDataTypeEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -348,6 +357,7 @@ public class OperationForDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -358,6 +368,7 @@ public class OperationForDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -365,10 +376,10 @@ public class OperationForDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.Operation_DataTypeOperationLabel, getParserElement(), this, - VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.Operation_DataTypeOperationLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -428,6 +439,7 @@ public class OperationForDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -455,18 +467,13 @@ public class OperationForDataTypeEditPart extends UMLCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -478,8 +485,7 @@ public class OperationForDataTypeEditPart extends UMLCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -505,10 +511,9 @@ public class OperationForDataTypeEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -524,6 +529,7 @@ public class OperationForDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -565,7 +571,8 @@ public class OperationForDataTypeEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -582,7 +589,8 @@ public class OperationForDataTypeEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -591,11 +599,15 @@ public class OperationForDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -603,6 +615,7 @@ public class OperationForDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -610,6 +623,7 @@ public class OperationForDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -625,6 +639,7 @@ public class OperationForDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -638,6 +653,7 @@ public class OperationForDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -660,7 +676,7 @@ public class OperationForDataTypeEditPart extends UMLCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -679,7 +695,7 @@ public class OperationForDataTypeEditPart extends UMLCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -692,7 +708,7 @@ public class OperationForDataTypeEditPart extends UMLCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -702,43 +718,42 @@ public class OperationForDataTypeEditPart extends UMLCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -747,13 +762,11 @@ public class OperationForDataTypeEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -770,6 +783,7 @@ public class OperationForDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -778,6 +792,7 @@ public class OperationForDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -786,6 +801,7 @@ public class OperationForDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -795,10 +811,10 @@ public class OperationForDataTypeEditPart extends UMLCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -824,6 +840,7 @@ public class OperationForDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForInterfaceEditpart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForInterfaceEditpart.java index efd822a87dc..214ca19f12f 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForInterfaceEditpart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForInterfaceEditpart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -53,6 +53,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -63,11 +68,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.OperationFigure; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeOperationDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy; @@ -123,12 +123,14 @@ public class OperationForInterfaceEditpart extends UMLCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -143,6 +145,7 @@ public class OperationForInterfaceEditpart extends UMLCompartmentEditPart /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -153,14 +156,14 @@ public class OperationForInterfaceEditpart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy()); installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); - installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeOperationDisplayEditPolicy()); + installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeOperationDisplayEditPolicy()); installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new OperationLabelEditPolicy()); } @@ -230,6 +233,7 @@ public class OperationForInterfaceEditpart extends UMLCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -237,6 +241,7 @@ public class OperationForInterfaceEditpart extends UMLCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -244,6 +249,7 @@ public class OperationForInterfaceEditpart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -269,7 +275,8 @@ public class OperationForInterfaceEditpart extends UMLCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -281,6 +288,7 @@ public class OperationForInterfaceEditpart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -296,11 +304,13 @@ public class OperationForInterfaceEditpart extends UMLCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -314,6 +324,7 @@ public class OperationForInterfaceEditpart extends UMLCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -323,14 +334,12 @@ public class OperationForInterfaceEditpart extends UMLCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), - OperationForInterfaceEditpart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), OperationForInterfaceEditpart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -348,6 +357,7 @@ public class OperationForInterfaceEditpart extends UMLCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -358,6 +368,7 @@ public class OperationForInterfaceEditpart extends UMLCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -365,10 +376,10 @@ public class OperationForInterfaceEditpart extends UMLCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.Operation_InterfaceOperationLabel, getParserElement(), this, - VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.Operation_InterfaceOperationLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -428,6 +439,7 @@ public class OperationForInterfaceEditpart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -455,18 +467,13 @@ public class OperationForInterfaceEditpart extends UMLCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -478,8 +485,7 @@ public class OperationForInterfaceEditpart extends UMLCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -505,10 +511,9 @@ public class OperationForInterfaceEditpart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -524,6 +529,7 @@ public class OperationForInterfaceEditpart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -565,7 +571,8 @@ public class OperationForInterfaceEditpart extends UMLCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -582,7 +589,8 @@ public class OperationForInterfaceEditpart extends UMLCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -591,11 +599,15 @@ public class OperationForInterfaceEditpart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -603,6 +615,7 @@ public class OperationForInterfaceEditpart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -610,6 +623,7 @@ public class OperationForInterfaceEditpart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -625,6 +639,7 @@ public class OperationForInterfaceEditpart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -638,6 +653,7 @@ public class OperationForInterfaceEditpart extends UMLCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -660,7 +676,7 @@ public class OperationForInterfaceEditpart extends UMLCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -679,7 +695,7 @@ public class OperationForInterfaceEditpart extends UMLCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -692,7 +708,7 @@ public class OperationForInterfaceEditpart extends UMLCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -702,43 +718,42 @@ public class OperationForInterfaceEditpart extends UMLCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -747,13 +762,11 @@ public class OperationForInterfaceEditpart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -770,6 +783,7 @@ public class OperationForInterfaceEditpart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -778,6 +792,7 @@ public class OperationForInterfaceEditpart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -786,6 +801,7 @@ public class OperationForInterfaceEditpart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -795,10 +811,10 @@ public class OperationForInterfaceEditpart extends UMLCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -824,6 +840,7 @@ public class OperationForInterfaceEditpart extends UMLCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForPrimitiveTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForPrimitiveTypeEditPart.java index 92ef58c517b..2298876bce6 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForPrimitiveTypeEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationForPrimitiveTypeEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -53,6 +53,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -63,11 +68,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.OperationFigure; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypeOperationDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy; @@ -123,12 +123,14 @@ public class OperationForPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -143,6 +145,7 @@ public class OperationForPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -153,14 +156,14 @@ public class OperationForPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy()); installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); - installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeOperationDisplayEditPolicy()); + installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeOperationDisplayEditPolicy()); installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new OperationLabelEditPolicy()); } @@ -230,6 +233,7 @@ public class OperationForPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -237,6 +241,7 @@ public class OperationForPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -244,6 +249,7 @@ public class OperationForPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -269,7 +275,8 @@ public class OperationForPrimitiveTypeEditPart extends UMLCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -281,6 +288,7 @@ public class OperationForPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -296,11 +304,13 @@ public class OperationForPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -314,6 +324,7 @@ public class OperationForPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -323,16 +334,12 @@ public class OperationForPrimitiveTypeEditPart extends UMLCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - OperationForPrimitiveTypeEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), OperationForPrimitiveTypeEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -350,6 +357,7 @@ public class OperationForPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -360,6 +368,7 @@ public class OperationForPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -367,10 +376,10 @@ public class OperationForPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.Operation_PrimitiveTypeOperationLabel, getParserElement(), - this, VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.Operation_PrimitiveTypeOperationLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -430,6 +439,7 @@ public class OperationForPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -457,18 +467,13 @@ public class OperationForPrimitiveTypeEditPart extends UMLCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -480,8 +485,7 @@ public class OperationForPrimitiveTypeEditPart extends UMLCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -507,10 +511,9 @@ public class OperationForPrimitiveTypeEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -526,6 +529,7 @@ public class OperationForPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -567,7 +571,8 @@ public class OperationForPrimitiveTypeEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -584,7 +589,8 @@ public class OperationForPrimitiveTypeEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -593,11 +599,15 @@ public class OperationForPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -605,6 +615,7 @@ public class OperationForPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -612,6 +623,7 @@ public class OperationForPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -627,6 +639,7 @@ public class OperationForPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -640,6 +653,7 @@ public class OperationForPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -662,7 +676,7 @@ public class OperationForPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -681,7 +695,7 @@ public class OperationForPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -694,7 +708,7 @@ public class OperationForPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -704,43 +718,42 @@ public class OperationForPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -749,13 +762,11 @@ public class OperationForPrimitiveTypeEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -772,6 +783,7 @@ public class OperationForPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -780,6 +792,7 @@ public class OperationForPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -788,6 +801,7 @@ public class OperationForPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -797,10 +811,10 @@ public class OperationForPrimitiveTypeEditPart extends UMLCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -826,6 +840,7 @@ public class OperationForPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationTemplateParameterEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationTemplateParameterEditPart.java index fd00ceaed80..a4963e935e7 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationTemplateParameterEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/OperationTemplateParameterEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -54,6 +54,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -64,11 +69,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.TemplateParameterFigure; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.OperationTemplateParamaterDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.TemplateParamaterDisplayEditPolicy; @@ -122,12 +122,14 @@ public class OperationTemplateParameterEditPart extends CompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -142,6 +144,7 @@ public class OperationTemplateParameterEditPart extends CompartmentEditPart /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -152,14 +155,14 @@ public class OperationTemplateParameterEditPart extends CompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy()); installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); - installEditPolicy(TemplateParamaterDisplayEditPolicy.TEMPLATE_PARAMETER_DISPLAY, - new OperationTemplateParamaterDisplayEditPolicy()); + installEditPolicy(TemplateParamaterDisplayEditPolicy.TEMPLATE_PARAMETER_DISPLAY, new OperationTemplateParamaterDisplayEditPolicy()); } /** @@ -228,6 +231,7 @@ public class OperationTemplateParameterEditPart extends CompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -235,6 +239,7 @@ public class OperationTemplateParameterEditPart extends CompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -242,6 +247,7 @@ public class OperationTemplateParameterEditPart extends CompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -267,7 +273,8 @@ public class OperationTemplateParameterEditPart extends CompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -279,6 +286,7 @@ public class OperationTemplateParameterEditPart extends CompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -294,11 +302,13 @@ public class OperationTemplateParameterEditPart extends CompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -312,6 +322,7 @@ public class OperationTemplateParameterEditPart extends CompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -321,16 +332,12 @@ public class OperationTemplateParameterEditPart extends CompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - OperationTemplateParameterEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), OperationTemplateParameterEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -348,6 +355,7 @@ public class OperationTemplateParameterEditPart extends CompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -358,6 +366,7 @@ public class OperationTemplateParameterEditPart extends CompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -365,10 +374,10 @@ public class OperationTemplateParameterEditPart extends CompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.OperationTemplateParameter_TemplateParameterLabel, - getParserElement(), this, VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.OperationTemplateParameter_TemplateParameterLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -428,6 +437,7 @@ public class OperationTemplateParameterEditPart extends CompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -455,18 +465,13 @@ public class OperationTemplateParameterEditPart extends CompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -478,8 +483,7 @@ public class OperationTemplateParameterEditPart extends CompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -505,10 +509,9 @@ public class OperationTemplateParameterEditPart extends CompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -524,6 +527,7 @@ public class OperationTemplateParameterEditPart extends CompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -565,7 +569,8 @@ public class OperationTemplateParameterEditPart extends CompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -582,7 +587,8 @@ public class OperationTemplateParameterEditPart extends CompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -591,11 +597,15 @@ public class OperationTemplateParameterEditPart extends CompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -603,6 +613,7 @@ public class OperationTemplateParameterEditPart extends CompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -610,6 +621,7 @@ public class OperationTemplateParameterEditPart extends CompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -625,6 +637,7 @@ public class OperationTemplateParameterEditPart extends CompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -638,6 +651,7 @@ public class OperationTemplateParameterEditPart extends CompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -660,7 +674,7 @@ public class OperationTemplateParameterEditPart extends CompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -679,7 +693,7 @@ public class OperationTemplateParameterEditPart extends CompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -692,7 +706,7 @@ public class OperationTemplateParameterEditPart extends CompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -702,43 +716,42 @@ public class OperationTemplateParameterEditPart extends CompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -747,13 +760,11 @@ public class OperationTemplateParameterEditPart extends CompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -770,6 +781,7 @@ public class OperationTemplateParameterEditPart extends CompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -778,6 +790,7 @@ public class OperationTemplateParameterEditPart extends CompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -786,6 +799,7 @@ public class OperationTemplateParameterEditPart extends CompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -795,10 +809,10 @@ public class OperationTemplateParameterEditPart extends CompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -824,6 +838,7 @@ public class OperationTemplateParameterEditPart extends CompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageEditPart.java index 5c148b831a9..89be2eea10e 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -79,6 +79,7 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit /** * @generated */ + @Override protected void createDefaultEditPolicies() { installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); super.createDefaultEditPolicies(); @@ -87,16 +88,14 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PackageCanonicalEditPolicy()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PackageCanonicalEditPolicy()); installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); - installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, - new ShowHideCompartmentEditPolicy()); + installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE); @@ -140,9 +139,11 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit } /** - *Papyrus codeGen - *@generated - **/ + * Papyrus codeGen + * + * @generated + **/ + @Override protected void handleNotificationEvent(Notification event) { super.handleNotificationEvent(event); @@ -151,14 +152,17 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit /** * @generated */ + @Override protected IFigure createNodeShape() { return primaryShape = new PackageFigure(); } /** * org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure + * * @generated */ + @Override public PackageFigure getPrimaryShape() { return (PackageFigure) primaryShape; } @@ -172,29 +176,34 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit return true; } + if (childEditPart instanceof PackagePackageableElementCompartmentEditPart) { IFigure pane = getPrimaryShape().getPackageableElementFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((PackagePackageableElementCompartmentEditPart) childEditPart).getFigure()); return true; } - //Papyrus Gencode :precise the locator for a template signature + + + // Papyrus Gencode :precise the locator for a template signature if (childEditPart instanceof RedefinableTemplateSignatureEditPart) { IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST); - getBorderedFigure().getBorderItemContainer() - .add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator); + getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator); return true; } - //Papyrus Gencode :precise the locator for a template signature + + + + // Papyrus Gencode :precise the locator for a template signature if (childEditPart instanceof TemplateSignatureEditPart) { IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST); - getBorderedFigure().getBorderItemContainer().add(((TemplateSignatureEditPart) childEditPart).getFigure(), - locator); + getBorderedFigure().getBorderItemContainer().add(((TemplateSignatureEditPart) childEditPart).getFigure(), locator); return true; } + return false; } @@ -211,13 +220,11 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit return true; } if (childEditPart instanceof RedefinableTemplateSignatureEditPart) { - getBorderedFigure().getBorderItemContainer() - .remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure()); + getBorderedFigure().getBorderItemContainer().remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure()); return true; } if (childEditPart instanceof TemplateSignatureEditPart) { - getBorderedFigure().getBorderItemContainer() - .remove(((TemplateSignatureEditPart) childEditPart).getFigure()); + getBorderedFigure().getBorderItemContainer().remove(((TemplateSignatureEditPart) childEditPart).getFigure()); return true; } return false; @@ -226,6 +233,7 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -236,6 +244,7 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -246,6 +255,7 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit /** * @generated */ + @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { if (editPart instanceof PackagePackageableElementCompartmentEditPart) { return getPrimaryShape().getPackageableElementFigure(); @@ -259,6 +269,7 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit /** * @generated */ + @Override protected NodeFigure createNodePlate() { RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(200, 100); return result; @@ -266,12 +277,13 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected NodeFigure createMainFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); @@ -280,9 +292,12 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit /** * Default implementation treats passed figure as content pane. * Respects layout one may have set for generated figure. - * @param nodeShape instance of generated figure class + * + * @param nodeShape + * instance of generated figure class * @generated */ + @Override protected IFigure setupContentPane(IFigure nodeShape) { if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); @@ -295,6 +310,7 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit /** * @generated */ + @Override public IFigure getContentPane() { if (contentPane != null) { return contentPane; @@ -305,6 +321,7 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit /** * @generated */ + @Override protected void setForegroundColor(Color color) { if (primaryShape != null) { primaryShape.setForegroundColor(color); @@ -314,6 +331,7 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit /** * @generated */ + @Override protected void setLineWidth(int width) { super.setLineWidth(width); } @@ -321,6 +339,7 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit /** * @generated */ + @Override protected void setLineType(int style) { if (primaryShape instanceof IPapyrusNodeFigure) { ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); @@ -330,6 +349,7 @@ public class PackageEditPart extends org.eclipse.papyrus.uml.diagram.common.edit /** * @generated */ + @Override public EditPart getPrimaryChildEditPart() { return getChildBySemanticHint(UMLVisualIDRegistry.getType(PackageNameEditPart.VISUAL_ID)); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageEditPartCN.java index db05b6f3c00..82c028a949d 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -80,6 +80,7 @@ public class PackageEditPartCN extends PackageEditPart { /** * @generated */ + @Override protected void createDefaultEditPolicies() { installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); super.createDefaultEditPolicies(); @@ -88,16 +89,14 @@ public class PackageEditPartCN extends PackageEditPart { installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PackageCanonicalEditPolicyCN()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PackageCanonicalEditPolicyCN()); installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); - installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, - new ShowHideCompartmentEditPolicy()); + installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE); @@ -141,9 +140,11 @@ public class PackageEditPartCN extends PackageEditPart { } /** - *Papyrus codeGen - *@generated - **/ + * Papyrus codeGen + * + * @generated + **/ + @Override protected void handleNotificationEvent(Notification event) { super.handleNotificationEvent(event); @@ -152,14 +153,17 @@ public class PackageEditPartCN extends PackageEditPart { /** * @generated */ + @Override protected IFigure createNodeShape() { return primaryShape = new PackageFigure(); } /** * org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure + * * @generated */ + @Override public PackageFigure getPrimaryShape() { return (PackageFigure) primaryShape; } @@ -173,29 +177,34 @@ public class PackageEditPartCN extends PackageEditPart { return true; } + if (childEditPart instanceof PackagePackageableElementCompartmentEditPartCN) { IFigure pane = getPrimaryShape().getPackageableElementFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((PackagePackageableElementCompartmentEditPartCN) childEditPart).getFigure()); return true; } - //Papyrus Gencode :precise the locator for a template signature + + + // Papyrus Gencode :precise the locator for a template signature if (childEditPart instanceof RedefinableTemplateSignatureEditPart) { IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST); - getBorderedFigure().getBorderItemContainer() - .add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator); + getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator); return true; } - //Papyrus Gencode :precise the locator for a template signature + + + + // Papyrus Gencode :precise the locator for a template signature if (childEditPart instanceof TemplateSignatureEditPart) { IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST); - getBorderedFigure().getBorderItemContainer().add(((TemplateSignatureEditPart) childEditPart).getFigure(), - locator); + getBorderedFigure().getBorderItemContainer().add(((TemplateSignatureEditPart) childEditPart).getFigure(), locator); return true; } + return false; } @@ -212,13 +221,11 @@ public class PackageEditPartCN extends PackageEditPart { return true; } if (childEditPart instanceof RedefinableTemplateSignatureEditPart) { - getBorderedFigure().getBorderItemContainer() - .remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure()); + getBorderedFigure().getBorderItemContainer().remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure()); return true; } if (childEditPart instanceof TemplateSignatureEditPart) { - getBorderedFigure().getBorderItemContainer() - .remove(((TemplateSignatureEditPart) childEditPart).getFigure()); + getBorderedFigure().getBorderItemContainer().remove(((TemplateSignatureEditPart) childEditPart).getFigure()); return true; } return false; @@ -227,6 +234,7 @@ public class PackageEditPartCN extends PackageEditPart { /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -237,6 +245,7 @@ public class PackageEditPartCN extends PackageEditPart { /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -247,6 +256,7 @@ public class PackageEditPartCN extends PackageEditPart { /** * @generated */ + @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { if (editPart instanceof PackagePackageableElementCompartmentEditPartCN) { return getPrimaryShape().getPackageableElementFigure(); @@ -260,6 +270,7 @@ public class PackageEditPartCN extends PackageEditPart { /** * @generated */ + @Override protected NodeFigure createNodePlate() { RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(200, 100); return result; @@ -267,12 +278,13 @@ public class PackageEditPartCN extends PackageEditPart { /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected NodeFigure createMainFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); @@ -281,9 +293,12 @@ public class PackageEditPartCN extends PackageEditPart { /** * Default implementation treats passed figure as content pane. * Respects layout one may have set for generated figure. - * @param nodeShape instance of generated figure class + * + * @param nodeShape + * instance of generated figure class * @generated */ + @Override protected IFigure setupContentPane(IFigure nodeShape) { if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); @@ -296,6 +311,7 @@ public class PackageEditPartCN extends PackageEditPart { /** * @generated */ + @Override public IFigure getContentPane() { if (contentPane != null) { return contentPane; @@ -306,6 +322,7 @@ public class PackageEditPartCN extends PackageEditPart { /** * @generated */ + @Override protected void setForegroundColor(Color color) { if (primaryShape != null) { primaryShape.setForegroundColor(color); @@ -315,6 +332,7 @@ public class PackageEditPartCN extends PackageEditPart { /** * @generated */ + @Override protected void setLineWidth(int width) { super.setLineWidth(width); } @@ -322,6 +340,7 @@ public class PackageEditPartCN extends PackageEditPart { /** * @generated */ + @Override protected void setLineType(int style) { if (primaryShape instanceof IPapyrusNodeFigure) { ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); @@ -331,6 +350,7 @@ public class PackageEditPartCN extends PackageEditPart { /** * @generated */ + @Override public EditPart getPrimaryChildEditPart() { return getChildBySemanticHint(UMLVisualIDRegistry.getType(PackageNameEditPartCN.VISUAL_ID)); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageImportEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageImportEditPart.java index cf15eeebbec..3b335a165bf 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageImportEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageImportEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -27,8 +27,8 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypePack import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure; /** - * @generated - */ + * @generated + */ public class PackageImportEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart { /** @@ -46,11 +46,11 @@ public class PackageImportEditPart extends UMLConnectionNodeEditPart implements /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypePackageImportLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypePackageImportLabelDisplayEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); } @@ -59,8 +59,8 @@ public class PackageImportEditPart extends UMLConnectionNodeEditPart implements */ protected boolean addFixedChild(EditPart childEditPart) { if (childEditPart instanceof AppliedStereotypePackageImportEditPart) { - ((AppliedStereotypePackageImportEditPart) childEditPart) - .setLabel(getPrimaryShape().getAppliedStereotypeLabel()); + ((AppliedStereotypePackageImportEditPart) childEditPart).setLabel( + getPrimaryShape().getAppliedStereotypeLabel()); } return false; } @@ -68,6 +68,7 @@ public class PackageImportEditPart extends UMLConnectionNodeEditPart implements /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -88,6 +89,7 @@ public class PackageImportEditPart extends UMLConnectionNodeEditPart implements /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -97,12 +99,13 @@ public class PackageImportEditPart extends UMLConnectionNodeEditPart implements /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected Connection createConnectionFigure() { return new DashedEdgeFigure(); } @@ -110,6 +113,7 @@ public class PackageImportEditPart extends UMLConnectionNodeEditPart implements /** * @generated */ + @Override public DashedEdgeFigure getPrimaryShape() { return (DashedEdgeFigure) getFigure(); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageMergeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageMergeEditPart.java index bb11b487756..63740aaa2f3 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageMergeEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageMergeEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -27,8 +27,8 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLink import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure; /** - * @generated - */ + * @generated + */ public class PackageMergeEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart { /** @@ -46,11 +46,11 @@ public class PackageMergeEditPart extends UMLConnectionNodeEditPart implements I /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeLinkLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); } @@ -59,8 +59,8 @@ public class PackageMergeEditPart extends UMLConnectionNodeEditPart implements I */ protected boolean addFixedChild(EditPart childEditPart) { if (childEditPart instanceof AppliedStereotypePackageMergeEditPart) { - ((AppliedStereotypePackageMergeEditPart) childEditPart) - .setLabel(getPrimaryShape().getAppliedStereotypeLabel()); + ((AppliedStereotypePackageMergeEditPart) childEditPart).setLabel( + getPrimaryShape().getAppliedStereotypeLabel()); } return false; } @@ -68,6 +68,7 @@ public class PackageMergeEditPart extends UMLConnectionNodeEditPart implements I /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -88,6 +89,7 @@ public class PackageMergeEditPart extends UMLConnectionNodeEditPart implements I /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -97,12 +99,13 @@ public class PackageMergeEditPart extends UMLConnectionNodeEditPart implements I /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected Connection createConnectionFigure() { return new DashedEdgeFigure(); } @@ -110,6 +113,7 @@ public class PackageMergeEditPart extends UMLConnectionNodeEditPart implements I /** * @generated */ + @Override public DashedEdgeFigure getPrimaryShape() { return (DashedEdgeFigure) getFigure(); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageNameEditPart.java index 9febc808289..6b2d966b0ae 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageNameEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,20 +64,12 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -115,12 +113,14 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -135,6 +135,7 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy()); @@ -208,6 +209,7 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -215,6 +217,7 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -222,6 +225,7 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -237,8 +241,7 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -248,7 +251,8 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -260,6 +264,7 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -275,11 +280,13 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -293,6 +300,7 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -302,13 +310,12 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), PackageNameEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), PackageNameEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -326,6 +333,7 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -336,6 +344,7 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -343,6 +352,7 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Package_Shape, getParserElement(), this, VISUAL_ID); @@ -405,6 +415,7 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -432,18 +443,13 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -455,8 +461,7 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -482,10 +487,9 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -501,6 +505,7 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -542,7 +547,8 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -559,7 +565,8 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -568,11 +575,15 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -580,6 +591,7 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -587,6 +599,7 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -602,6 +615,7 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -615,6 +629,7 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -637,7 +652,7 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -656,7 +671,7 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -669,7 +684,7 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -679,43 +694,42 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -724,13 +738,11 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -747,6 +759,7 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -755,6 +768,7 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -763,6 +777,7 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); @@ -773,10 +788,10 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -793,8 +808,7 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } super.handleNotificationEvent(event); @@ -803,6 +817,7 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -816,6 +831,7 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void activate() { super.activate(); addOwnerElementListeners(); @@ -832,6 +848,7 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void deactivate() { removeOwnerElementListeners(); super.deactivate(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageNameEditPartCN.java index affde678d93..847b994839e 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageNameEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageNameEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,20 +64,12 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -115,12 +113,14 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -135,6 +135,7 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy()); @@ -208,6 +209,7 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -215,6 +217,7 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -222,6 +225,7 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -237,8 +241,7 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -248,7 +251,8 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -260,6 +264,7 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -275,11 +280,13 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -293,6 +300,7 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -302,13 +310,12 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), PackageNameEditPartCN.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), PackageNameEditPartCN.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -326,6 +333,7 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -336,6 +344,7 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -343,6 +352,7 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Package_Shape_CN, getParserElement(), this, VISUAL_ID); @@ -405,6 +415,7 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -432,18 +443,13 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -455,8 +461,7 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -482,10 +487,9 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -501,6 +505,7 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -542,7 +547,8 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -559,7 +565,8 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -568,11 +575,15 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -580,6 +591,7 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -587,6 +599,7 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -602,6 +615,7 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -615,6 +629,7 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -637,7 +652,7 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -656,7 +671,7 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -669,7 +684,7 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -679,43 +694,42 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -724,13 +738,11 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -747,6 +759,7 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -755,6 +768,7 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -763,6 +777,7 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); @@ -773,10 +788,10 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -793,8 +808,7 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } super.handleNotificationEvent(event); @@ -803,6 +817,7 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -816,6 +831,7 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void activate() { super.activate(); addOwnerElementListeners(); @@ -832,6 +848,7 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void deactivate() { removeOwnerElementListeners(); super.deactivate(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackagePackageableElementCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackagePackageableElementCompartmentEditPart.java index 77090996883..6cef6a5d48f 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackagePackageableElementCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackagePackageableElementCompartmentEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -33,7 +33,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEdit import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.AbstractPackageableElementCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomContainmentCreationEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -58,6 +57,7 @@ public class PackagePackageableElementCompartmentEditPart extends AbstractPackag /** * @generated */ + @Override public String getCompartmentName() { return Messages.PackagePackageableElementCompartmentEditPart_title; } @@ -65,6 +65,7 @@ public class PackagePackageableElementCompartmentEditPart extends AbstractPackag /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -72,10 +73,9 @@ public class PackagePackageableElementCompartmentEditPart extends AbstractPackag installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PackagePackageableElementCompartmentCanonicalEditPolicy()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PackagePackageableElementCompartmentCanonicalEditPolicy()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy()); installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CustomContainmentCreationEditPolicy()); @@ -85,6 +85,7 @@ public class PackagePackageableElementCompartmentEditPart extends AbstractPackag /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -94,6 +95,7 @@ public class PackagePackageableElementCompartmentEditPart extends AbstractPackag /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -102,6 +104,7 @@ public class PackagePackageableElementCompartmentEditPart extends AbstractPackag /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -123,12 +126,16 @@ public class PackagePackageableElementCompartmentEditPart extends AbstractPackag int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackagePackageableElementCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackagePackageableElementCompartmentEditPartCN.java index 6507350c9c2..8f1f82d3a4d 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackagePackageableElementCompartmentEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackagePackageableElementCompartmentEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -33,7 +33,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEdit import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.AbstractPackageableElementCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomContainmentCreationEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -58,6 +57,7 @@ public class PackagePackageableElementCompartmentEditPartCN extends AbstractPack /** * @generated */ + @Override public String getCompartmentName() { return Messages.PackagePackageableElementCompartmentEditPartCN_title; } @@ -65,6 +65,7 @@ public class PackagePackageableElementCompartmentEditPartCN extends AbstractPack /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -72,10 +73,9 @@ public class PackagePackageableElementCompartmentEditPartCN extends AbstractPack installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PackagePackageableElementCompartmentCanonicalEditPolicyCN()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PackagePackageableElementCompartmentCanonicalEditPolicyCN()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy()); installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CustomContainmentCreationEditPolicy()); @@ -85,6 +85,7 @@ public class PackagePackageableElementCompartmentEditPartCN extends AbstractPack /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -94,6 +95,7 @@ public class PackagePackageableElementCompartmentEditPartCN extends AbstractPack /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -102,6 +104,7 @@ public class PackagePackageableElementCompartmentEditPartCN extends AbstractPack /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -123,12 +126,16 @@ public class PackagePackageableElementCompartmentEditPartCN extends AbstractPack int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeAttributeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeAttributeCompartmentEditPart.java index 9e000d29c63..53e8fbfac65 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeAttributeCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeAttributeCompartmentEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -31,7 +31,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartme import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -55,6 +54,7 @@ public class PrimitiveTypeAttributeCompartmentEditPart extends ResizeableListCom /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; } @@ -62,6 +62,7 @@ public class PrimitiveTypeAttributeCompartmentEditPart extends ResizeableListCom /** * @generated */ + @Override public String getCompartmentName() { return Messages.PrimitiveTypeAttributeCompartmentEditPart_title; } @@ -69,6 +70,7 @@ public class PrimitiveTypeAttributeCompartmentEditPart extends ResizeableListCom /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -76,16 +78,16 @@ public class PrimitiveTypeAttributeCompartmentEditPart extends ResizeableListCom installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PrimitiveTypeAttributeCompartmentCanonicalEditPolicy()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PrimitiveTypeAttributeCompartmentCanonicalEditPolicy()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); } /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -95,6 +97,7 @@ public class PrimitiveTypeAttributeCompartmentEditPart extends ResizeableListCom /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -103,6 +106,7 @@ public class PrimitiveTypeAttributeCompartmentEditPart extends ResizeableListCom /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -117,6 +121,7 @@ public class PrimitiveTypeAttributeCompartmentEditPart extends ResizeableListCom /** * @generated */ + @Override protected void refreshBounds() { int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); @@ -124,12 +129,16 @@ public class PrimitiveTypeAttributeCompartmentEditPart extends ResizeableListCom int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeAttributeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeAttributeCompartmentEditPartCN.java index 215be01cee2..6f5e878261f 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeAttributeCompartmentEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeAttributeCompartmentEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -31,7 +31,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartme import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -55,6 +54,7 @@ public class PrimitiveTypeAttributeCompartmentEditPartCN extends ResizeableListC /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; } @@ -62,6 +62,7 @@ public class PrimitiveTypeAttributeCompartmentEditPartCN extends ResizeableListC /** * @generated */ + @Override public String getCompartmentName() { return Messages.PrimitiveTypeAttributeCompartmentEditPartCN_title; } @@ -69,6 +70,7 @@ public class PrimitiveTypeAttributeCompartmentEditPartCN extends ResizeableListC /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -76,16 +78,16 @@ public class PrimitiveTypeAttributeCompartmentEditPartCN extends ResizeableListC installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PrimitiveTypeAttributeCompartmentCanonicalEditPolicyCN()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PrimitiveTypeAttributeCompartmentCanonicalEditPolicyCN()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); } /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -95,6 +97,7 @@ public class PrimitiveTypeAttributeCompartmentEditPartCN extends ResizeableListC /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -103,6 +106,7 @@ public class PrimitiveTypeAttributeCompartmentEditPartCN extends ResizeableListC /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -117,6 +121,7 @@ public class PrimitiveTypeAttributeCompartmentEditPartCN extends ResizeableListC /** * @generated */ + @Override protected void refreshBounds() { int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); @@ -124,12 +129,16 @@ public class PrimitiveTypeAttributeCompartmentEditPartCN extends ResizeableListC int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeEditPart.java index 4592dbb7cc1..b1f680f3e44 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -96,6 +96,7 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void createDefaultEditPolicies() { installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); super.createDefaultEditPolicies(); @@ -104,18 +105,15 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart { installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PrimitiveTypeCanonicalEditPolicy()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PrimitiveTypeCanonicalEditPolicy()); installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); - installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, - new ShowHideCompartmentEditPolicy()); - installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, - new ShowHideClassifierContentsEditPolicy()); + installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy()); + installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies @@ -169,9 +167,11 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart { } /** - *Papyrus codeGen - *@generated - **/ + * Papyrus codeGen + * + * @generated + **/ + @Override protected void handleNotificationEvent(Notification event) { /* * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart @@ -180,7 +180,8 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart { if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) { Object notifier = event.getNotifier(); List<?> modelChildren = ((View) getModel()).getChildren(); - if (false == notifier instanceof Edge && false == notifier instanceof BasicCompartment) { + if (false == notifier instanceof Edge + && false == notifier instanceof BasicCompartment) { if (modelChildren.contains(event.getNotifier())) { return; } @@ -193,14 +194,17 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected IFigure createNodeShape() { return primaryShape = new PrimitiveTypeFigure(); } /** * org.eclipse.papyrus.uml.diagram.common.figure.node.PrimitiveTypeFigure + * * @generated */ + @Override public PrimitiveTypeFigure getPrimaryShape() { return (PrimitiveTypeFigure) primaryShape; } @@ -214,28 +218,31 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart { return true; } + if (childEditPart instanceof PrimitiveTypeAttributeCompartmentEditPart) { IFigure pane = getPrimaryShape().getAttributeCompartmentFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((PrimitiveTypeAttributeCompartmentEditPart) childEditPart).getFigure()); return true; } if (childEditPart instanceof PrimitiveTypeOperationCompartmentEditPart) { IFigure pane = getPrimaryShape().getOperationCompartmentFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((PrimitiveTypeOperationCompartmentEditPart) childEditPart).getFigure()); return true; } - //Papyrus Gencode :precise the locator for a template signature + + + // Papyrus Gencode :precise the locator for a template signature if (childEditPart instanceof RedefinableTemplateSignatureEditPart) { IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST); - getBorderedFigure().getBorderItemContainer() - .add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator); + getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator); return true; } + return false; } @@ -257,8 +264,7 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart { return true; } if (childEditPart instanceof RedefinableTemplateSignatureEditPart) { - getBorderedFigure().getBorderItemContainer() - .remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure()); + getBorderedFigure().getBorderItemContainer().remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure()); return true; } return false; @@ -267,6 +273,7 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -277,6 +284,7 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -287,6 +295,7 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { if (editPart instanceof PrimitiveTypeAttributeCompartmentEditPart) { return getPrimaryShape().getAttributeCompartmentFigure(); @@ -303,6 +312,7 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) { if (borderItemEditPart instanceof PrimitiveTypeFloatingNameEditPart) { IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure()); @@ -315,6 +325,7 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected NodeFigure createNodePlate() { RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(100, 50); return result; @@ -322,12 +333,13 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart { /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected NodeFigure createMainFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); @@ -336,9 +348,12 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart { /** * Default implementation treats passed figure as content pane. * Respects layout one may have set for generated figure. - * @param nodeShape instance of generated figure class + * + * @param nodeShape + * instance of generated figure class * @generated */ + @Override protected IFigure setupContentPane(IFigure nodeShape) { if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); @@ -351,6 +366,7 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart { /** * @generated */ + @Override public IFigure getContentPane() { if (contentPane != null) { return contentPane; @@ -361,6 +377,7 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void setForegroundColor(Color color) { if (primaryShape != null) { primaryShape.setForegroundColor(color); @@ -370,6 +387,7 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void setLineWidth(int width) { super.setLineWidth(width); } @@ -377,6 +395,7 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void setLineType(int style) { if (primaryShape instanceof IPapyrusNodeFigure) { ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); @@ -386,6 +405,7 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart { /** * @generated */ + @Override public EditPart getPrimaryChildEditPart() { return getChildBySemanticHint(UMLVisualIDRegistry.getType(PrimitiveTypeNameEditPart.VISUAL_ID)); } @@ -393,18 +413,16 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart { /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { if (request instanceof CreateViewAndElementRequest) { - CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor() - .getCreateElementRequestAdapter(); + CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter(); IElementType type = (IElementType) adapter.getAdapter(IElementType.class); if (UMLElementTypes.isKindOf(type, UMLElementTypes.Property_PrimitiveTypeAttributeLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(PrimitiveTypeAttributeCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(PrimitiveTypeAttributeCompartmentEditPart.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Operation_PrimitiveTypeOperationLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(PrimitiveTypeOperationCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(PrimitiveTypeOperationCompartmentEditPart.VISUAL_ID)); } } return super.getTargetEditPart(request); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeEditPartCN.java index 3d2c8b9cfa5..3c318630c1d 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -97,6 +97,7 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void createDefaultEditPolicies() { installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); super.createDefaultEditPolicies(); @@ -105,19 +106,16 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart { installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PrimitiveTypeCanonicalEditPolicyCN()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PrimitiveTypeCanonicalEditPolicyCN()); installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); - installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, - new ShowHideCompartmentEditPolicy()); - installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, - new ShowHideClassifierContentsEditPolicy()); + installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy()); + installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies @@ -171,9 +169,11 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart { } /** - *Papyrus codeGen - *@generated - **/ + * Papyrus codeGen + * + * @generated + **/ + @Override protected void handleNotificationEvent(Notification event) { /* * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart @@ -182,7 +182,8 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart { if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) { Object notifier = event.getNotifier(); List<?> modelChildren = ((View) getModel()).getChildren(); - if (false == notifier instanceof Edge && false == notifier instanceof BasicCompartment) { + if (false == notifier instanceof Edge + && false == notifier instanceof BasicCompartment) { if (modelChildren.contains(event.getNotifier())) { return; } @@ -195,14 +196,17 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected IFigure createNodeShape() { return primaryShape = new PrimitiveTypeFigure(); } /** * org.eclipse.papyrus.uml.diagram.common.figure.node.PrimitiveTypeFigure + * * @generated */ + @Override public PrimitiveTypeFigure getPrimaryShape() { return (PrimitiveTypeFigure) primaryShape; } @@ -216,28 +220,31 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart { return true; } + if (childEditPart instanceof PrimitiveTypeAttributeCompartmentEditPartCN) { IFigure pane = getPrimaryShape().getAttributeCompartmentFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((PrimitiveTypeAttributeCompartmentEditPartCN) childEditPart).getFigure()); return true; } if (childEditPart instanceof PrimitiveTypeOperationCompartmentEditPartCN) { IFigure pane = getPrimaryShape().getOperationCompartmentFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((PrimitiveTypeOperationCompartmentEditPartCN) childEditPart).getFigure()); return true; } - //Papyrus Gencode :precise the locator for a template signature + + + // Papyrus Gencode :precise the locator for a template signature if (childEditPart instanceof RedefinableTemplateSignatureEditPart) { IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST); - getBorderedFigure().getBorderItemContainer() - .add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator); + getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator); return true; } + return false; } @@ -259,8 +266,7 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart { return true; } if (childEditPart instanceof RedefinableTemplateSignatureEditPart) { - getBorderedFigure().getBorderItemContainer() - .remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure()); + getBorderedFigure().getBorderItemContainer().remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure()); return true; } return false; @@ -269,6 +275,7 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -279,6 +286,7 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -289,6 +297,7 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { if (editPart instanceof PrimitiveTypeAttributeCompartmentEditPartCN) { return getPrimaryShape().getAttributeCompartmentFigure(); @@ -305,6 +314,7 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) { if (borderItemEditPart instanceof PrimitiveTypeFloatingNameEditPartCN) { IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure()); @@ -317,6 +327,7 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected NodeFigure createNodePlate() { RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(100, 50); return result; @@ -324,12 +335,13 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart { /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected NodeFigure createMainFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); @@ -338,9 +350,12 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart { /** * Default implementation treats passed figure as content pane. * Respects layout one may have set for generated figure. - * @param nodeShape instance of generated figure class + * + * @param nodeShape + * instance of generated figure class * @generated */ + @Override protected IFigure setupContentPane(IFigure nodeShape) { if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); @@ -353,6 +368,7 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override public IFigure getContentPane() { if (contentPane != null) { return contentPane; @@ -363,6 +379,7 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void setForegroundColor(Color color) { if (primaryShape != null) { primaryShape.setForegroundColor(color); @@ -372,6 +389,7 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void setLineWidth(int width) { super.setLineWidth(width); } @@ -379,6 +397,7 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void setLineType(int style) { if (primaryShape instanceof IPapyrusNodeFigure) { ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); @@ -388,6 +407,7 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override public EditPart getPrimaryChildEditPart() { return getChildBySemanticHint(UMLVisualIDRegistry.getType(PrimitiveTypeNameEditPartCN.VISUAL_ID)); } @@ -395,18 +415,16 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { if (request instanceof CreateViewAndElementRequest) { - CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor() - .getCreateElementRequestAdapter(); + CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter(); IElementType type = (IElementType) adapter.getAdapter(IElementType.class); if (UMLElementTypes.isKindOf(type, UMLElementTypes.Property_PrimitiveTypeAttributeLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(PrimitiveTypeAttributeCompartmentEditPartCN.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(PrimitiveTypeAttributeCompartmentEditPartCN.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.Operation_PrimitiveTypeOperationLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(PrimitiveTypeOperationCompartmentEditPartCN.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(PrimitiveTypeOperationCompartmentEditPartCN.VISUAL_ID)); } } return super.getTargetEditPart(request); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeFloatingNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeFloatingNameEditPart.java index 63209475dc0..c80cb508098 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeFloatingNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeFloatingNameEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -50,6 +50,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -60,11 +65,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -115,12 +115,14 @@ public class PrimitiveTypeFloatingNameEditPart extends FloatingLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -129,10 +131,7 @@ public class PrimitiveTypeFloatingNameEditPart extends FloatingLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeFloatingNameEditPart.VISUAL_ID), - new Point(0, 0)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeFloatingNameEditPart.VISUAL_ID), new Point(0, 0)); } /** @@ -145,6 +144,7 @@ public class PrimitiveTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); @@ -156,6 +156,7 @@ public class PrimitiveTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IBorderItemLocator getBorderItemLocator() { IFigure parentFigure = getFigure().getParent(); if (parentFigure != null && parentFigure.getLayoutManager() != null) { @@ -168,6 +169,7 @@ public class PrimitiveTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public void refreshBounds() { int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); @@ -242,6 +244,7 @@ public class PrimitiveTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -249,6 +252,7 @@ public class PrimitiveTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -281,7 +285,8 @@ public class PrimitiveTypeFloatingNameEditPart extends FloatingLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -293,6 +298,7 @@ public class PrimitiveTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -308,11 +314,13 @@ public class PrimitiveTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -326,6 +334,7 @@ public class PrimitiveTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -335,16 +344,12 @@ public class PrimitiveTypeFloatingNameEditPart extends FloatingLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - PrimitiveTypeFloatingNameEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), PrimitiveTypeFloatingNameEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -362,6 +367,7 @@ public class PrimitiveTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -372,6 +378,7 @@ public class PrimitiveTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -379,6 +386,7 @@ public class PrimitiveTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.PrimitiveType_Shape, getParserElement(), this, VISUAL_ID); @@ -441,6 +449,7 @@ public class PrimitiveTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -468,18 +477,13 @@ public class PrimitiveTypeFloatingNameEditPart extends FloatingLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -491,8 +495,7 @@ public class PrimitiveTypeFloatingNameEditPart extends FloatingLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -518,10 +521,9 @@ public class PrimitiveTypeFloatingNameEditPart extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -537,6 +539,7 @@ public class PrimitiveTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -578,7 +581,8 @@ public class PrimitiveTypeFloatingNameEditPart extends FloatingLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -595,7 +599,8 @@ public class PrimitiveTypeFloatingNameEditPart extends FloatingLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -604,11 +609,15 @@ public class PrimitiveTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -616,6 +625,7 @@ public class PrimitiveTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -623,6 +633,7 @@ public class PrimitiveTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -638,6 +649,7 @@ public class PrimitiveTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -651,6 +663,7 @@ public class PrimitiveTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -673,7 +686,7 @@ public class PrimitiveTypeFloatingNameEditPart extends FloatingLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -692,7 +705,7 @@ public class PrimitiveTypeFloatingNameEditPart extends FloatingLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -705,7 +718,7 @@ public class PrimitiveTypeFloatingNameEditPart extends FloatingLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -715,43 +728,42 @@ public class PrimitiveTypeFloatingNameEditPart extends FloatingLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -760,13 +772,11 @@ public class PrimitiveTypeFloatingNameEditPart extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -783,6 +793,7 @@ public class PrimitiveTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -792,10 +803,10 @@ public class PrimitiveTypeFloatingNameEditPart extends FloatingLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -818,6 +829,7 @@ public class PrimitiveTypeFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeFloatingNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeFloatingNameEditPartCN.java index c289a15956f..1031879d596 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeFloatingNameEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeFloatingNameEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -50,6 +50,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -60,11 +65,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -115,12 +115,14 @@ public class PrimitiveTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -129,10 +131,7 @@ public class PrimitiveTypeFloatingNameEditPartCN extends FloatingLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeFloatingNameEditPartCN.VISUAL_ID), - new Point(0, 0)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PrimitiveTypeFloatingNameEditPartCN.VISUAL_ID), new Point(0, 0)); } /** @@ -145,6 +144,7 @@ public class PrimitiveTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); @@ -156,6 +156,7 @@ public class PrimitiveTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public IBorderItemLocator getBorderItemLocator() { IFigure parentFigure = getFigure().getParent(); if (parentFigure != null && parentFigure.getLayoutManager() != null) { @@ -168,6 +169,7 @@ public class PrimitiveTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public void refreshBounds() { int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); @@ -242,6 +244,7 @@ public class PrimitiveTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -249,6 +252,7 @@ public class PrimitiveTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -281,7 +285,8 @@ public class PrimitiveTypeFloatingNameEditPartCN extends FloatingLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -293,6 +298,7 @@ public class PrimitiveTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -308,11 +314,13 @@ public class PrimitiveTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -326,6 +334,7 @@ public class PrimitiveTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -335,16 +344,12 @@ public class PrimitiveTypeFloatingNameEditPartCN extends FloatingLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - PrimitiveTypeFloatingNameEditPartCN.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), PrimitiveTypeFloatingNameEditPartCN.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -362,6 +367,7 @@ public class PrimitiveTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -372,6 +378,7 @@ public class PrimitiveTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -379,6 +386,7 @@ public class PrimitiveTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.PrimitiveType_Shape_CN, getParserElement(), this, VISUAL_ID); @@ -441,6 +449,7 @@ public class PrimitiveTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -468,18 +477,13 @@ public class PrimitiveTypeFloatingNameEditPartCN extends FloatingLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -491,8 +495,7 @@ public class PrimitiveTypeFloatingNameEditPartCN extends FloatingLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -518,10 +521,9 @@ public class PrimitiveTypeFloatingNameEditPartCN extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -537,6 +539,7 @@ public class PrimitiveTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -578,7 +581,8 @@ public class PrimitiveTypeFloatingNameEditPartCN extends FloatingLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -595,7 +599,8 @@ public class PrimitiveTypeFloatingNameEditPartCN extends FloatingLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -604,11 +609,15 @@ public class PrimitiveTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -616,6 +625,7 @@ public class PrimitiveTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -623,6 +633,7 @@ public class PrimitiveTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -638,6 +649,7 @@ public class PrimitiveTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -651,6 +663,7 @@ public class PrimitiveTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -673,7 +686,7 @@ public class PrimitiveTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -692,7 +705,7 @@ public class PrimitiveTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -705,7 +718,7 @@ public class PrimitiveTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -715,43 +728,42 @@ public class PrimitiveTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -760,13 +772,11 @@ public class PrimitiveTypeFloatingNameEditPartCN extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -783,6 +793,7 @@ public class PrimitiveTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -792,10 +803,10 @@ public class PrimitiveTypeFloatingNameEditPartCN extends FloatingLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -818,6 +829,7 @@ public class PrimitiveTypeFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeNameEditPart.java index dc5ec6ea109..97240706cf6 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeNameEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,20 +64,12 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -115,12 +113,14 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -135,6 +135,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy()); @@ -208,6 +209,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -215,6 +217,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -222,6 +225,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -237,8 +241,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -248,7 +251,8 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -260,6 +264,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -275,11 +280,13 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -293,6 +300,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -302,13 +310,12 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), PrimitiveTypeNameEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), PrimitiveTypeNameEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -326,6 +333,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -336,6 +344,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -343,6 +352,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.PrimitiveType_Shape, getParserElement(), this, VISUAL_ID); @@ -405,6 +415,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -432,18 +443,13 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -455,8 +461,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -482,10 +487,9 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -501,6 +505,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -542,7 +547,8 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -559,7 +565,8 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -568,11 +575,15 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -580,6 +591,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -587,6 +599,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -602,6 +615,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -615,6 +629,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -637,7 +652,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -656,7 +671,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -669,7 +684,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -679,43 +694,42 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -724,13 +738,11 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -747,6 +759,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -755,6 +768,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -763,6 +777,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); @@ -773,10 +788,10 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -793,8 +808,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } super.handleNotificationEvent(event); @@ -803,6 +817,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -816,6 +831,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void activate() { super.activate(); addOwnerElementListeners(); @@ -832,6 +848,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void deactivate() { removeOwnerElementListeners(); super.deactivate(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeNameEditPartCN.java index 0cd69d5bfaf..01da6f37ead 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeNameEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeNameEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,20 +64,12 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -115,12 +113,14 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -135,6 +135,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy()); @@ -208,6 +209,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -215,6 +217,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -222,6 +225,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -237,8 +241,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -248,7 +251,8 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -260,6 +264,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -275,11 +280,13 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -293,6 +300,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -302,13 +310,12 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), PrimitiveTypeNameEditPartCN.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), PrimitiveTypeNameEditPartCN.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -326,6 +333,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -336,6 +344,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -343,6 +352,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.PrimitiveType_Shape_CN, getParserElement(), this, VISUAL_ID); @@ -405,6 +415,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -432,18 +443,13 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -455,8 +461,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -482,10 +487,9 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -501,6 +505,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -542,7 +547,8 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -559,7 +565,8 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -568,11 +575,15 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -580,6 +591,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -587,6 +599,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -602,6 +615,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -615,6 +629,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -637,7 +652,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -656,7 +671,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -669,7 +684,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -679,43 +694,42 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -724,13 +738,11 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -747,6 +759,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -755,6 +768,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -763,6 +777,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); @@ -773,10 +788,10 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -793,8 +808,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } super.handleNotificationEvent(event); @@ -803,6 +817,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -816,6 +831,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void activate() { super.activate(); addOwnerElementListeners(); @@ -832,6 +848,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void deactivate() { removeOwnerElementListeners(); super.deactivate(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeOperationCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeOperationCompartmentEditPart.java index c28ce0dfbbd..8927e777577 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeOperationCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeOperationCompartmentEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -31,7 +31,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartme import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -55,6 +54,7 @@ public class PrimitiveTypeOperationCompartmentEditPart extends ResizeableListCom /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; } @@ -62,6 +62,7 @@ public class PrimitiveTypeOperationCompartmentEditPart extends ResizeableListCom /** * @generated */ + @Override public String getCompartmentName() { return Messages.PrimitiveTypeOperationCompartmentEditPart_title; } @@ -69,6 +70,7 @@ public class PrimitiveTypeOperationCompartmentEditPart extends ResizeableListCom /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -76,16 +78,16 @@ public class PrimitiveTypeOperationCompartmentEditPart extends ResizeableListCom installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PrimitiveTypeOperationCompartmentCanonicalEditPolicy()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PrimitiveTypeOperationCompartmentCanonicalEditPolicy()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); } /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -95,6 +97,7 @@ public class PrimitiveTypeOperationCompartmentEditPart extends ResizeableListCom /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -103,6 +106,7 @@ public class PrimitiveTypeOperationCompartmentEditPart extends ResizeableListCom /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -117,6 +121,7 @@ public class PrimitiveTypeOperationCompartmentEditPart extends ResizeableListCom /** * @generated */ + @Override protected void refreshBounds() { int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); @@ -124,12 +129,16 @@ public class PrimitiveTypeOperationCompartmentEditPart extends ResizeableListCom int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeOperationCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeOperationCompartmentEditPartCN.java index 216fe371e9a..c7141047eab 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeOperationCompartmentEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeOperationCompartmentEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -31,7 +31,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartme import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -55,6 +54,7 @@ public class PrimitiveTypeOperationCompartmentEditPartCN extends ResizeableListC /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; } @@ -62,6 +62,7 @@ public class PrimitiveTypeOperationCompartmentEditPartCN extends ResizeableListC /** * @generated */ + @Override public String getCompartmentName() { return Messages.PrimitiveTypeOperationCompartmentEditPartCN_title; } @@ -69,6 +70,7 @@ public class PrimitiveTypeOperationCompartmentEditPartCN extends ResizeableListC /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -76,16 +78,16 @@ public class PrimitiveTypeOperationCompartmentEditPartCN extends ResizeableListC installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PrimitiveTypeOperationCompartmentCanonicalEditPolicyCN()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.PrimitiveTypeOperationCompartmentCanonicalEditPolicyCN()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); } /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -95,6 +97,7 @@ public class PrimitiveTypeOperationCompartmentEditPartCN extends ResizeableListC /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -103,6 +106,7 @@ public class PrimitiveTypeOperationCompartmentEditPartCN extends ResizeableListC /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -117,6 +121,7 @@ public class PrimitiveTypeOperationCompartmentEditPartCN extends ResizeableListC /** * @generated */ + @Override protected void refreshBounds() { int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); @@ -124,12 +129,16 @@ public class PrimitiveTypeOperationCompartmentEditPartCN extends ResizeableListC int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ProfileApplicationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ProfileApplicationEditPart.java index 9b363cebf2c..0adefe67214 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ProfileApplicationEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ProfileApplicationEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -26,8 +26,8 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLink import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure; /** - * @generated - */ + * @generated + */ public class ProfileApplicationEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart { /** @@ -45,22 +45,23 @@ public class ProfileApplicationEditPart extends UMLConnectionNodeEditPart implem /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeLinkLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); } /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected Connection createConnectionFigure() { return new DashedEdgeFigure(); } @@ -68,6 +69,7 @@ public class ProfileApplicationEditPart extends UMLConnectionNodeEditPart implem /** * @generated */ + @Override public DashedEdgeFigure getPrimaryShape() { return (DashedEdgeFigure) getFigure(); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForClassEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForClassEditPart.java index 7dbae31cc97..1dc5689f16e 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForClassEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForClassEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -53,6 +53,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -63,11 +68,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.PropertyFigure; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypePropertyDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy; @@ -123,12 +123,14 @@ public class PropertyForClassEditPart extends UMLCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -143,6 +145,7 @@ public class PropertyForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -153,14 +156,14 @@ public class PropertyForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy()); installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); - installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypePropertyDisplayEditPolicy()); + installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypePropertyDisplayEditPolicy()); installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new PropertyLabelEditPolicy()); } @@ -230,6 +233,7 @@ public class PropertyForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -237,6 +241,7 @@ public class PropertyForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -244,6 +249,7 @@ public class PropertyForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -269,7 +275,8 @@ public class PropertyForClassEditPart extends UMLCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -281,6 +288,7 @@ public class PropertyForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -296,11 +304,13 @@ public class PropertyForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -314,6 +324,7 @@ public class PropertyForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -323,13 +334,12 @@ public class PropertyForClassEditPart extends UMLCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), PropertyForClassEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), PropertyForClassEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -347,6 +357,7 @@ public class PropertyForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -357,6 +368,7 @@ public class PropertyForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -364,10 +376,10 @@ public class PropertyForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.Property_ClassAttributeLabel, getParserElement(), this, - VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.Property_ClassAttributeLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -427,6 +439,7 @@ public class PropertyForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -454,18 +467,13 @@ public class PropertyForClassEditPart extends UMLCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -477,8 +485,7 @@ public class PropertyForClassEditPart extends UMLCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -504,10 +511,9 @@ public class PropertyForClassEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -523,6 +529,7 @@ public class PropertyForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -564,7 +571,8 @@ public class PropertyForClassEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -581,7 +589,8 @@ public class PropertyForClassEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -590,11 +599,15 @@ public class PropertyForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -602,6 +615,7 @@ public class PropertyForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -609,6 +623,7 @@ public class PropertyForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -624,6 +639,7 @@ public class PropertyForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -637,6 +653,7 @@ public class PropertyForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -659,7 +676,7 @@ public class PropertyForClassEditPart extends UMLCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -678,7 +695,7 @@ public class PropertyForClassEditPart extends UMLCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -691,7 +708,7 @@ public class PropertyForClassEditPart extends UMLCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -701,43 +718,42 @@ public class PropertyForClassEditPart extends UMLCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -746,13 +762,11 @@ public class PropertyForClassEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -769,6 +783,7 @@ public class PropertyForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -777,6 +792,7 @@ public class PropertyForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -785,6 +801,7 @@ public class PropertyForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -794,10 +811,10 @@ public class PropertyForClassEditPart extends UMLCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -823,6 +840,7 @@ public class PropertyForClassEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForComponentEditPart.java index 939c4233512..4bca85ad392 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForComponentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForComponentEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -53,6 +53,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -63,11 +68,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.PropertyFigure; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypePropertyDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy; @@ -123,12 +123,14 @@ public class PropertyForComponentEditPart extends UMLCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -143,6 +145,7 @@ public class PropertyForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -153,14 +156,14 @@ public class PropertyForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy()); installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); - installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypePropertyDisplayEditPolicy()); + installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypePropertyDisplayEditPolicy()); installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new PropertyLabelEditPolicy()); } @@ -230,6 +233,7 @@ public class PropertyForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -237,6 +241,7 @@ public class PropertyForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -244,6 +249,7 @@ public class PropertyForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -269,7 +275,8 @@ public class PropertyForComponentEditPart extends UMLCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -281,6 +288,7 @@ public class PropertyForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -296,11 +304,13 @@ public class PropertyForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -314,6 +324,7 @@ public class PropertyForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -323,14 +334,12 @@ public class PropertyForComponentEditPart extends UMLCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), - PropertyForComponentEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), PropertyForComponentEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -348,6 +357,7 @@ public class PropertyForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -358,6 +368,7 @@ public class PropertyForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -365,10 +376,10 @@ public class PropertyForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.Property_ComponentAttributeLabel, getParserElement(), this, - VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.Property_ComponentAttributeLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -428,6 +439,7 @@ public class PropertyForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -455,18 +467,13 @@ public class PropertyForComponentEditPart extends UMLCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -478,8 +485,7 @@ public class PropertyForComponentEditPart extends UMLCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -505,10 +511,9 @@ public class PropertyForComponentEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -524,6 +529,7 @@ public class PropertyForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -565,7 +571,8 @@ public class PropertyForComponentEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -582,7 +589,8 @@ public class PropertyForComponentEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -591,11 +599,15 @@ public class PropertyForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -603,6 +615,7 @@ public class PropertyForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -610,6 +623,7 @@ public class PropertyForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -625,6 +639,7 @@ public class PropertyForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -638,6 +653,7 @@ public class PropertyForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -660,7 +676,7 @@ public class PropertyForComponentEditPart extends UMLCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -679,7 +695,7 @@ public class PropertyForComponentEditPart extends UMLCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -692,7 +708,7 @@ public class PropertyForComponentEditPart extends UMLCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -702,43 +718,42 @@ public class PropertyForComponentEditPart extends UMLCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -747,13 +762,11 @@ public class PropertyForComponentEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -770,6 +783,7 @@ public class PropertyForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -778,6 +792,7 @@ public class PropertyForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -786,6 +801,7 @@ public class PropertyForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -795,10 +811,10 @@ public class PropertyForComponentEditPart extends UMLCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -824,6 +840,7 @@ public class PropertyForComponentEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForInterfaceEditPart.java index 8004761df0b..e6f84524d17 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForInterfaceEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForInterfaceEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -53,6 +53,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -63,11 +68,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.PropertyFigure; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypePropertyDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy; @@ -123,12 +123,14 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -143,6 +145,7 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -153,14 +156,14 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy()); installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); - installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypePropertyDisplayEditPolicy()); + installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypePropertyDisplayEditPolicy()); installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new PropertyLabelEditPolicy()); } @@ -230,6 +233,7 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -237,6 +241,7 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -244,6 +249,7 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -269,7 +275,8 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -281,6 +288,7 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -296,11 +304,13 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -314,6 +324,7 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -323,14 +334,12 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), - PropertyForInterfaceEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), PropertyForInterfaceEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -348,6 +357,7 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -358,6 +368,7 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -365,10 +376,10 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.Property_InterfaceAttributeLabel, getParserElement(), this, - VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.Property_InterfaceAttributeLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -428,6 +439,7 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -455,18 +467,13 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -478,8 +485,7 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -505,10 +511,9 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -524,6 +529,7 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -565,7 +571,8 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -582,7 +589,8 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -591,11 +599,15 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -603,6 +615,7 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -610,6 +623,7 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -625,6 +639,7 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -638,6 +653,7 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -660,7 +676,7 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -679,7 +695,7 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -692,7 +708,7 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -702,43 +718,42 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -747,13 +762,11 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -770,6 +783,7 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -778,6 +792,7 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -786,6 +801,7 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -795,10 +811,10 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -824,6 +840,7 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForSignalEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForSignalEditPart.java index cfb0903544b..41017156923 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForSignalEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyForSignalEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -53,6 +53,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -63,11 +68,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.PropertyFigure; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypePropertyDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy; @@ -123,12 +123,14 @@ public class PropertyForSignalEditPart extends UMLCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -143,6 +145,7 @@ public class PropertyForSignalEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -153,14 +156,14 @@ public class PropertyForSignalEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy()); installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); - installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypePropertyDisplayEditPolicy()); + installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypePropertyDisplayEditPolicy()); installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new PropertyLabelEditPolicy()); } @@ -230,6 +233,7 @@ public class PropertyForSignalEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -237,6 +241,7 @@ public class PropertyForSignalEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -244,6 +249,7 @@ public class PropertyForSignalEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -269,7 +275,8 @@ public class PropertyForSignalEditPart extends UMLCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -281,6 +288,7 @@ public class PropertyForSignalEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -296,11 +304,13 @@ public class PropertyForSignalEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -314,6 +324,7 @@ public class PropertyForSignalEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -323,13 +334,12 @@ public class PropertyForSignalEditPart extends UMLCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), PropertyForSignalEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), PropertyForSignalEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -347,6 +357,7 @@ public class PropertyForSignalEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -357,6 +368,7 @@ public class PropertyForSignalEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -364,10 +376,10 @@ public class PropertyForSignalEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.Property_SignalAttributeLabel, getParserElement(), this, - VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.Property_SignalAttributeLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -427,6 +439,7 @@ public class PropertyForSignalEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -454,18 +467,13 @@ public class PropertyForSignalEditPart extends UMLCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -477,8 +485,7 @@ public class PropertyForSignalEditPart extends UMLCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -504,10 +511,9 @@ public class PropertyForSignalEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -523,6 +529,7 @@ public class PropertyForSignalEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -564,7 +571,8 @@ public class PropertyForSignalEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -581,7 +589,8 @@ public class PropertyForSignalEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -590,11 +599,15 @@ public class PropertyForSignalEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -602,6 +615,7 @@ public class PropertyForSignalEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -609,6 +623,7 @@ public class PropertyForSignalEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -624,6 +639,7 @@ public class PropertyForSignalEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -637,6 +653,7 @@ public class PropertyForSignalEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -659,7 +676,7 @@ public class PropertyForSignalEditPart extends UMLCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -678,7 +695,7 @@ public class PropertyForSignalEditPart extends UMLCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -691,7 +708,7 @@ public class PropertyForSignalEditPart extends UMLCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -701,43 +718,42 @@ public class PropertyForSignalEditPart extends UMLCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -746,13 +762,11 @@ public class PropertyForSignalEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -769,6 +783,7 @@ public class PropertyForSignalEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -777,6 +792,7 @@ public class PropertyForSignalEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -785,6 +801,7 @@ public class PropertyForSignalEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -794,10 +811,10 @@ public class PropertyForSignalEditPart extends UMLCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -823,6 +840,7 @@ public class PropertyForSignalEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyforDataTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyforDataTypeEditPart.java index 51f350ca018..b0a2302cd5a 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyforDataTypeEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyforDataTypeEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -53,6 +53,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -63,11 +68,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.PropertyFigure; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypePropertyDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy; @@ -123,12 +123,14 @@ public class PropertyforDataTypeEditPart extends UMLCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -143,6 +145,7 @@ public class PropertyforDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -153,14 +156,14 @@ public class PropertyforDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy()); installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); - installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypePropertyDisplayEditPolicy()); + installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypePropertyDisplayEditPolicy()); installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new PropertyLabelEditPolicy()); } @@ -230,6 +233,7 @@ public class PropertyforDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -237,6 +241,7 @@ public class PropertyforDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -244,6 +249,7 @@ public class PropertyforDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -269,7 +275,8 @@ public class PropertyforDataTypeEditPart extends UMLCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -281,6 +288,7 @@ public class PropertyforDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -296,11 +304,13 @@ public class PropertyforDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -314,6 +324,7 @@ public class PropertyforDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -323,13 +334,12 @@ public class PropertyforDataTypeEditPart extends UMLCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), PropertyforDataTypeEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), PropertyforDataTypeEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -347,6 +357,7 @@ public class PropertyforDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -357,6 +368,7 @@ public class PropertyforDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -364,10 +376,10 @@ public class PropertyforDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.Property_DataTypeAttributeLabel, getParserElement(), this, - VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.Property_DataTypeAttributeLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -427,6 +439,7 @@ public class PropertyforDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -454,18 +467,13 @@ public class PropertyforDataTypeEditPart extends UMLCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -477,8 +485,7 @@ public class PropertyforDataTypeEditPart extends UMLCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -504,10 +511,9 @@ public class PropertyforDataTypeEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -523,6 +529,7 @@ public class PropertyforDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -564,7 +571,8 @@ public class PropertyforDataTypeEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -581,7 +589,8 @@ public class PropertyforDataTypeEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -590,11 +599,15 @@ public class PropertyforDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -602,6 +615,7 @@ public class PropertyforDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -609,6 +623,7 @@ public class PropertyforDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -624,6 +639,7 @@ public class PropertyforDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -637,6 +653,7 @@ public class PropertyforDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -659,7 +676,7 @@ public class PropertyforDataTypeEditPart extends UMLCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -678,7 +695,7 @@ public class PropertyforDataTypeEditPart extends UMLCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -691,7 +708,7 @@ public class PropertyforDataTypeEditPart extends UMLCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -701,43 +718,42 @@ public class PropertyforDataTypeEditPart extends UMLCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -746,13 +762,11 @@ public class PropertyforDataTypeEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -769,6 +783,7 @@ public class PropertyforDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -777,6 +792,7 @@ public class PropertyforDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -785,6 +801,7 @@ public class PropertyforDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -794,10 +811,10 @@ public class PropertyforDataTypeEditPart extends UMLCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -823,6 +840,7 @@ public class PropertyforDataTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyforPrimitiveTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyforPrimitiveTypeEditPart.java index b9e189489c9..7880e85cd37 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyforPrimitiveTypeEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PropertyforPrimitiveTypeEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -53,6 +53,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -63,11 +68,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.PropertyFigure; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.AppliedStereotypePropertyDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy; @@ -123,12 +123,14 @@ public class PropertyforPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -143,6 +145,7 @@ public class PropertyforPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -153,14 +156,14 @@ public class PropertyforPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy()); installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); - installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypePropertyDisplayEditPolicy()); + installEditPolicy(AbstractAppliedStereotypeDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypePropertyDisplayEditPolicy()); installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new PropertyLabelEditPolicy()); } @@ -230,6 +233,7 @@ public class PropertyforPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -237,6 +241,7 @@ public class PropertyforPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -244,6 +249,7 @@ public class PropertyforPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -269,7 +275,8 @@ public class PropertyforPrimitiveTypeEditPart extends UMLCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -281,6 +288,7 @@ public class PropertyforPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -296,11 +304,13 @@ public class PropertyforPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -314,6 +324,7 @@ public class PropertyforPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -323,16 +334,12 @@ public class PropertyforPrimitiveTypeEditPart extends UMLCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - PropertyforPrimitiveTypeEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), PropertyforPrimitiveTypeEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -350,6 +357,7 @@ public class PropertyforPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -360,6 +368,7 @@ public class PropertyforPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -367,10 +376,10 @@ public class PropertyforPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.Property_PrimitiveTypeAttributeLabel, getParserElement(), - this, VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.Property_PrimitiveTypeAttributeLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -430,6 +439,7 @@ public class PropertyforPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -457,18 +467,13 @@ public class PropertyforPrimitiveTypeEditPart extends UMLCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -480,8 +485,7 @@ public class PropertyforPrimitiveTypeEditPart extends UMLCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -507,10 +511,9 @@ public class PropertyforPrimitiveTypeEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -526,6 +529,7 @@ public class PropertyforPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -567,7 +571,8 @@ public class PropertyforPrimitiveTypeEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -584,7 +589,8 @@ public class PropertyforPrimitiveTypeEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -593,11 +599,15 @@ public class PropertyforPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -605,6 +615,7 @@ public class PropertyforPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -612,6 +623,7 @@ public class PropertyforPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -627,6 +639,7 @@ public class PropertyforPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -640,6 +653,7 @@ public class PropertyforPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -662,7 +676,7 @@ public class PropertyforPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -681,7 +695,7 @@ public class PropertyforPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -694,7 +708,7 @@ public class PropertyforPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -704,43 +718,42 @@ public class PropertyforPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -749,13 +762,11 @@ public class PropertyforPrimitiveTypeEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -772,6 +783,7 @@ public class PropertyforPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -780,6 +792,7 @@ public class PropertyforPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -788,6 +801,7 @@ public class PropertyforPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -797,10 +811,10 @@ public class PropertyforPrimitiveTypeEditPart extends UMLCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -826,6 +840,7 @@ public class PropertyforPrimitiveTypeEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RealizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RealizationEditPart.java index 7b443a12a3c..9ff1df42ed7 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RealizationEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RealizationEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -27,8 +27,8 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLink import org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure; /** - * @generated - */ + * @generated + */ public class RealizationEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart { /** @@ -46,11 +46,11 @@ public class RealizationEditPart extends UMLConnectionNodeEditPart implements IT /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeLinkLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); } @@ -59,11 +59,12 @@ public class RealizationEditPart extends UMLConnectionNodeEditPart implements IT */ protected boolean addFixedChild(EditPart childEditPart) { if (childEditPart instanceof AppliedStereotypeRealizationEditPart) { - ((AppliedStereotypeRealizationEditPart) childEditPart) - .setLabel(getPrimaryShape().getAppliedStereotypeLabel()); + ((AppliedStereotypeRealizationEditPart) childEditPart).setLabel( + getPrimaryShape().getAppliedStereotypeLabel()); } if (childEditPart instanceof RealizationNameEditPart) { - ((RealizationNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel()); + ((RealizationNameEditPart) childEditPart).setLabel( + getPrimaryShape().getNameLabel()); } return false; } @@ -71,6 +72,7 @@ public class RealizationEditPart extends UMLConnectionNodeEditPart implements IT /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -94,6 +96,7 @@ public class RealizationEditPart extends UMLConnectionNodeEditPart implements IT /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -103,12 +106,13 @@ public class RealizationEditPart extends UMLConnectionNodeEditPart implements IT /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected Connection createConnectionFigure() { return new InterfaceRealizationFigure(); } @@ -116,6 +120,7 @@ public class RealizationEditPart extends UMLConnectionNodeEditPart implements IT /** * @generated */ + @Override public InterfaceRealizationFigure getPrimaryShape() { return (InterfaceRealizationFigure) getFigure(); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RealizationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RealizationNameEditPart.java index afd66473a79..77f04028c1e 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RealizationNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RealizationNameEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,12 +64,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -114,12 +114,14 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -128,10 +130,7 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry - .getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationNameEditPart.VISUAL_ID), - new Point(0, 60)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.RealizationNameEditPart.VISUAL_ID), new Point(0, 60)); } /** @@ -155,6 +154,7 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public int getKeyPoint() { return ConnectionLocator.MIDDLE; } @@ -225,6 +225,7 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -232,6 +233,7 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -239,6 +241,7 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -264,7 +267,8 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -276,6 +280,7 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -291,11 +296,13 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -309,6 +316,7 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -318,13 +326,12 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), RealizationNameEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), RealizationNameEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -342,6 +349,7 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -352,6 +360,7 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -359,6 +368,7 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Realization_Edge, getParserElement(), this, VISUAL_ID); @@ -421,6 +431,7 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -448,18 +459,13 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -471,8 +477,7 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -498,10 +503,9 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -517,6 +521,7 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -558,7 +563,8 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -575,7 +581,8 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -584,11 +591,15 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -596,6 +607,7 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -603,6 +615,7 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -618,6 +631,7 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -631,6 +645,7 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -653,7 +668,7 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -672,7 +687,7 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -685,7 +700,7 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -695,43 +710,42 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -740,13 +754,11 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -763,6 +775,7 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -772,10 +785,10 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -799,6 +812,7 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -807,6 +821,7 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getLabelRole() { return "Name";//$NON-NLS-1$ } @@ -814,6 +829,7 @@ public class RealizationNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getIconPathRole() { return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png";//$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ReceptionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ReceptionEditPart.java index 1a089c68770..ffa73a6a4ab 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ReceptionEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ReceptionEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -54,6 +54,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -64,13 +70,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.ReceptionFigure; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; @@ -79,7 +78,6 @@ import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEdi import org.eclipse.papyrus.uml.diagram.common.editparts.UMLCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -124,12 +122,14 @@ public class ReceptionEditPart extends UMLCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -144,6 +144,7 @@ public class ReceptionEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -154,6 +155,7 @@ public class ReceptionEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); @@ -228,6 +230,7 @@ public class ReceptionEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -235,6 +238,7 @@ public class ReceptionEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -242,6 +246,7 @@ public class ReceptionEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -257,8 +262,7 @@ public class ReceptionEditPart extends UMLCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -268,7 +272,8 @@ public class ReceptionEditPart extends UMLCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -280,6 +285,7 @@ public class ReceptionEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -295,11 +301,13 @@ public class ReceptionEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -313,6 +321,7 @@ public class ReceptionEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -322,14 +331,12 @@ public class ReceptionEditPart extends UMLCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), ReceptionEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ReceptionEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -347,6 +354,7 @@ public class ReceptionEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -357,6 +365,7 @@ public class ReceptionEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -364,10 +373,10 @@ public class ReceptionEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.Reception_ReceptionLabel, getParserElement(), this, - VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.Reception_ReceptionLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -427,6 +436,7 @@ public class ReceptionEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -454,18 +464,13 @@ public class ReceptionEditPart extends UMLCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -477,8 +482,7 @@ public class ReceptionEditPart extends UMLCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -504,10 +508,9 @@ public class ReceptionEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -523,6 +526,7 @@ public class ReceptionEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -564,7 +568,8 @@ public class ReceptionEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -581,7 +586,8 @@ public class ReceptionEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -590,11 +596,15 @@ public class ReceptionEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -602,6 +612,7 @@ public class ReceptionEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -609,6 +620,7 @@ public class ReceptionEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -624,6 +636,7 @@ public class ReceptionEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -637,6 +650,7 @@ public class ReceptionEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -659,7 +673,7 @@ public class ReceptionEditPart extends UMLCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -678,7 +692,7 @@ public class ReceptionEditPart extends UMLCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -691,7 +705,7 @@ public class ReceptionEditPart extends UMLCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -701,43 +715,42 @@ public class ReceptionEditPart extends UMLCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -746,13 +759,11 @@ public class ReceptionEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -769,6 +780,7 @@ public class ReceptionEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -777,6 +789,7 @@ public class ReceptionEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -785,6 +798,7 @@ public class ReceptionEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -794,10 +808,10 @@ public class ReceptionEditPart extends UMLCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -814,8 +828,7 @@ public class ReceptionEditPart extends UMLCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) { @@ -827,6 +840,7 @@ public class ReceptionEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ReceptionInInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ReceptionInInterfaceEditPart.java index 1b634f31bd0..e74ef309a03 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ReceptionInInterfaceEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ReceptionInInterfaceEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -55,6 +55,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -65,13 +71,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.ReceptionFigure; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; @@ -79,7 +78,6 @@ import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -124,12 +122,14 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -144,6 +144,7 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -154,6 +155,7 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); @@ -228,6 +230,7 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -235,6 +238,7 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -242,6 +246,7 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -257,8 +262,7 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -268,7 +272,8 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -280,6 +285,7 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -295,11 +301,13 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -313,6 +321,7 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -322,14 +331,12 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), - ReceptionInInterfaceEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), ReceptionInInterfaceEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -347,6 +354,7 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -357,6 +365,7 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -364,10 +373,10 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.Reception_InterfaceReceptionLabel, getParserElement(), this, - VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.Reception_InterfaceReceptionLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -427,6 +436,7 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -454,18 +464,13 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -477,8 +482,7 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -504,10 +508,9 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -523,6 +526,7 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -564,7 +568,8 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -581,7 +586,8 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -590,11 +596,15 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -602,6 +612,7 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -609,6 +620,7 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -624,6 +636,7 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -637,6 +650,7 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -659,7 +673,7 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -678,7 +692,7 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -691,7 +705,7 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -701,43 +715,42 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -746,13 +759,11 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -769,6 +780,7 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -777,6 +789,7 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -785,6 +798,7 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -794,10 +808,10 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -814,8 +828,7 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) { @@ -827,6 +840,7 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RedefinableTemplateSignatureEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RedefinableTemplateSignatureEditPart.java index 7e76794b13d..b055db0e74c 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RedefinableTemplateSignatureEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RedefinableTemplateSignatureEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -73,6 +73,7 @@ public class RedefinableTemplateSignatureEditPart extends AbstractRedefinableTem /** * @generated */ + @Override protected void createDefaultEditPolicies() { installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); super.createDefaultEditPolicies(); @@ -116,9 +117,11 @@ public class RedefinableTemplateSignatureEditPart extends AbstractRedefinableTem } /** - *Papyrus codeGen - *@generated - **/ + * Papyrus codeGen + * + * @generated + **/ + @Override protected void handleNotificationEvent(Notification event) { super.handleNotificationEvent(event); @@ -133,6 +136,7 @@ public class RedefinableTemplateSignatureEditPart extends AbstractRedefinableTem /** * org.eclipse.papyrus.uml.diagram.clazz.custom.figure.TemplateFigure + * * @generated */ public TemplateFigure getPrimaryShape() { @@ -144,9 +148,10 @@ public class RedefinableTemplateSignatureEditPart extends AbstractRedefinableTem */ protected boolean addFixedChild(EditPart childEditPart) { + if (childEditPart instanceof RedefinableTemplateSignatureTemplateParameterCompartmentEditPart) { IFigure pane = getPrimaryShape().getTemplateParameterRectangle(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((RedefinableTemplateSignatureTemplateParameterCompartmentEditPart) childEditPart).getFigure()); return true; } @@ -169,6 +174,7 @@ public class RedefinableTemplateSignatureEditPart extends AbstractRedefinableTem /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -179,6 +185,7 @@ public class RedefinableTemplateSignatureEditPart extends AbstractRedefinableTem /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -189,6 +196,7 @@ public class RedefinableTemplateSignatureEditPart extends AbstractRedefinableTem /** * @generated */ + @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { if (editPart instanceof RedefinableTemplateSignatureTemplateParameterCompartmentEditPart) { return getPrimaryShape().getTemplateParameterRectangle(); @@ -206,12 +214,13 @@ public class RedefinableTemplateSignatureEditPart extends AbstractRedefinableTem /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected NodeFigure createNodeFigure() { NodeFigure figure = createNodePlate(); figure.setLayoutManager(new StackLayout()); @@ -225,7 +234,9 @@ public class RedefinableTemplateSignatureEditPart extends AbstractRedefinableTem /** * Default implementation treats passed figure as content pane. * Respects layout one may have set for generated figure. - * @param nodeShape instance of generated figure class + * + * @param nodeShape + * instance of generated figure class * @generated */ protected IFigure setupContentPane(IFigure nodeShape) { @@ -240,6 +251,7 @@ public class RedefinableTemplateSignatureEditPart extends AbstractRedefinableTem /** * @generated */ + @Override public IFigure getContentPane() { if (contentPane != null) { return contentPane; @@ -250,6 +262,7 @@ public class RedefinableTemplateSignatureEditPart extends AbstractRedefinableTem /** * @generated */ + @Override protected void setForegroundColor(Color color) { if (primaryShape != null) { primaryShape.setForegroundColor(color); @@ -259,6 +272,7 @@ public class RedefinableTemplateSignatureEditPart extends AbstractRedefinableTem /** * @generated */ + @Override protected void setLineWidth(int width) { super.setLineWidth(width); } @@ -266,6 +280,7 @@ public class RedefinableTemplateSignatureEditPart extends AbstractRedefinableTem /** * @generated */ + @Override protected void setLineType(int style) { if (primaryShape instanceof IPapyrusNodeFigure) { ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); @@ -275,27 +290,22 @@ public class RedefinableTemplateSignatureEditPart extends AbstractRedefinableTem /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { if (request instanceof CreateViewAndElementRequest) { - CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor() - .getCreateElementRequestAdapter(); + CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter(); IElementType type = (IElementType) adapter.getAdapter(IElementType.class); if (UMLElementTypes.isKindOf(type, UMLElementTypes.ClassifierTemplateParameter_TemplateParameterLabel)) { - return getChildBySemanticHint(UMLVisualIDRegistry - .getType(RedefinableTemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(RedefinableTemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID)); } - if (UMLElementTypes.isKindOf(type, - UMLElementTypes.ConnectableElementTemplateParameter_TemplateParameterLabel)) { - return getChildBySemanticHint(UMLVisualIDRegistry - .getType(RedefinableTemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID)); + if (UMLElementTypes.isKindOf(type, UMLElementTypes.ConnectableElementTemplateParameter_TemplateParameterLabel)) { + return getChildBySemanticHint(UMLVisualIDRegistry.getType(RedefinableTemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.OperationTemplateParameter_TemplateParameterLabel)) { - return getChildBySemanticHint(UMLVisualIDRegistry - .getType(RedefinableTemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(RedefinableTemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.TemplateParameter_TemplateParameterLabel)) { - return getChildBySemanticHint(UMLVisualIDRegistry - .getType(RedefinableTemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(RedefinableTemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID)); } } return super.getTargetEditPart(request); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RedefinableTemplateSignatureTemplateParameterCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RedefinableTemplateSignatureTemplateParameterCompartmentEditPart.java index 939d5707de9..7db535b61b0 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RedefinableTemplateSignatureTemplateParameterCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RedefinableTemplateSignatureTemplateParameterCompartmentEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -29,7 +29,6 @@ import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -53,6 +52,7 @@ public class RedefinableTemplateSignatureTemplateParameterCompartmentEditPart ex /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; } @@ -60,6 +60,7 @@ public class RedefinableTemplateSignatureTemplateParameterCompartmentEditPart ex /** * @generated */ + @Override public String getCompartmentName() { return Messages.RedefinableTemplateSignatureTemplateParameterCompartmentEditPart_title; } @@ -67,22 +68,23 @@ public class RedefinableTemplateSignatureTemplateParameterCompartmentEditPart ex /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy()); installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.RedefinableTemplateSignatureTemplateParameterCompartmentCanonicalEditPolicy()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.RedefinableTemplateSignatureTemplateParameterCompartmentCanonicalEditPolicy()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); } /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -92,6 +94,7 @@ public class RedefinableTemplateSignatureTemplateParameterCompartmentEditPart ex /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -100,6 +103,7 @@ public class RedefinableTemplateSignatureTemplateParameterCompartmentEditPart ex /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -121,12 +125,16 @@ public class RedefinableTemplateSignatureTemplateParameterCompartmentEditPart ex int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ShortCutDiagramEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ShortCutDiagramEditPart.java index c877ab0fcfa..c4fb7691c3e 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ShortCutDiagramEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ShortCutDiagramEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -80,6 +80,7 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart { /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); @@ -138,9 +139,11 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart { } /** - *Papyrus codeGen - *@generated - **/ + * Papyrus codeGen + * + * @generated + **/ + @Override protected void handleNotificationEvent(Notification event) { /* * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart @@ -149,7 +152,8 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart { if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) { Object notifier = event.getNotifier(); List<?> modelChildren = ((View) getModel()).getChildren(); - if (false == notifier instanceof Edge && false == notifier instanceof BasicCompartment) { + if (false == notifier instanceof Edge + && false == notifier instanceof BasicCompartment) { if (modelChildren.contains(event.getNotifier())) { return; } @@ -162,14 +166,17 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart { /** * @generated */ + @Override protected IFigure createNodeShape() { return primaryShape = new DiagramNodeFigure(); } /** * org.eclipse.papyrus.uml.diagram.common.figure.node.DiagramNodeFigure + * * @generated */ + @Override public DiagramNodeFigure getPrimaryShape() { return (DiagramNodeFigure) primaryShape; } @@ -177,6 +184,7 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart { /** * @generated */ + @Override protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) { if (borderItemEditPart instanceof DiagramNameEditPart) { BorderItemLocator locator = new BorderItemLocator(getMainFigure(), PositionConstants.SOUTH); @@ -190,6 +198,7 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart { /** * @generated */ + @Override protected NodeFigure createNodePlate() { RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(20, 20); return result; @@ -197,12 +206,13 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart { /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected NodeFigure createMainFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); @@ -211,9 +221,12 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart { /** * Default implementation treats passed figure as content pane. * Respects layout one may have set for generated figure. - * @param nodeShape instance of generated figure class + * + * @param nodeShape + * instance of generated figure class * @generated */ + @Override protected IFigure setupContentPane(IFigure nodeShape) { return nodeShape; // use nodeShape itself as contentPane } @@ -221,6 +234,7 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart { /** * @generated */ + @Override public IFigure getContentPane() { if (contentPane != null) { return contentPane; @@ -231,6 +245,7 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart { /** * @generated */ + @Override protected void setForegroundColor(Color color) { if (primaryShape != null) { primaryShape.setForegroundColor(color); @@ -240,6 +255,7 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart { /** * @generated */ + @Override protected void setLineWidth(int width) { super.setLineWidth(width); } @@ -247,6 +263,7 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart { /** * @generated */ + @Override protected void setLineType(int style) { if (primaryShape instanceof IPapyrusNodeFigure) { ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); @@ -256,6 +273,7 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart { /** * @generated */ + @Override public EditPart getPrimaryChildEditPart() { return getChildBySemanticHint(UMLVisualIDRegistry.getType(DiagramNameEditPart.VISUAL_ID)); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalAttributeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalAttributeCompartmentEditPart.java index ebe20358de3..57d0c35c6fe 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalAttributeCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalAttributeCompartmentEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -32,7 +32,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPo import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -56,6 +55,7 @@ public class SignalAttributeCompartmentEditPart extends ListCompartmentEditPart /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; } @@ -63,6 +63,7 @@ public class SignalAttributeCompartmentEditPart extends ListCompartmentEditPart /** * @generated */ + @Override public String getCompartmentName() { return Messages.SignalAttributeCompartmentEditPart_title; } @@ -70,6 +71,7 @@ public class SignalAttributeCompartmentEditPart extends ListCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -77,10 +79,9 @@ public class SignalAttributeCompartmentEditPart extends ListCompartmentEditPart installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.SignalAttributeCompartmentCanonicalEditPolicy()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.SignalAttributeCompartmentCanonicalEditPolicy()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); installEditPolicy(BorderDisplayEditPolicy.BORDER_DISPLAY_EDITPOLICY, new BorderDisplayEditPolicy()); } @@ -88,6 +89,7 @@ public class SignalAttributeCompartmentEditPart extends ListCompartmentEditPart /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -97,6 +99,7 @@ public class SignalAttributeCompartmentEditPart extends ListCompartmentEditPart /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -105,6 +108,7 @@ public class SignalAttributeCompartmentEditPart extends ListCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -126,12 +130,16 @@ public class SignalAttributeCompartmentEditPart extends ListCompartmentEditPart int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalAttributeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalAttributeCompartmentEditPartCN.java index 2ca2e4645cc..984edf1615c 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalAttributeCompartmentEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalAttributeCompartmentEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -31,7 +31,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartme import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -55,6 +54,7 @@ public class SignalAttributeCompartmentEditPartCN extends ResizeableListCompartm /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; } @@ -62,6 +62,7 @@ public class SignalAttributeCompartmentEditPartCN extends ResizeableListCompartm /** * @generated */ + @Override public String getCompartmentName() { return Messages.SignalAttributeCompartmentEditPartCN_title; } @@ -69,6 +70,7 @@ public class SignalAttributeCompartmentEditPartCN extends ResizeableListCompartm /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy()); @@ -76,16 +78,16 @@ public class SignalAttributeCompartmentEditPartCN extends ResizeableListCompartm installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.SignalAttributeCompartmentCanonicalEditPolicyCN()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.SignalAttributeCompartmentCanonicalEditPolicyCN()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); } /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -95,6 +97,7 @@ public class SignalAttributeCompartmentEditPartCN extends ResizeableListCompartm /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -103,6 +106,7 @@ public class SignalAttributeCompartmentEditPartCN extends ResizeableListCompartm /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -117,6 +121,7 @@ public class SignalAttributeCompartmentEditPartCN extends ResizeableListCompartm /** * @generated */ + @Override protected void refreshBounds() { int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); @@ -124,12 +129,16 @@ public class SignalAttributeCompartmentEditPartCN extends ResizeableListCompartm int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalEditPart.java index c67f40c1a42..f9e5bb6012d 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -96,6 +96,7 @@ public class SignalEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void createDefaultEditPolicies() { installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); super.createDefaultEditPolicies(); @@ -104,18 +105,15 @@ public class SignalEditPart extends ClassifierEditPart { installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.SignalCanonicalEditPolicy()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.SignalCanonicalEditPolicy()); installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); - installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, - new ShowHideCompartmentEditPolicy()); - installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, - new ShowHideClassifierContentsEditPolicy()); + installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy()); + installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies @@ -169,9 +167,11 @@ public class SignalEditPart extends ClassifierEditPart { } /** - *Papyrus codeGen - *@generated - **/ + * Papyrus codeGen + * + * @generated + **/ + @Override protected void handleNotificationEvent(Notification event) { /* * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart @@ -180,7 +180,8 @@ public class SignalEditPart extends ClassifierEditPart { if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) { Object notifier = event.getNotifier(); List<?> modelChildren = ((View) getModel()).getChildren(); - if (false == notifier instanceof Edge && false == notifier instanceof BasicCompartment) { + if (false == notifier instanceof Edge + && false == notifier instanceof BasicCompartment) { if (modelChildren.contains(event.getNotifier())) { return; } @@ -193,14 +194,17 @@ public class SignalEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected IFigure createNodeShape() { return primaryShape = new SignalFigure(); } /** * org.eclipse.papyrus.uml.diagram.common.figure.node.SignalFigure + * * @generated */ + @Override public SignalFigure getPrimaryShape() { return (SignalFigure) primaryShape; } @@ -214,21 +218,24 @@ public class SignalEditPart extends ClassifierEditPart { return true; } + if (childEditPart instanceof SignalAttributeCompartmentEditPart) { IFigure pane = getPrimaryShape().getAttributeCompartmentFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((SignalAttributeCompartmentEditPart) childEditPart).getFigure()); return true; } - //Papyrus Gencode :precise the locator for a template signature + + + // Papyrus Gencode :precise the locator for a template signature if (childEditPart instanceof RedefinableTemplateSignatureEditPart) { IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST); - getBorderedFigure().getBorderItemContainer() - .add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator); + getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator); return true; } + return false; } @@ -245,8 +252,7 @@ public class SignalEditPart extends ClassifierEditPart { return true; } if (childEditPart instanceof RedefinableTemplateSignatureEditPart) { - getBorderedFigure().getBorderItemContainer() - .remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure()); + getBorderedFigure().getBorderItemContainer().remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure()); return true; } return false; @@ -255,6 +261,7 @@ public class SignalEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -265,6 +272,7 @@ public class SignalEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -275,6 +283,7 @@ public class SignalEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { if (editPart instanceof SignalAttributeCompartmentEditPart) { return getPrimaryShape().getAttributeCompartmentFigure(); @@ -288,6 +297,7 @@ public class SignalEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) { if (borderItemEditPart instanceof SignalFloatingNameEditPart) { IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure()); @@ -300,6 +310,7 @@ public class SignalEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected NodeFigure createNodePlate() { RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(100, 100); return result; @@ -307,12 +318,13 @@ public class SignalEditPart extends ClassifierEditPart { /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected NodeFigure createMainFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); @@ -321,9 +333,12 @@ public class SignalEditPart extends ClassifierEditPart { /** * Default implementation treats passed figure as content pane. * Respects layout one may have set for generated figure. - * @param nodeShape instance of generated figure class + * + * @param nodeShape + * instance of generated figure class * @generated */ + @Override protected IFigure setupContentPane(IFigure nodeShape) { if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); @@ -336,6 +351,7 @@ public class SignalEditPart extends ClassifierEditPart { /** * @generated */ + @Override public IFigure getContentPane() { if (contentPane != null) { return contentPane; @@ -346,6 +362,7 @@ public class SignalEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void setForegroundColor(Color color) { if (primaryShape != null) { primaryShape.setForegroundColor(color); @@ -355,6 +372,7 @@ public class SignalEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void setLineWidth(int width) { super.setLineWidth(width); } @@ -362,6 +380,7 @@ public class SignalEditPart extends ClassifierEditPart { /** * @generated */ + @Override protected void setLineType(int style) { if (primaryShape instanceof IPapyrusNodeFigure) { ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); @@ -371,6 +390,7 @@ public class SignalEditPart extends ClassifierEditPart { /** * @generated */ + @Override public EditPart getPrimaryChildEditPart() { return getChildBySemanticHint(UMLVisualIDRegistry.getType(SignalNameEditPart.VISUAL_ID)); } @@ -378,14 +398,13 @@ public class SignalEditPart extends ClassifierEditPart { /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { if (request instanceof CreateViewAndElementRequest) { - CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor() - .getCreateElementRequestAdapter(); + CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter(); IElementType type = (IElementType) adapter.getAdapter(IElementType.class); if (UMLElementTypes.isKindOf(type, UMLElementTypes.Property_SignalAttributeLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(SignalAttributeCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(SignalAttributeCompartmentEditPart.VISUAL_ID)); } } return super.getTargetEditPart(request); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalEditPartCN.java index 9ceb6578859..0d20deb875d 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -97,6 +97,7 @@ public class SignalEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void createDefaultEditPolicies() { installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); super.createDefaultEditPolicies(); @@ -105,19 +106,16 @@ public class SignalEditPartCN extends ClassifierEditPart { installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.SignalCanonicalEditPolicyCN()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.SignalCanonicalEditPolicyCN()); installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); installEditPolicy("RESIZE_BORDER_ITEMS", new ConstrainedItemBorderLayoutEditPolicy()); //$NON-NLS-1$ - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeNodeLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); - installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, - new ShowHideCompartmentEditPolicy()); - installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, - new ShowHideClassifierContentsEditPolicy()); + installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy()); + installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy()); // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies @@ -171,9 +169,11 @@ public class SignalEditPartCN extends ClassifierEditPart { } /** - *Papyrus codeGen - *@generated - **/ + * Papyrus codeGen + * + * @generated + **/ + @Override protected void handleNotificationEvent(Notification event) { /* * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart @@ -182,7 +182,8 @@ public class SignalEditPartCN extends ClassifierEditPart { if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) { Object notifier = event.getNotifier(); List<?> modelChildren = ((View) getModel()).getChildren(); - if (false == notifier instanceof Edge && false == notifier instanceof BasicCompartment) { + if (false == notifier instanceof Edge + && false == notifier instanceof BasicCompartment) { if (modelChildren.contains(event.getNotifier())) { return; } @@ -195,14 +196,17 @@ public class SignalEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected IFigure createNodeShape() { return primaryShape = new SignalFigure(); } /** * org.eclipse.papyrus.uml.diagram.common.figure.node.SignalFigure + * * @generated */ + @Override public SignalFigure getPrimaryShape() { return (SignalFigure) primaryShape; } @@ -216,21 +220,24 @@ public class SignalEditPartCN extends ClassifierEditPart { return true; } + if (childEditPart instanceof SignalAttributeCompartmentEditPartCN) { IFigure pane = getPrimaryShape().getAttributeCompartmentFigure(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((SignalAttributeCompartmentEditPartCN) childEditPart).getFigure()); return true; } - //Papyrus Gencode :precise the locator for a template signature + + + // Papyrus Gencode :precise the locator for a template signature if (childEditPart instanceof RedefinableTemplateSignatureEditPart) { IBorderItemLocator locator = new TemplateBorderItemLocator(getMainFigure(), PositionConstants.EAST); - getBorderedFigure().getBorderItemContainer() - .add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator); + getBorderedFigure().getBorderItemContainer().add(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure(), locator); return true; } + return false; } @@ -247,8 +254,7 @@ public class SignalEditPartCN extends ClassifierEditPart { return true; } if (childEditPart instanceof RedefinableTemplateSignatureEditPart) { - getBorderedFigure().getBorderItemContainer() - .remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure()); + getBorderedFigure().getBorderItemContainer().remove(((RedefinableTemplateSignatureEditPart) childEditPart).getFigure()); return true; } return false; @@ -257,6 +263,7 @@ public class SignalEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -267,6 +274,7 @@ public class SignalEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -277,6 +285,7 @@ public class SignalEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { if (editPart instanceof SignalAttributeCompartmentEditPartCN) { return getPrimaryShape().getAttributeCompartmentFigure(); @@ -290,6 +299,7 @@ public class SignalEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) { if (borderItemEditPart instanceof SignalFloatingNameEditPartCN) { IBorderItemLocator locator = new RoundedRectangleLabelPositionLocator(getMainFigure()); @@ -302,6 +312,7 @@ public class SignalEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected NodeFigure createNodePlate() { RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(100, 100); return result; @@ -309,12 +320,13 @@ public class SignalEditPartCN extends ClassifierEditPart { /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected NodeFigure createMainFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); @@ -323,9 +335,12 @@ public class SignalEditPartCN extends ClassifierEditPart { /** * Default implementation treats passed figure as content pane. * Respects layout one may have set for generated figure. - * @param nodeShape instance of generated figure class + * + * @param nodeShape + * instance of generated figure class * @generated */ + @Override protected IFigure setupContentPane(IFigure nodeShape) { if (nodeShape.getLayoutManager() == null) { ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout(); @@ -338,6 +353,7 @@ public class SignalEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override public IFigure getContentPane() { if (contentPane != null) { return contentPane; @@ -348,6 +364,7 @@ public class SignalEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void setForegroundColor(Color color) { if (primaryShape != null) { primaryShape.setForegroundColor(color); @@ -357,6 +374,7 @@ public class SignalEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void setLineWidth(int width) { super.setLineWidth(width); } @@ -364,6 +382,7 @@ public class SignalEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override protected void setLineType(int style) { if (primaryShape instanceof IPapyrusNodeFigure) { ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); @@ -373,6 +392,7 @@ public class SignalEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override public EditPart getPrimaryChildEditPart() { return getChildBySemanticHint(UMLVisualIDRegistry.getType(SignalNameEditPartCN.VISUAL_ID)); } @@ -380,14 +400,13 @@ public class SignalEditPartCN extends ClassifierEditPart { /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { if (request instanceof CreateViewAndElementRequest) { - CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor() - .getCreateElementRequestAdapter(); + CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter(); IElementType type = (IElementType) adapter.getAdapter(IElementType.class); if (UMLElementTypes.isKindOf(type, UMLElementTypes.Property_SignalAttributeLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(SignalAttributeCompartmentEditPartCN.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(SignalAttributeCompartmentEditPartCN.VISUAL_ID)); } } return super.getTargetEditPart(request); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalFloatingNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalFloatingNameEditPart.java index f8e4a58921a..6caf2e2be54 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalFloatingNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalFloatingNameEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -50,6 +50,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -60,11 +65,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -115,12 +115,14 @@ public class SignalFloatingNameEditPart extends FloatingLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -129,10 +131,7 @@ public class SignalFloatingNameEditPart extends FloatingLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry - .getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalFloatingNameEditPart.VISUAL_ID), - new Point(0, 0)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalFloatingNameEditPart.VISUAL_ID), new Point(0, 0)); } /** @@ -145,6 +144,7 @@ public class SignalFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); @@ -156,6 +156,7 @@ public class SignalFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IBorderItemLocator getBorderItemLocator() { IFigure parentFigure = getFigure().getParent(); if (parentFigure != null && parentFigure.getLayoutManager() != null) { @@ -168,6 +169,7 @@ public class SignalFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public void refreshBounds() { int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); @@ -242,6 +244,7 @@ public class SignalFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -249,6 +252,7 @@ public class SignalFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -281,7 +285,8 @@ public class SignalFloatingNameEditPart extends FloatingLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -293,6 +298,7 @@ public class SignalFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -308,11 +314,13 @@ public class SignalFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -326,6 +334,7 @@ public class SignalFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -335,13 +344,12 @@ public class SignalFloatingNameEditPart extends FloatingLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), SignalFloatingNameEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), SignalFloatingNameEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -359,6 +367,7 @@ public class SignalFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -369,6 +378,7 @@ public class SignalFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -376,6 +386,7 @@ public class SignalFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Signal_Shape, getParserElement(), this, VISUAL_ID); @@ -438,6 +449,7 @@ public class SignalFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -465,18 +477,13 @@ public class SignalFloatingNameEditPart extends FloatingLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -488,8 +495,7 @@ public class SignalFloatingNameEditPart extends FloatingLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -515,10 +521,9 @@ public class SignalFloatingNameEditPart extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -534,6 +539,7 @@ public class SignalFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -575,7 +581,8 @@ public class SignalFloatingNameEditPart extends FloatingLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -592,7 +599,8 @@ public class SignalFloatingNameEditPart extends FloatingLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -601,11 +609,15 @@ public class SignalFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -613,6 +625,7 @@ public class SignalFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -620,6 +633,7 @@ public class SignalFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -635,6 +649,7 @@ public class SignalFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -648,6 +663,7 @@ public class SignalFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -670,7 +686,7 @@ public class SignalFloatingNameEditPart extends FloatingLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -689,7 +705,7 @@ public class SignalFloatingNameEditPart extends FloatingLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -702,7 +718,7 @@ public class SignalFloatingNameEditPart extends FloatingLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -712,43 +728,42 @@ public class SignalFloatingNameEditPart extends FloatingLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -757,13 +772,11 @@ public class SignalFloatingNameEditPart extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -780,6 +793,7 @@ public class SignalFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -789,10 +803,10 @@ public class SignalFloatingNameEditPart extends FloatingLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -815,6 +829,7 @@ public class SignalFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalFloatingNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalFloatingNameEditPartCN.java index 0d414c85cc0..2a5c9682ac0 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalFloatingNameEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalFloatingNameEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -50,6 +50,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -60,11 +65,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -115,12 +115,14 @@ public class SignalFloatingNameEditPartCN extends FloatingLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -129,10 +131,7 @@ public class SignalFloatingNameEditPartCN extends FloatingLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalFloatingNameEditPartCN.VISUAL_ID), - new Point(0, 0)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SignalFloatingNameEditPartCN.VISUAL_ID), new Point(0, 0)); } /** @@ -145,6 +144,7 @@ public class SignalFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); @@ -156,6 +156,7 @@ public class SignalFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public IBorderItemLocator getBorderItemLocator() { IFigure parentFigure = getFigure().getParent(); if (parentFigure != null && parentFigure.getLayoutManager() != null) { @@ -168,6 +169,7 @@ public class SignalFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public void refreshBounds() { int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); @@ -242,6 +244,7 @@ public class SignalFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -249,6 +252,7 @@ public class SignalFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -281,7 +285,8 @@ public class SignalFloatingNameEditPartCN extends FloatingLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -293,6 +298,7 @@ public class SignalFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -308,11 +314,13 @@ public class SignalFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -326,6 +334,7 @@ public class SignalFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -335,14 +344,12 @@ public class SignalFloatingNameEditPartCN extends FloatingLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), - SignalFloatingNameEditPartCN.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), SignalFloatingNameEditPartCN.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -360,6 +367,7 @@ public class SignalFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -370,6 +378,7 @@ public class SignalFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -377,6 +386,7 @@ public class SignalFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Signal_Shape_CN, getParserElement(), this, VISUAL_ID); @@ -439,6 +449,7 @@ public class SignalFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -466,18 +477,13 @@ public class SignalFloatingNameEditPartCN extends FloatingLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -489,8 +495,7 @@ public class SignalFloatingNameEditPartCN extends FloatingLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -516,10 +521,9 @@ public class SignalFloatingNameEditPartCN extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -535,6 +539,7 @@ public class SignalFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -576,7 +581,8 @@ public class SignalFloatingNameEditPartCN extends FloatingLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -593,7 +599,8 @@ public class SignalFloatingNameEditPartCN extends FloatingLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -602,11 +609,15 @@ public class SignalFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -614,6 +625,7 @@ public class SignalFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -621,6 +633,7 @@ public class SignalFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -636,6 +649,7 @@ public class SignalFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -649,6 +663,7 @@ public class SignalFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -671,7 +686,7 @@ public class SignalFloatingNameEditPartCN extends FloatingLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -690,7 +705,7 @@ public class SignalFloatingNameEditPartCN extends FloatingLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -703,7 +718,7 @@ public class SignalFloatingNameEditPartCN extends FloatingLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -713,43 +728,42 @@ public class SignalFloatingNameEditPartCN extends FloatingLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -758,13 +772,11 @@ public class SignalFloatingNameEditPartCN extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -781,6 +793,7 @@ public class SignalFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -790,10 +803,10 @@ public class SignalFloatingNameEditPartCN extends FloatingLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -816,6 +829,7 @@ public class SignalFloatingNameEditPartCN extends FloatingLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalNameEditPart.java index 5fbdff31c7c..a9534ed86ab 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalNameEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,20 +64,12 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -115,12 +113,14 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -135,6 +135,7 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy()); @@ -208,6 +209,7 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -215,6 +217,7 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -222,6 +225,7 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -237,8 +241,7 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -248,7 +251,8 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -260,6 +264,7 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -275,11 +280,13 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -293,6 +300,7 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -302,13 +310,12 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), SignalNameEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), SignalNameEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -326,6 +333,7 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -336,6 +344,7 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -343,6 +352,7 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Signal_Shape, getParserElement(), this, VISUAL_ID); @@ -405,6 +415,7 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -432,18 +443,13 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -455,8 +461,7 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -482,10 +487,9 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -501,6 +505,7 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -542,7 +547,8 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -559,7 +565,8 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -568,11 +575,15 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -580,6 +591,7 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -587,6 +599,7 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -602,6 +615,7 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -615,6 +629,7 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -637,7 +652,7 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -656,7 +671,7 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -669,7 +684,7 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -679,43 +694,42 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -724,13 +738,11 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -747,6 +759,7 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -755,6 +768,7 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -763,6 +777,7 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); @@ -773,10 +788,10 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -793,8 +808,7 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } super.handleNotificationEvent(event); @@ -803,6 +817,7 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -816,6 +831,7 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void activate() { super.activate(); addOwnerElementListeners(); @@ -832,6 +848,7 @@ public class SignalNameEditPart extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void deactivate() { removeOwnerElementListeners(); super.deactivate(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalNameEditPartCN.java index 6ebf7c320d6..438ff5ef1e0 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalNameEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalNameEditPartCN.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,20 +64,12 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure; -import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; @@ -115,12 +113,14 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -135,6 +135,7 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy()); @@ -208,6 +209,7 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -215,6 +217,7 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -222,6 +225,7 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -237,8 +241,7 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart * @generated */ protected Image getLabelIcon() { - return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), - getViewer()); + return org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil.getIcon(getParserElement(), getViewer()); } /** @@ -248,7 +251,8 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -260,6 +264,7 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -275,11 +280,13 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -293,6 +300,7 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -302,13 +310,12 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), SignalNameEditPartCN.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), SignalNameEditPartCN.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -326,6 +333,7 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -336,6 +344,7 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -343,6 +352,7 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Signal_Shape_CN, getParserElement(), this, VISUAL_ID); @@ -405,6 +415,7 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -432,18 +443,13 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -455,8 +461,7 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -482,10 +487,9 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -501,6 +505,7 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -542,7 +547,8 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -559,7 +565,8 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -568,11 +575,15 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -580,6 +591,7 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -587,6 +599,7 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -602,6 +615,7 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -615,6 +629,7 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -637,7 +652,7 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -656,7 +671,7 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -669,7 +684,7 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -679,43 +694,42 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -724,13 +738,11 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -747,6 +759,7 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -755,6 +768,7 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -763,6 +777,7 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { refreshLabel(); Object feature = event.getFeature(); @@ -773,10 +788,10 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -793,8 +808,7 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart } } } - if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON - .equals(((EAnnotation) event.getNewValue()).getSource())) { + if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) { refreshLabel(); } super.handleNotificationEvent(event); @@ -803,6 +817,7 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -816,6 +831,7 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void activate() { super.activate(); addOwnerElementListeners(); @@ -832,6 +848,7 @@ public class SignalNameEditPartCN extends PapyrusCompartmentEditPart /** * @generated */ + @Override public void deactivate() { removeOwnerElementListeners(); super.deactivate(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SlotEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SlotEditPart.java index acb86fdc50d..fe2e0984299 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SlotEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SlotEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -53,6 +53,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -63,12 +69,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.SlotDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextNonResizableEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; @@ -121,12 +121,14 @@ public class SlotEditPart extends UMLCompartmentEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -141,6 +143,7 @@ public class SlotEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -151,6 +154,7 @@ public class SlotEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); @@ -226,6 +230,7 @@ public class SlotEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -233,6 +238,7 @@ public class SlotEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -240,6 +246,7 @@ public class SlotEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -265,7 +272,8 @@ public class SlotEditPart extends UMLCompartmentEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -277,6 +285,7 @@ public class SlotEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -292,11 +301,13 @@ public class SlotEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -310,6 +321,7 @@ public class SlotEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -319,14 +331,12 @@ public class SlotEditPart extends UMLCompartmentEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), SlotEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), SlotEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -344,6 +354,7 @@ public class SlotEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -354,6 +365,7 @@ public class SlotEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -361,6 +373,7 @@ public class SlotEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Slot_SlotLabel, getParserElement(), this, VISUAL_ID); @@ -423,6 +436,7 @@ public class SlotEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -450,18 +464,13 @@ public class SlotEditPart extends UMLCompartmentEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -473,8 +482,7 @@ public class SlotEditPart extends UMLCompartmentEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -500,10 +508,9 @@ public class SlotEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -519,6 +526,7 @@ public class SlotEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -560,7 +568,8 @@ public class SlotEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -577,7 +586,8 @@ public class SlotEditPart extends UMLCompartmentEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -586,11 +596,15 @@ public class SlotEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -598,6 +612,7 @@ public class SlotEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -605,6 +620,7 @@ public class SlotEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -620,6 +636,7 @@ public class SlotEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -633,6 +650,7 @@ public class SlotEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -655,7 +673,7 @@ public class SlotEditPart extends UMLCompartmentEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -674,7 +692,7 @@ public class SlotEditPart extends UMLCompartmentEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -687,7 +705,7 @@ public class SlotEditPart extends UMLCompartmentEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -697,43 +715,42 @@ public class SlotEditPart extends UMLCompartmentEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -742,13 +759,11 @@ public class SlotEditPart extends UMLCompartmentEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -765,6 +780,7 @@ public class SlotEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -773,6 +789,7 @@ public class SlotEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -781,6 +798,7 @@ public class SlotEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -790,10 +808,10 @@ public class SlotEditPart extends UMLCompartmentEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -819,6 +837,7 @@ public class SlotEditPart extends UMLCompartmentEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SourceISLinkLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SourceISLinkLabelEditPart.java index 2abc232ad14..cd48d430f00 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SourceISLinkLabelEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SourceISLinkLabelEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,12 +64,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ISRoleSourceDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.InstanceSpecificationRoleDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; @@ -116,12 +116,14 @@ public class SourceISLinkLabelEditPart extends PapyrusLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -130,10 +132,7 @@ public class SourceISLinkLabelEditPart extends PapyrusLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry - .getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SourceISLinkLabelEditPart.VISUAL_ID), - new Point(0, 20)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SourceISLinkLabelEditPart.VISUAL_ID), new Point(0, 20)); } /** @@ -159,6 +158,7 @@ public class SourceISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public int getKeyPoint() { return ConnectionLocator.SOURCE; } @@ -229,6 +229,7 @@ public class SourceISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -236,6 +237,7 @@ public class SourceISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -243,6 +245,7 @@ public class SourceISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -268,7 +271,8 @@ public class SourceISLinkLabelEditPart extends PapyrusLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -280,6 +284,7 @@ public class SourceISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -295,11 +300,13 @@ public class SourceISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -313,6 +320,7 @@ public class SourceISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -322,13 +330,12 @@ public class SourceISLinkLabelEditPart extends PapyrusLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), SourceISLinkLabelEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), SourceISLinkLabelEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -346,6 +353,7 @@ public class SourceISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -356,6 +364,7 @@ public class SourceISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -363,10 +372,10 @@ public class SourceISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.InstanceSpecification_Edge, getParserElement(), this, - VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.InstanceSpecification_Edge, getParserElement(), this, VISUAL_ID); } return parser; } @@ -426,6 +435,7 @@ public class SourceISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -453,18 +463,13 @@ public class SourceISLinkLabelEditPart extends PapyrusLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -476,8 +481,7 @@ public class SourceISLinkLabelEditPart extends PapyrusLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -503,10 +507,9 @@ public class SourceISLinkLabelEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -522,6 +525,7 @@ public class SourceISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -563,7 +567,8 @@ public class SourceISLinkLabelEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -580,7 +585,8 @@ public class SourceISLinkLabelEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -589,11 +595,15 @@ public class SourceISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -601,6 +611,7 @@ public class SourceISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -608,6 +619,7 @@ public class SourceISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -623,6 +635,7 @@ public class SourceISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -636,6 +649,7 @@ public class SourceISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -658,7 +672,7 @@ public class SourceISLinkLabelEditPart extends PapyrusLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -669,7 +683,7 @@ public class SourceISLinkLabelEditPart extends PapyrusLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -682,7 +696,7 @@ public class SourceISLinkLabelEditPart extends PapyrusLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -692,43 +706,42 @@ public class SourceISLinkLabelEditPart extends PapyrusLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -737,13 +750,11 @@ public class SourceISLinkLabelEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -760,6 +771,7 @@ public class SourceISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -769,10 +781,10 @@ public class SourceISLinkLabelEditPart extends PapyrusLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -796,6 +808,7 @@ public class SourceISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -804,6 +817,7 @@ public class SourceISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getLabelRole() { return "SourceRole";//$NON-NLS-1$ } @@ -811,6 +825,7 @@ public class SourceISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getIconPathRole() { return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/role.gif";//$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SubstitutionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SubstitutionEditPart.java index 02c92d7abed..848192310b9 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SubstitutionEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SubstitutionEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -27,8 +27,8 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLink import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure; /** - * @generated - */ + * @generated + */ public class SubstitutionEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart { /** @@ -46,11 +46,11 @@ public class SubstitutionEditPart extends UMLConnectionNodeEditPart implements I /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeLinkLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); } @@ -59,11 +59,12 @@ public class SubstitutionEditPart extends UMLConnectionNodeEditPart implements I */ protected boolean addFixedChild(EditPart childEditPart) { if (childEditPart instanceof AppliedStereotypeSubstitutionEditPart) { - ((AppliedStereotypeSubstitutionEditPart) childEditPart) - .setLabel(getPrimaryShape().getAppliedStereotypeLabel()); + ((AppliedStereotypeSubstitutionEditPart) childEditPart).setLabel( + getPrimaryShape().getAppliedStereotypeLabel()); } if (childEditPart instanceof SubstitutionNameEditPart) { - ((SubstitutionNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel()); + ((SubstitutionNameEditPart) childEditPart).setLabel( + getPrimaryShape().getNameLabel()); } return false; } @@ -71,6 +72,7 @@ public class SubstitutionEditPart extends UMLConnectionNodeEditPart implements I /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -94,6 +96,7 @@ public class SubstitutionEditPart extends UMLConnectionNodeEditPart implements I /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -103,12 +106,13 @@ public class SubstitutionEditPart extends UMLConnectionNodeEditPart implements I /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected Connection createConnectionFigure() { return new DashedEdgeFigure(); } @@ -116,6 +120,7 @@ public class SubstitutionEditPart extends UMLConnectionNodeEditPart implements I /** * @generated */ + @Override public DashedEdgeFigure getPrimaryShape() { return (DashedEdgeFigure) getFigure(); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SubstitutionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SubstitutionNameEditPart.java index 4f5871cd83d..0c2b9a29d91 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SubstitutionNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SubstitutionNameEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,12 +64,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -114,12 +114,14 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -128,10 +130,7 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry - .getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionNameEditPart.VISUAL_ID), - new Point(0, 60)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SubstitutionNameEditPart.VISUAL_ID), new Point(0, 60)); } /** @@ -155,6 +154,7 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public int getKeyPoint() { return ConnectionLocator.MIDDLE; } @@ -225,6 +225,7 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -232,6 +233,7 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -239,6 +241,7 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -264,7 +267,8 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -276,6 +280,7 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -291,11 +296,13 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -309,6 +316,7 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -318,13 +326,12 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), SubstitutionNameEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), SubstitutionNameEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -342,6 +349,7 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -352,6 +360,7 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -359,6 +368,7 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Substitution_Edge, getParserElement(), this, VISUAL_ID); @@ -421,6 +431,7 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -448,18 +459,13 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -471,8 +477,7 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -498,10 +503,9 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -517,6 +521,7 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -558,7 +563,8 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -575,7 +581,8 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -584,11 +591,15 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -596,6 +607,7 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -603,6 +615,7 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -618,6 +631,7 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -631,6 +645,7 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -653,7 +668,7 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -672,7 +687,7 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -685,7 +700,7 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -695,43 +710,42 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -740,13 +754,11 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -763,6 +775,7 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -772,10 +785,10 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -799,6 +812,7 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -807,6 +821,7 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getLabelRole() { return "Name";//$NON-NLS-1$ } @@ -814,6 +829,7 @@ public class SubstitutionNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getIconPathRole() { return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png";//$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TargetISLinkLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TargetISLinkLabelEditPart.java index 72116f25b3c..831be35275b 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TargetISLinkLabelEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TargetISLinkLabelEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,12 +64,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ISRoleTargetDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.InstanceSpecificationRoleDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; @@ -116,12 +116,14 @@ public class TargetISLinkLabelEditPart extends PapyrusLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -130,10 +132,7 @@ public class TargetISLinkLabelEditPart extends PapyrusLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry - .getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TargetISLinkLabelEditPart.VISUAL_ID), - new Point(0, 20)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TargetISLinkLabelEditPart.VISUAL_ID), new Point(0, 20)); } /** @@ -159,6 +158,7 @@ public class TargetISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public int getKeyPoint() { return ConnectionLocator.TARGET; } @@ -229,6 +229,7 @@ public class TargetISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -236,6 +237,7 @@ public class TargetISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -243,6 +245,7 @@ public class TargetISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -268,7 +271,8 @@ public class TargetISLinkLabelEditPart extends PapyrusLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -280,6 +284,7 @@ public class TargetISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -295,11 +300,13 @@ public class TargetISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -313,6 +320,7 @@ public class TargetISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -322,13 +330,12 @@ public class TargetISLinkLabelEditPart extends PapyrusLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), TargetISLinkLabelEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), TargetISLinkLabelEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -346,6 +353,7 @@ public class TargetISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -356,6 +364,7 @@ public class TargetISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -363,10 +372,10 @@ public class TargetISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.InstanceSpecification_Edge, getParserElement(), this, - VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.InstanceSpecification_Edge, getParserElement(), this, VISUAL_ID); } return parser; } @@ -426,6 +435,7 @@ public class TargetISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -453,18 +463,13 @@ public class TargetISLinkLabelEditPart extends PapyrusLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -476,8 +481,7 @@ public class TargetISLinkLabelEditPart extends PapyrusLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -503,10 +507,9 @@ public class TargetISLinkLabelEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -522,6 +525,7 @@ public class TargetISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -563,7 +567,8 @@ public class TargetISLinkLabelEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -580,7 +585,8 @@ public class TargetISLinkLabelEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -589,11 +595,15 @@ public class TargetISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -601,6 +611,7 @@ public class TargetISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -608,6 +619,7 @@ public class TargetISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -623,6 +635,7 @@ public class TargetISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -636,6 +649,7 @@ public class TargetISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -658,7 +672,7 @@ public class TargetISLinkLabelEditPart extends PapyrusLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -669,7 +683,7 @@ public class TargetISLinkLabelEditPart extends PapyrusLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -682,7 +696,7 @@ public class TargetISLinkLabelEditPart extends PapyrusLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -692,43 +706,42 @@ public class TargetISLinkLabelEditPart extends PapyrusLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -737,13 +750,11 @@ public class TargetISLinkLabelEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -760,6 +771,7 @@ public class TargetISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -769,10 +781,10 @@ public class TargetISLinkLabelEditPart extends PapyrusLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -796,6 +808,7 @@ public class TargetISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -804,6 +817,7 @@ public class TargetISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getLabelRole() { return "TargetRole";//$NON-NLS-1$ } @@ -811,6 +825,7 @@ public class TargetISLinkLabelEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getIconPathRole() { return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/role.gif";//$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateBindingEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateBindingEditPart.java index c3e2c089143..84b911ee100 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateBindingEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateBindingEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -27,8 +27,8 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabe import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy; /** - * @generated - */ + * @generated + */ public class TemplateBindingEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart { /** @@ -46,11 +46,11 @@ public class TemplateBindingEditPart extends UMLConnectionNodeEditPart implement /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeLinkLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); } @@ -59,11 +59,12 @@ public class TemplateBindingEditPart extends UMLConnectionNodeEditPart implement */ protected boolean addFixedChild(EditPart childEditPart) { if (childEditPart instanceof BindingSubstitutionEditPart) { - ((BindingSubstitutionEditPart) childEditPart).setLabel(getPrimaryShape().getBindingSubstitutionFigure()); + ((BindingSubstitutionEditPart) childEditPart).setLabel( + getPrimaryShape().getBindingSubstitutionFigure()); } if (childEditPart instanceof AppliedStereotypeTemplateBindingEditPart) { - ((AppliedStereotypeTemplateBindingEditPart) childEditPart) - .setLabel(getPrimaryShape().getAppliedStereotypeLabel()); + ((AppliedStereotypeTemplateBindingEditPart) childEditPart).setLabel( + getPrimaryShape().getAppliedStereotypeLabel()); } return false; } @@ -71,6 +72,7 @@ public class TemplateBindingEditPart extends UMLConnectionNodeEditPart implement /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -94,6 +96,7 @@ public class TemplateBindingEditPart extends UMLConnectionNodeEditPart implement /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -103,12 +106,13 @@ public class TemplateBindingEditPart extends UMLConnectionNodeEditPart implement /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected Connection createConnectionFigure() { return new TemplateBindingFigure(); } @@ -116,6 +120,7 @@ public class TemplateBindingEditPart extends UMLConnectionNodeEditPart implement /** * @generated */ + @Override public TemplateBindingFigure getPrimaryShape() { return (TemplateBindingFigure) getFigure(); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateParameterEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateParameterEditPart.java index 26019ac48b1..2090277e1d3 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateParameterEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateParameterEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -53,6 +53,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -63,11 +68,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.AbstractTemplateParameterEditPart; import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.TemplateParameterFigure; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.TemplateParamaterDisplayEditPolicy; @@ -121,12 +121,14 @@ public class TemplateParameterEditPart extends AbstractTemplateParameterEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -141,6 +143,7 @@ public class TemplateParameterEditPart extends AbstractTemplateParameterEditPart /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) { return null; @@ -151,14 +154,14 @@ public class TemplateParameterEditPart extends AbstractTemplateParameterEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy()); installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy()); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); - installEditPolicy(TemplateParamaterDisplayEditPolicy.TEMPLATE_PARAMETER_DISPLAY, - new TemplateParamaterDisplayEditPolicy()); + installEditPolicy(TemplateParamaterDisplayEditPolicy.TEMPLATE_PARAMETER_DISPLAY, new TemplateParamaterDisplayEditPolicy()); } /** @@ -227,6 +230,7 @@ public class TemplateParameterEditPart extends AbstractTemplateParameterEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -234,6 +238,7 @@ public class TemplateParameterEditPart extends AbstractTemplateParameterEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -241,6 +246,7 @@ public class TemplateParameterEditPart extends AbstractTemplateParameterEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -266,7 +272,8 @@ public class TemplateParameterEditPart extends AbstractTemplateParameterEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -278,6 +285,7 @@ public class TemplateParameterEditPart extends AbstractTemplateParameterEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -293,11 +301,13 @@ public class TemplateParameterEditPart extends AbstractTemplateParameterEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -311,6 +321,7 @@ public class TemplateParameterEditPart extends AbstractTemplateParameterEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -320,13 +331,12 @@ public class TemplateParameterEditPart extends AbstractTemplateParameterEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString(ParserUtil.getParserAdapter( - getParserElement(), TemplateParameterEditPart.this), (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), TemplateParameterEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -344,6 +354,7 @@ public class TemplateParameterEditPart extends AbstractTemplateParameterEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -354,6 +365,7 @@ public class TemplateParameterEditPart extends AbstractTemplateParameterEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -361,10 +373,10 @@ public class TemplateParameterEditPart extends AbstractTemplateParameterEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { - parser = ParserUtil.getParser(UMLElementTypes.TemplateParameter_TemplateParameterLabel, getParserElement(), - this, VISUAL_ID); + parser = ParserUtil.getParser(UMLElementTypes.TemplateParameter_TemplateParameterLabel, getParserElement(), this, VISUAL_ID); } return parser; } @@ -424,6 +436,7 @@ public class TemplateParameterEditPart extends AbstractTemplateParameterEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -451,18 +464,13 @@ public class TemplateParameterEditPart extends AbstractTemplateParameterEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -474,8 +482,7 @@ public class TemplateParameterEditPart extends AbstractTemplateParameterEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -501,10 +508,9 @@ public class TemplateParameterEditPart extends AbstractTemplateParameterEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -520,6 +526,7 @@ public class TemplateParameterEditPart extends AbstractTemplateParameterEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -561,7 +568,8 @@ public class TemplateParameterEditPart extends AbstractTemplateParameterEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -578,7 +586,8 @@ public class TemplateParameterEditPart extends AbstractTemplateParameterEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -587,11 +596,15 @@ public class TemplateParameterEditPart extends AbstractTemplateParameterEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -599,6 +612,7 @@ public class TemplateParameterEditPart extends AbstractTemplateParameterEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -606,6 +620,7 @@ public class TemplateParameterEditPart extends AbstractTemplateParameterEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -621,6 +636,7 @@ public class TemplateParameterEditPart extends AbstractTemplateParameterEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -634,6 +650,7 @@ public class TemplateParameterEditPart extends AbstractTemplateParameterEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -656,7 +673,7 @@ public class TemplateParameterEditPart extends AbstractTemplateParameterEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -675,7 +692,7 @@ public class TemplateParameterEditPart extends AbstractTemplateParameterEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -688,7 +705,7 @@ public class TemplateParameterEditPart extends AbstractTemplateParameterEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -698,43 +715,42 @@ public class TemplateParameterEditPart extends AbstractTemplateParameterEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -743,13 +759,11 @@ public class TemplateParameterEditPart extends AbstractTemplateParameterEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -766,6 +780,7 @@ public class TemplateParameterEditPart extends AbstractTemplateParameterEditPart /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$ @@ -774,6 +789,7 @@ public class TemplateParameterEditPart extends AbstractTemplateParameterEditPart /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); removeListenerFilter("PrimaryView"); //$NON-NLS-1$ @@ -782,6 +798,7 @@ public class TemplateParameterEditPart extends AbstractTemplateParameterEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -791,10 +808,10 @@ public class TemplateParameterEditPart extends AbstractTemplateParameterEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -820,6 +837,7 @@ public class TemplateParameterEditPart extends AbstractTemplateParameterEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateSignatureEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateSignatureEditPart.java index bf25ede215f..1849b798e36 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateSignatureEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateSignatureEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -72,6 +72,7 @@ public class TemplateSignatureEditPart extends AbstractBorderItemEditPart { /** * @generated */ + @Override protected void createDefaultEditPolicies() { installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); super.createDefaultEditPolicies(); @@ -123,6 +124,7 @@ public class TemplateSignatureEditPart extends AbstractBorderItemEditPart { /** * org.eclipse.papyrus.uml.diagram.clazz.custom.figure.TemplateFigure + * * @generated */ public TemplateFigure getPrimaryShape() { @@ -134,9 +136,10 @@ public class TemplateSignatureEditPart extends AbstractBorderItemEditPart { */ protected boolean addFixedChild(EditPart childEditPart) { + if (childEditPart instanceof TemplateSignatureTemplateParameterCompartmentEditPart) { IFigure pane = getPrimaryShape().getTemplateParameterRectangle(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((TemplateSignatureTemplateParameterCompartmentEditPart) childEditPart).getFigure()); return true; } @@ -159,6 +162,7 @@ public class TemplateSignatureEditPart extends AbstractBorderItemEditPart { /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -169,6 +173,7 @@ public class TemplateSignatureEditPart extends AbstractBorderItemEditPart { /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -179,6 +184,7 @@ public class TemplateSignatureEditPart extends AbstractBorderItemEditPart { /** * @generated */ + @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { if (editPart instanceof TemplateSignatureTemplateParameterCompartmentEditPart) { return getPrimaryShape().getTemplateParameterRectangle(); @@ -196,12 +202,13 @@ public class TemplateSignatureEditPart extends AbstractBorderItemEditPart { /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected NodeFigure createNodeFigure() { NodeFigure figure = createNodePlate(); figure.setLayoutManager(new StackLayout()); @@ -215,7 +222,9 @@ public class TemplateSignatureEditPart extends AbstractBorderItemEditPart { /** * Default implementation treats passed figure as content pane. * Respects layout one may have set for generated figure. - * @param nodeShape instance of generated figure class + * + * @param nodeShape + * instance of generated figure class * @generated */ protected IFigure setupContentPane(IFigure nodeShape) { @@ -230,6 +239,7 @@ public class TemplateSignatureEditPart extends AbstractBorderItemEditPart { /** * @generated */ + @Override public IFigure getContentPane() { if (contentPane != null) { return contentPane; @@ -240,6 +250,7 @@ public class TemplateSignatureEditPart extends AbstractBorderItemEditPart { /** * @generated */ + @Override protected void setForegroundColor(Color color) { if (primaryShape != null) { primaryShape.setForegroundColor(color); @@ -249,6 +260,7 @@ public class TemplateSignatureEditPart extends AbstractBorderItemEditPart { /** * @generated */ + @Override protected void setLineWidth(int width) { super.setLineWidth(width); } @@ -256,6 +268,7 @@ public class TemplateSignatureEditPart extends AbstractBorderItemEditPart { /** * @generated */ + @Override protected void setLineType(int style) { if (primaryShape instanceof IPapyrusNodeFigure) { ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); @@ -265,22 +278,19 @@ public class TemplateSignatureEditPart extends AbstractBorderItemEditPart { /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { if (request instanceof CreateViewAndElementRequest) { - CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor() - .getCreateElementRequestAdapter(); + CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter(); IElementType type = (IElementType) adapter.getAdapter(IElementType.class); if (UMLElementTypes.isKindOf(type, UMLElementTypes.ClassifierTemplateParameter_TemplateParameterLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(TemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(TemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.OperationTemplateParameter_TemplateParameterLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(TemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(TemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID)); } if (UMLElementTypes.isKindOf(type, UMLElementTypes.TemplateParameter_TemplateParameterLabel)) { - return getChildBySemanticHint( - UMLVisualIDRegistry.getType(TemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint(UMLVisualIDRegistry.getType(TemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID)); } } return super.getTargetEditPart(request); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateSignatureTemplateParameterCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateSignatureTemplateParameterCompartmentEditPart.java index 9c1260ecb35..0a4d504c33d 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateSignatureTemplateParameterCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateSignatureTemplateParameterCompartmentEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -29,7 +29,6 @@ import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCompartmentSemanticEditPolicy; import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy; -import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.RemoveOrphanViewPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.Messages; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy; @@ -53,6 +52,7 @@ public class TemplateSignatureTemplateParameterCompartmentEditPart extends ListC /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; } @@ -60,6 +60,7 @@ public class TemplateSignatureTemplateParameterCompartmentEditPart extends ListC /** * @generated */ + @Override public String getCompartmentName() { return Messages.TemplateSignatureTemplateParameterCompartmentEditPart_title; } @@ -67,22 +68,23 @@ public class TemplateSignatureTemplateParameterCompartmentEditPart extends ListC /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultCompartmentSemanticEditPolicy()); installEditPolicy(EditPolicyRoles.CREATION_ROLE, new DefaultCreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); installEditPolicy(PasteEditPolicy.PASTE_ROLE, new PasteEditPolicy()); - //in Papyrus diagrams are not strongly synchronised - //installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.TemplateSignatureTemplateParameterCompartmentCanonicalEditPolicy()); + // in Papyrus diagrams are not strongly synchronised + // installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.clazz.edit.policies.TemplateSignatureTemplateParameterCompartmentCanonicalEditPolicy()); - installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$ installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ClassDiagramDragDropEditPolicy()); } /** * @generated */ + @Override protected void setRatio(Double ratio) { if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) { super.setRatio(ratio); @@ -92,6 +94,7 @@ public class TemplateSignatureTemplateParameterCompartmentEditPart extends ListC /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { return super.getTargetEditPart(request); @@ -100,6 +103,7 @@ public class TemplateSignatureTemplateParameterCompartmentEditPart extends ListC /** * @generated */ + @Override protected void handleNotificationEvent(Notification notification) { Object feature = notification.getFeature(); if (NotationPackage.eINSTANCE.getSize_Width().equals(feature) @@ -121,12 +125,16 @@ public class TemplateSignatureTemplateParameterCompartmentEditPart extends ListC int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); Point loc = new Point(x, y); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size)); + ((GraphicalEditPart) getParent()).setLayoutConstraint( + this, + getFigure(), + new Rectangle(loc, size)); } /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshBounds(); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TimeObservationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TimeObservationEditPart.java index dbee6829be9..19b627f2ed8 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TimeObservationEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TimeObservationEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -85,6 +85,7 @@ public class TimeObservationEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); @@ -92,8 +93,7 @@ public class TimeObservationEditPart extends RoundedCompartmentEditPart { installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultGraphicalNodeEditPolicy()); installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeIconlDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeIconlDisplayEditPolicy()); installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy()); installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy()); installEditPolicy(EditPolicy.LAYOUT_ROLE, new GetChildLayoutEditPolicy()); @@ -147,9 +147,11 @@ public class TimeObservationEditPart extends RoundedCompartmentEditPart { } /** - *Papyrus codeGen - *@generated - **/ + * Papyrus codeGen + * + * @generated + **/ + @Override protected void handleNotificationEvent(Notification event) { /* * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart @@ -158,7 +160,8 @@ public class TimeObservationEditPart extends RoundedCompartmentEditPart { if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) { Object notifier = event.getNotifier(); List<?> modelChildren = ((View) getModel()).getChildren(); - if (false == notifier instanceof Edge && false == notifier instanceof BasicCompartment) { + if (false == notifier instanceof Edge + && false == notifier instanceof BasicCompartment) { if (modelChildren.contains(event.getNotifier())) { return; } @@ -171,14 +174,17 @@ public class TimeObservationEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected IFigure createNodeShape() { return primaryShape = new RoundedCompartmentFigure(); } /** * org.eclipse.papyrus.uml.diagram.common.figure.node.RoundedCompartmentFigure + * * @generated */ + @Override public RoundedCompartmentFigure getPrimaryShape() { return (RoundedCompartmentFigure) primaryShape; } @@ -186,6 +192,7 @@ public class TimeObservationEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) { if (borderItemEditPart instanceof TimeObservationStereotypeLabelEditPart) { BorderItemLocator locator = new BorderItemLocator(getMainFigure(), PositionConstants.SOUTH); @@ -202,6 +209,7 @@ public class TimeObservationEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected NodeFigure createNodePlate() { RoundedRectangleNodePlateFigure result = new RoundedRectangleNodePlateFigure(40, 40); return result; @@ -209,12 +217,13 @@ public class TimeObservationEditPart extends RoundedCompartmentEditPart { /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected NodeFigure createMainFigure() { return new SelectableBorderedNodeFigure(createMainFigureWithSVG()); @@ -223,9 +232,12 @@ public class TimeObservationEditPart extends RoundedCompartmentEditPart { /** * Default implementation treats passed figure as content pane. * Respects layout one may have set for generated figure. - * @param nodeShape instance of generated figure class + * + * @param nodeShape + * instance of generated figure class * @generated */ + @Override protected IFigure setupContentPane(IFigure nodeShape) { return nodeShape; // use nodeShape itself as contentPane } @@ -233,6 +245,7 @@ public class TimeObservationEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override public IFigure getContentPane() { if (contentPane != null) { return contentPane; @@ -243,6 +256,7 @@ public class TimeObservationEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected void setForegroundColor(Color color) { if (primaryShape != null) { primaryShape.setForegroundColor(color); @@ -252,6 +266,7 @@ public class TimeObservationEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected void setLineWidth(int width) { super.setLineWidth(width); } @@ -259,6 +274,7 @@ public class TimeObservationEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override protected void setLineType(int style) { if (primaryShape instanceof IPapyrusNodeFigure) { ((IPapyrusNodeFigure) primaryShape).setLineStyle(style); @@ -268,6 +284,7 @@ public class TimeObservationEditPart extends RoundedCompartmentEditPart { /** * @generated */ + @Override public EditPart getPrimaryChildEditPart() { return getChildBySemanticHint(UMLVisualIDRegistry.getType(TimeObservationFloatingNameEditPart.VISUAL_ID)); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TimeObservationFloatingNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TimeObservationFloatingNameEditPart.java index 780b4814d05..c1b8465e49c 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TimeObservationFloatingNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TimeObservationFloatingNameEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -50,6 +50,11 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -60,11 +65,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -115,12 +115,14 @@ public class TimeObservationFloatingNameEditPart extends FloatingLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -129,10 +131,7 @@ public class TimeObservationFloatingNameEditPart extends FloatingLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TimeObservationFloatingNameEditPart.VISUAL_ID), - new Point(0, 0)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TimeObservationFloatingNameEditPart.VISUAL_ID), new Point(0, 0)); } /** @@ -145,6 +144,7 @@ public class TimeObservationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); @@ -156,6 +156,7 @@ public class TimeObservationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IBorderItemLocator getBorderItemLocator() { IFigure parentFigure = getFigure().getParent(); if (parentFigure != null && parentFigure.getLayoutManager() != null) { @@ -168,6 +169,7 @@ public class TimeObservationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public void refreshBounds() { int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); @@ -242,6 +244,7 @@ public class TimeObservationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -249,6 +252,7 @@ public class TimeObservationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -281,7 +285,8 @@ public class TimeObservationFloatingNameEditPart extends FloatingLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -293,6 +298,7 @@ public class TimeObservationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -308,11 +314,13 @@ public class TimeObservationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -326,6 +334,7 @@ public class TimeObservationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -335,16 +344,12 @@ public class TimeObservationFloatingNameEditPart extends FloatingLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - TimeObservationFloatingNameEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), TimeObservationFloatingNameEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -362,6 +367,7 @@ public class TimeObservationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -372,6 +378,7 @@ public class TimeObservationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -379,6 +386,7 @@ public class TimeObservationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.TimeObservation_Shape, getParserElement(), this, VISUAL_ID); @@ -441,6 +449,7 @@ public class TimeObservationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -468,18 +477,13 @@ public class TimeObservationFloatingNameEditPart extends FloatingLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -491,8 +495,7 @@ public class TimeObservationFloatingNameEditPart extends FloatingLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -518,10 +521,9 @@ public class TimeObservationFloatingNameEditPart extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -537,6 +539,7 @@ public class TimeObservationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -578,7 +581,8 @@ public class TimeObservationFloatingNameEditPart extends FloatingLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -595,7 +599,8 @@ public class TimeObservationFloatingNameEditPart extends FloatingLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -604,11 +609,15 @@ public class TimeObservationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -616,6 +625,7 @@ public class TimeObservationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -623,6 +633,7 @@ public class TimeObservationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -638,6 +649,7 @@ public class TimeObservationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -651,6 +663,7 @@ public class TimeObservationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -673,7 +686,7 @@ public class TimeObservationFloatingNameEditPart extends FloatingLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -692,7 +705,7 @@ public class TimeObservationFloatingNameEditPart extends FloatingLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -705,7 +718,7 @@ public class TimeObservationFloatingNameEditPart extends FloatingLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -715,43 +728,42 @@ public class TimeObservationFloatingNameEditPart extends FloatingLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -760,13 +772,11 @@ public class TimeObservationFloatingNameEditPart extends FloatingLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -783,6 +793,7 @@ public class TimeObservationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -792,10 +803,10 @@ public class TimeObservationFloatingNameEditPart extends FloatingLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -818,6 +829,7 @@ public class TimeObservationFloatingNameEditPart extends FloatingLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TimeObservationStereotypeLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TimeObservationStereotypeLabelEditPart.java index 3fa234e7749..5f4a737334f 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TimeObservationStereotypeLabelEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TimeObservationStereotypeLabelEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -50,6 +50,10 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -60,10 +64,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -118,12 +118,14 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -132,9 +134,7 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar * @generated */ static { - registerSnapBackPosition(UMLVisualIDRegistry.getType( - org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TimeObservationStereotypeLabelEditPart.VISUAL_ID), - new Point(0, 0)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.TimeObservationStereotypeLabelEditPart.VISUAL_ID), new Point(0, 0)); } /** @@ -147,18 +147,19 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeExternalNodeEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeExternalNodeEditPolicy()); installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ExternalLabelPrimaryDragRoleEditPolicy()); } /** * @generated */ + @Override public IBorderItemLocator getBorderItemLocator() { IFigure parentFigure = getFigure().getParent(); if (parentFigure != null && parentFigure.getLayoutManager() != null) { @@ -171,6 +172,7 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar /** * @generated */ + @Override public void refreshBounds() { int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); @@ -245,6 +247,7 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -252,6 +255,7 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -284,7 +288,8 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -296,6 +301,7 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -311,11 +317,13 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -329,6 +337,7 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -338,16 +347,12 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult( - parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), - TimeObservationStereotypeLabelEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), TimeObservationStereotypeLabelEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -365,6 +370,7 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -375,6 +381,7 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -382,6 +389,7 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.TimeObservation_Shape, getParserElement(), this, VISUAL_ID); @@ -444,6 +452,7 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -471,18 +480,13 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -494,8 +498,7 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -521,10 +524,9 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -540,6 +542,7 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -581,7 +584,8 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -598,7 +602,8 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -607,11 +612,15 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -619,6 +628,7 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -626,6 +636,7 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -641,6 +652,7 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -654,6 +666,7 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -676,7 +689,7 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -695,7 +708,7 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -708,7 +721,7 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -718,43 +731,42 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -763,13 +775,11 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -786,6 +796,7 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -795,10 +806,10 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -821,6 +832,7 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); @@ -837,6 +849,7 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar /** * @generated */ + @Override public String getLabelRole() { return "Stereotype";//$NON-NLS-1$ } @@ -844,6 +857,7 @@ public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPar /** * @generated */ + @Override public String getIconPathRole() { return "platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Stereotype.gif";//$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/UMLEditPartFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/UMLEditPartFactory.java index 46b658784f2..c608a7ee2f9 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/UMLEditPartFactory.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/UMLEditPartFactory.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -35,6 +35,7 @@ public class UMLEditPartFactory implements EditPartFactory { /** * @generated */ + @Override public EditPart createEditPart(EditPart context, Object model) { if (model instanceof View) { View view = (View) model; @@ -565,6 +566,7 @@ public class UMLEditPartFactory implements EditPartFactory { case AssociationClassDashedLinkEditPart.VISUAL_ID: return new AssociationClassDashedLinkEditPart(view); + case AssociationClassLinkEditPart.VISUAL_ID: return new AssociationClassLinkEditPart(view); @@ -574,6 +576,7 @@ public class UMLEditPartFactory implements EditPartFactory { case AssociationClassRoleTargetEditPart.VISUAL_ID: return new AssociationClassRoleTargetEditPart(view); + case AssociationEditPart.VISUAL_ID: return new AssociationEditPart(view); @@ -595,6 +598,7 @@ public class UMLEditPartFactory implements EditPartFactory { case AssociationMultiplicityTargetEditPart.VISUAL_ID: return new AssociationMultiplicityTargetEditPart(view); + case AssociationBranchEditPart.VISUAL_ID: return new AssociationBranchEditPart(view); @@ -604,12 +608,14 @@ public class UMLEditPartFactory implements EditPartFactory { case AssociationBranchMutliplicityEditPart.VISUAL_ID: return new AssociationBranchMutliplicityEditPart(view); + case GeneralizationEditPart.VISUAL_ID: return new GeneralizationEditPart(view); case AppliedStereotyperGeneralizationEditPart.VISUAL_ID: return new AppliedStereotyperGeneralizationEditPart(view); + case InterfaceRealizationEditPart.VISUAL_ID: return new InterfaceRealizationEditPart(view); @@ -619,6 +625,7 @@ public class UMLEditPartFactory implements EditPartFactory { case InterfaceRealizationNameEditPart.VISUAL_ID: return new InterfaceRealizationNameEditPart(view); + case SubstitutionEditPart.VISUAL_ID: return new SubstitutionEditPart(view); @@ -628,6 +635,7 @@ public class UMLEditPartFactory implements EditPartFactory { case SubstitutionNameEditPart.VISUAL_ID: return new SubstitutionNameEditPart(view); + case RealizationEditPart.VISUAL_ID: return new RealizationEditPart(view); @@ -637,6 +645,7 @@ public class UMLEditPartFactory implements EditPartFactory { case RealizationNameEditPart.VISUAL_ID: return new RealizationNameEditPart(view); + case AbstractionEditPart.VISUAL_ID: return new AbstractionEditPart(view); @@ -646,6 +655,7 @@ public class UMLEditPartFactory implements EditPartFactory { case AppliedStereotypeAbstractionEditPart.VISUAL_ID: return new AppliedStereotypeAbstractionEditPart(view); + case UsageEditPart.VISUAL_ID: return new UsageEditPart(view); @@ -655,6 +665,7 @@ public class UMLEditPartFactory implements EditPartFactory { case AppliedStereotypeUsageEditPart.VISUAL_ID: return new AppliedStereotypeUsageEditPart(view); + case DependencyEditPart.VISUAL_ID: return new DependencyEditPart(view); @@ -664,9 +675,11 @@ public class UMLEditPartFactory implements EditPartFactory { case AppliedStereotypeDependencyEditPart.VISUAL_ID: return new AppliedStereotypeDependencyEditPart(view); + case DependencyBranchEditPart.VISUAL_ID: return new DependencyBranchEditPart(view); + case ElementImportEditPart.VISUAL_ID: return new ElementImportEditPart(view); @@ -676,27 +689,33 @@ public class UMLEditPartFactory implements EditPartFactory { case AppliedStereotypeElementImportEditPart.VISUAL_ID: return new AppliedStereotypeElementImportEditPart(view); + case PackageImportEditPart.VISUAL_ID: return new PackageImportEditPart(view); case AppliedStereotypePackageImportEditPart.VISUAL_ID: return new AppliedStereotypePackageImportEditPart(view); + case PackageMergeEditPart.VISUAL_ID: return new PackageMergeEditPart(view); case AppliedStereotypePackageMergeEditPart.VISUAL_ID: return new AppliedStereotypePackageMergeEditPart(view); + case ProfileApplicationEditPart.VISUAL_ID: return new ProfileApplicationEditPart(view); + case CommentAnnotatedElementEditPart.VISUAL_ID: return new CommentAnnotatedElementEditPart(view); + case ConstraintConstrainedElementEditPart.VISUAL_ID: return new ConstraintConstrainedElementEditPart(view); + case TemplateBindingEditPart.VISUAL_ID: return new TemplateBindingEditPart(view); @@ -706,6 +725,7 @@ public class UMLEditPartFactory implements EditPartFactory { case AppliedStereotypeTemplateBindingEditPart.VISUAL_ID: return new AppliedStereotypeTemplateBindingEditPart(view); + case GeneralizationSetEditPart.VISUAL_ID: return new GeneralizationSetEditPart(view); @@ -715,6 +735,7 @@ public class UMLEditPartFactory implements EditPartFactory { case AppliedStereotypeGeneralizationSetLabelEditPart.VISUAL_ID: return new AppliedStereotypeGeneralizationSetLabelEditPart(view); + case InstanceSpecificationLinkEditPart.VISUAL_ID: return new InstanceSpecificationLinkEditPart(view); @@ -724,15 +745,19 @@ public class UMLEditPartFactory implements EditPartFactory { case TargetISLinkLabelEditPart.VISUAL_ID: return new TargetISLinkLabelEditPart(view); + case ContainmentLinkEditPart.VISUAL_ID: return new ContainmentLinkEditPart(view); + case ConnectorTimeObservationEditPart.VISUAL_ID: return new ConnectorTimeObservationEditPart(view); + case ConnectorDurationObservationEditPart.VISUAL_ID: return new ConnectorDurationObservationEditPart(view); + case InformationFlowEditPart.VISUAL_ID: return new InformationFlowEditPart(view); @@ -745,6 +770,7 @@ public class UMLEditPartFactory implements EditPartFactory { case InformationFlowNameEditPart.VISUAL_ID: return new InformationFlowNameEditPart(view); + case ContextLinkEditPart.VISUAL_ID: return new ContextLinkEditPart(view); @@ -769,7 +795,8 @@ public class UMLEditPartFactory implements EditPartFactory { */ public static CellEditorLocator getTextCellEditorLocator(ITextAwareEditPart source) { if (source.getFigure() instanceof IMultilineEditableFigure) { - return new MultilineCellEditorLocator((IMultilineEditableFigure) source.getFigure()); + return new MultilineCellEditorLocator( + (IMultilineEditableFigure) source.getFigure()); } else { return CellEditorLocatorAccess.INSTANCE.getTextCellEditorLocator(source); @@ -803,6 +830,7 @@ public class UMLEditPartFactory implements EditPartFactory { /** * @generated */ + @Override public void relocate(CellEditor celleditor) { Text text = (Text) celleditor.getControl(); Rectangle rect = getMultilineEditableFigure().getBounds().getCopy(); @@ -810,7 +838,8 @@ public class UMLEditPartFactory implements EditPartFactory { rect.y = getMultilineEditableFigure().getEditionLocation().y; getMultilineEditableFigure().translateToAbsolute(rect); if (getMultilineEditableFigure().getText().length() > 0) { - rect.setSize(new Dimension(text.computeSize(rect.width, SWT.DEFAULT))); + rect.setSize(new Dimension(text.computeSize(rect.width, + SWT.DEFAULT))); } if (!rect.equals(new Rectangle(text.getBounds()))) { text.setBounds(rect.x, rect.y, rect.width, rect.height); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/UsageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/UsageEditPart.java index 5a9ebd70a07..54623b18457 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/UsageEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/UsageEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -27,8 +27,8 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLink import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure; /** - * @generated - */ + * @generated + */ public class UsageEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart { /** @@ -46,11 +46,11 @@ public class UsageEditPart extends UMLConnectionNodeEditPart implements ITreeBra /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DefaultSemanticEditPolicy()); - installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, - new AppliedStereotypeLinkLabelDisplayEditPolicy()); + installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy()); installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy()); } @@ -59,10 +59,12 @@ public class UsageEditPart extends UMLConnectionNodeEditPart implements ITreeBra */ protected boolean addFixedChild(EditPart childEditPart) { if (childEditPart instanceof UsageNameEditPart) { - ((UsageNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel()); + ((UsageNameEditPart) childEditPart).setLabel( + getPrimaryShape().getNameLabel()); } if (childEditPart instanceof AppliedStereotypeUsageEditPart) { - ((AppliedStereotypeUsageEditPart) childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel()); + ((AppliedStereotypeUsageEditPart) childEditPart).setLabel( + getPrimaryShape().getAppliedStereotypeLabel()); } return false; } @@ -70,6 +72,7 @@ public class UsageEditPart extends UMLConnectionNodeEditPart implements ITreeBra /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) { return; @@ -93,6 +96,7 @@ public class UsageEditPart extends UMLConnectionNodeEditPart implements ITreeBra /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) { return; @@ -102,12 +106,13 @@ public class UsageEditPart extends UMLConnectionNodeEditPart implements ITreeBra /** * Creates figure for this edit part. - * + * * Body of this method does not depend on settings in generation model * so you may safely remove <i>generated</i> tag and modify it. - * + * * @generated */ + @Override protected Connection createConnectionFigure() { return new DashedEdgeFigure(); } @@ -115,6 +120,7 @@ public class UsageEditPart extends UMLConnectionNodeEditPart implements ITreeBra /** * @generated */ + @Override public DashedEdgeFigure getPrimaryShape() { return (DashedEdgeFigure) getFigure(); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/UsageNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/UsageNameEditPart.java index ec682e594a9..74c38c96e92 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/UsageNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/UsageNameEditPart.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,12 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -58,12 +64,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusLinkLabelDragPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.parsers.ParserUtil; import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.UMLTextSelectionEditPolicy; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes; @@ -114,12 +114,14 @@ public class UsageNameEditPart extends PapyrusLabelEditPart /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; @@ -128,10 +130,7 @@ public class UsageNameEditPart extends PapyrusLabelEditPart * @generated */ static { - registerSnapBackPosition( - UMLVisualIDRegistry - .getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageNameEditPart.VISUAL_ID), - new Point(0, 40)); + registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.clazz.edit.parts.UsageNameEditPart.VISUAL_ID), new Point(0, 40)); } /** @@ -155,6 +154,7 @@ public class UsageNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public int getKeyPoint() { return ConnectionLocator.MIDDLE; } @@ -225,6 +225,7 @@ public class UsageNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected List<?> getModelChildren() { return Collections.EMPTY_LIST; } @@ -232,6 +233,7 @@ public class UsageNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -239,6 +241,7 @@ public class UsageNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setParser(IParser parser) { this.parser = parser; } @@ -264,7 +267,8 @@ public class UsageNameEditPart extends PapyrusLabelEditPart String text = null; EObject parserElement = getParserElement(); if (parserElement != null && getParser() != null) { - text = getParser().getPrintString(ParserUtil.getParserAdapter(getParserElement(), this), + text = getParser().getPrintString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } if (text == null || text.length() == 0) { @@ -276,6 +280,7 @@ public class UsageNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); @@ -291,11 +296,13 @@ public class UsageNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getEditText() { if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } - return getParser().getEditString(ParserUtil.getParserAdapter(getParserElement(), this), + return getParser().getEditString( + ParserUtil.getParserAdapter(getParserElement(), this), getParserOptions().intValue()); } @@ -309,6 +316,7 @@ public class UsageNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @@ -318,14 +326,12 @@ public class UsageNameEditPart extends PapyrusLabelEditPart final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus) getEditingDomain() - .runExclusive(new RunnableWithResult.Impl<java.lang.Object>() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive( + new RunnableWithResult.Impl<java.lang.Object>() { @Override public void run() { - setResult(parser.isValidEditString( - ParserUtil.getParserAdapter(getParserElement(), UsageNameEditPart.this), - (String) value)); + setResult(parser.isValidEditString(ParserUtil.getParserAdapter(getParserElement(), UsageNameEditPart.this), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -343,6 +349,7 @@ public class UsageNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IContentAssistProcessor getCompletionProcessor() { if (getParserElement() == null || getParser() == null) { return null; @@ -353,6 +360,7 @@ public class UsageNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } @@ -360,6 +368,7 @@ public class UsageNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public IParser getParser() { if (parser == null) { parser = ParserUtil.getParser(UMLElementTypes.Usage_Edge, getParserElement(), this, VISUAL_ID); @@ -422,6 +431,7 @@ public class UsageNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -449,18 +459,13 @@ public class UsageNameEditPart extends PapyrusLabelEditPart initializeDirectEditManager(theRequest); return; } else if (configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration) - .createPopupEditorHelper(this); + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; } else if (configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration) configuration).createDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement())); + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); } else if (configuration instanceof IDirectEditorConfiguration) { - dialog = new ExtendedDirectEditionDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), - configuration.getTextToEdit(resolveSemanticElement()), configuration); + dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } @@ -472,8 +477,7 @@ public class UsageNameEditPart extends PapyrusLabelEditPart @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), - ((ILabelEditorDialog) finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; @@ -499,10 +503,9 @@ public class UsageNameEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) request.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (request.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -518,6 +521,7 @@ public class UsageNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -559,7 +563,8 @@ public class UsageNameEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshUnderline() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } @@ -576,7 +581,8 @@ public class UsageNameEditPart extends PapyrusLabelEditPart * @generated */ protected void refreshStrikeThrough() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null && getFigure() instanceof WrappingLabel) { ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } @@ -585,11 +591,15 @@ public class UsageNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void refreshFont() { - FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle( + NotationPackage.eINSTANCE.getFontStyle()); if (style != null) { - FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), - (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); + FontData fontData = new FontData( + style.getFontName(), style.getFontHeight(), + (style.isBold() ? SWT.BOLD : SWT.NORMAL) | + (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } @@ -597,6 +607,7 @@ public class UsageNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } @@ -604,6 +615,7 @@ public class UsageNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); @@ -619,6 +631,7 @@ public class UsageNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) { for (int i = 0; i < parserElements.size(); i++) { @@ -632,6 +645,7 @@ public class UsageNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @@ -654,7 +668,7 @@ public class UsageNameEditPart extends PapyrusLabelEditPart /** * Returns the kind of associated editor for direct edition. - * + * * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ @@ -673,7 +687,7 @@ public class UsageNameEditPart extends PapyrusLabelEditPart /** * Checks if an extended editor is present. - * + * * @return <code>true</code> if an extended editor is present. * @generated */ @@ -686,7 +700,7 @@ public class UsageNameEditPart extends PapyrusLabelEditPart /** * Checks if a default direct edition is available - * + * * @return <code>true</code> if a default direct edition is available * @generated */ @@ -696,43 +710,42 @@ public class UsageNameEditPart extends PapyrusLabelEditPart /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { if (configuration == null) { - final String languagePreferred = Activator.getDefault().getPreferenceStore().getString( - IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); + final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); if (languagePreferred != null && !languagePreferred.equals("")) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else { - configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, - resolveSemanticElement(), this); + configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement(), this); } } } /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if (languagePreferred != null && !languagePreferred.equals("") - && !languagePreferred.equals(configuration.getLanguage())) { - configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), - this); + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement(), this); } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** - * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system - * @generated - */ + * Performs the direct edit usually used by GMF editors. + * + * @param theRequest + * the direct edit request that starts the direct edit system + * @generated + */ protected void performDefaultDirectEditorEdit(final Request theRequest) { // initialize the direct edit manager try { @@ -741,13 +754,11 @@ public class UsageNameEditPart extends PapyrusLabelEditPart @Override public void run() { if (isActive() && isEditable()) { - if (theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character) theRequest.getExtendedData() - .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get( + RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if ((theRequest instanceof DirectEditRequest) - && (getEditText().equals(getLabelText()))) { + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { @@ -764,6 +775,7 @@ public class UsageNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { @@ -773,10 +785,10 @@ public class UsageNameEditPart extends PapyrusLabelEditPart refreshUnderline(); } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) - || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || + NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { @@ -800,6 +812,7 @@ public class UsageNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method return null; @@ -808,6 +821,7 @@ public class UsageNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getLabelRole() { return "Name";//$NON-NLS-1$ } @@ -815,6 +829,7 @@ public class UsageNameEditPart extends PapyrusLabelEditPart /** * @generated */ + @Override public String getIconPathRole() { return "platform:/plugin/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png";//$NON-NLS-1$ } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/UMLBaseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/UMLBaseItemSemanticEditPolicy.java index a18a18316db..4e5c08bcb4d 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/UMLBaseItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/UMLBaseItemSemanticEditPolicy.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -104,11 +104,13 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { /** * Extended request data key to hold editpart visual id. + * * @generated */ public static final String VISUAL_ID_KEY = "visual_id"; //$NON-NLS-1$ /** * Extended request data key to hold the edge view during a reconnect request. + * * @generated */ public static final String GRAPHICAL_RECONNECTED_EDGE = "graphical_edge"; //$NON-NLS-1$ @@ -131,11 +133,12 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { * It is done in those cases when it's not possible to deduce diagram * element kind from domain element. * Add the reoriented view to the request extended data so that the view - * currently edited can be distinguished from other views of the same element - * and these latter possibly removed if they become inconsistent after reconnect - * + * currently edited can be distinguished from other views of the same element + * and these latter possibly removed if they become inconsistent after reconnect + * * @generated */ + @Override @SuppressWarnings("unchecked") public Command getCommand(Request request) { if (request instanceof ReconnectRequest) { @@ -151,6 +154,7 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { /** * Returns visual id from request parameters. + * * @generated */ protected String getVisualID(IEditCommandRequest request) { @@ -160,6 +164,7 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { /** * @generated */ + @Override protected Command getSemanticCommand(IEditCommandRequest request) { IEditCommandRequest completedRequest = completeRequest(request); Command semanticCommand = getSemanticCommandSwitch(completedRequest); @@ -184,9 +189,7 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { */ private Command getEditHelperCommand(IEditCommandRequest request, Command editPolicyCommand) { if (editPolicyCommand != null) { - ICommand command = editPolicyCommand instanceof ICommandProxy - ? ((ICommandProxy) editPolicyCommand).getICommand() - : new CommandProxy(editPolicyCommand); + ICommand command = editPolicyCommand instanceof ICommandProxy ? ((ICommandProxy) editPolicyCommand).getICommand() : new CommandProxy(editPolicyCommand); request.setParameter(GeneratedEditHelperBase.EDIT_POLICY_COMMAND, command); } IElementType requestContextElementType = getContextElementType(request); @@ -350,6 +353,7 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { /** * Returns editing domain from the host edit part. + * * @generated */ protected TransactionalEditingDomain getEditingDomain() { @@ -358,14 +362,14 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { /** * Clean all shortcuts to the host element from the same diagram + * * @generated */ protected void addDestroyShortcutsCommand(ICompositeCommand cmd, View view) { assert view.getEAnnotation("Shortcut") == null; //$NON-NLS-1$ for (Iterator<?> it = view.getDiagram().getChildren().iterator(); it.hasNext();) { View nextView = (View) it.next(); - if (nextView.getEAnnotation("Shortcut") == null || !nextView.isSetElement() //$NON-NLS-1$ - || nextView.getElement() != view.getElement()) { + if (nextView.getEAnnotation("Shortcut") == null || !nextView.isSetElement() || nextView.getElement() != view.getElement()) { //$NON-NLS-1$ continue; } cmd.add(new DeleteCommand(getEditingDomain(), nextView)); @@ -405,105 +409,120 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { * @generated */ public boolean canCreateAssociationClass_Edge(Package container, Type source, Type target) { - return canExistAssociationClass_Edge(container, null, source, target); + return canExistAssociationClass_Edge( + container, null, source, target); } /** * @generated */ public boolean canCreateAssociation_Edge(Package container, Type source, Type target) { - return canExistAssociation_Edge(container, null, source, target); + return canExistAssociation_Edge( + container, null, source, target); } /** * @generated */ public boolean canCreateAssociation_BranchEdge(Package container, Type source, Type target) { - return canExistAssociation_BranchEdge(container, null, source, target); + return canExistAssociation_BranchEdge( + container, null, source, target); } /** * @generated */ public boolean canCreateGeneralization_Edge(Classifier source, Classifier target) { - return canExistGeneralization_Edge(null, source, target); + return canExistGeneralization_Edge( + null, source, target); } /** * @generated */ public boolean canCreateInterfaceRealization_Edge(BehavioredClassifier source, Interface target) { - return canExistInterfaceRealization_Edge(null, source, target); + return canExistInterfaceRealization_Edge( + null, source, target); } /** * @generated */ public boolean canCreateSubstitution_Edge(Classifier container, Classifier source, Classifier target) { - return canExistSubstitution_Edge(container, null, source, target); + return canExistSubstitution_Edge( + container, null, source, target); } /** * @generated */ public boolean canCreateRealization_Edge(Package container, NamedElement source, NamedElement target) { - return canExistRealization_Edge(container, null, source, target); + return canExistRealization_Edge( + container, null, source, target); } /** * @generated */ public boolean canCreateAbstraction_Edge(Package container, NamedElement source, NamedElement target) { - return canExistAbstraction_Edge(container, null, source, target); + return canExistAbstraction_Edge( + container, null, source, target); } /** * @generated */ public boolean canCreateUsage_Edge(Package container, NamedElement source, NamedElement target) { - return canExistUsage_Edge(container, null, source, target); + return canExistUsage_Edge( + container, null, source, target); } /** * @generated */ public boolean canCreateDependency_Edge(Package container, NamedElement source, NamedElement target) { - return canExistDependency_Edge(container, null, source, target); + return canExistDependency_Edge( + container, null, source, target); } /** * @generated */ public boolean canCreateDependency_BranchEdge(Package container, NamedElement source, NamedElement target) { - return canExistDependency_BranchEdge(container, null, source, target); + return canExistDependency_BranchEdge( + container, null, source, target); } /** * @generated */ public boolean canCreateElementImport_Edge(Namespace source, PackageableElement target) { - return canExistElementImport_Edge(null, source, target); + return canExistElementImport_Edge( + null, source, target); } /** * @generated */ public boolean canCreatePackageImport_Edge(Namespace source, Package target) { - return canExistPackageImport_Edge(null, source, target); + return canExistPackageImport_Edge( + null, source, target); } /** * @generated */ public boolean canCreatePackageMerge_Edge(Package container, Package source, Package target) { - return canExistPackageMerge_Edge(container, null, source, target); + return canExistPackageMerge_Edge( + container, null, source, target); } /** * @generated */ public boolean canCreateProfileApplication_Edge(Package source, Profile target) { - return canExistProfileApplication_Edge(null, source, target); + return canExistProfileApplication_Edge( + null, source, target); } /** @@ -511,12 +530,14 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { */ public boolean canCreateComment_AnnotatedElementEdge(Comment source, Element target) { if (source != null) { - if (source.getAnnotatedElements().contains(target)) { + if (source.getAnnotatedElements() + .contains(target)) { return false; } } - return canExistComment_AnnotatedElementEdge(source, target); + return canExistComment_AnnotatedElementEdge( + source, target); } /** @@ -524,12 +545,14 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { */ public boolean canCreateConstraint_ConstrainedElementEdge(Constraint source, Element target) { if (source != null) { - if (source.getConstrainedElements().contains(target)) { + if (source.getConstrainedElements() + .contains(target)) { return false; } } - return canExistConstraint_ConstrainedElementEdge(source, target); + return canExistConstraint_ConstrainedElementEdge( + source, target); } /** @@ -537,7 +560,8 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { */ public boolean canCreateTemplateBinding_Edge(TemplateableElement container, TemplateableElement source, TemplateableElement target) { - return canExistTemplateBinding_Edge(container, null, source, target); + return canExistTemplateBinding_Edge( + container, null, source, target); } /** @@ -545,14 +569,16 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { */ public boolean canCreateGeneralizationSet_Edge(Package container, Generalization source, Generalization target) { - return canExistGeneralizationSet_Edge(container, null, source, target); + return canExistGeneralizationSet_Edge( + container, null, source, target); } /** * @generated */ public boolean canCreateInstanceSpecification_Edge(Package container, Slot source, Slot target) { - return canExistInstanceSpecification_Edge(container, null, source, target); + return canExistInstanceSpecification_Edge( + container, null, source, target); } /** @@ -572,7 +598,8 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { } } - return canExistTimeObservation_EventEdge(source, target); + return canExistTimeObservation_EventEdge( + source, target); } /** @@ -580,19 +607,25 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { */ public boolean canCreateDurationObservation_EventEdge(DurationObservation source, NamedElement target) { if (source != null) { - if (source.getEvents().size() >= 2 || source.getEvents().contains(target)) { + if (source.getEvents() + .size() >= 2 + || + source.getEvents() + .contains(target)) { return false; } } - return canExistDurationObservation_EventEdge(source, target); + return canExistDurationObservation_EventEdge( + source, target); } /** * @generated */ public boolean canCreateInformationFlow_Edge(Package container, NamedElement source, NamedElement target) { - return canExistInformationFlow_Edge(container, null, source, target); + return canExistInformationFlow_Edge( + container, null, source, target); } /** @@ -604,11 +637,13 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { return false; } } - if (target != null && (target.getOwnedRules().contains(target))) { + if (target != null && (target.getOwnedRules() + .contains(target))) { return false; } - return canExistConstraint_ContextEdge(source, target); + return canExistConstraint_ContextEdge( + source, target); } /** @@ -800,14 +835,20 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { public boolean canExistInformationFlow_Edge(Package container, InformationFlow linkInstance, NamedElement source, NamedElement target) { try { - //Information Flow source constraint + // Information Flow source constraint if (source != null) { - if (!((source instanceof Actor) || (source instanceof Node) || (source instanceof UseCase) - || (source instanceof Artifact) || (source instanceof Class) - || (source instanceof Component) || (source instanceof Port) || (source instanceof Property) - || (source instanceof Interface) || (source instanceof Package) - || (source instanceof ActivityNode) || (source instanceof ActivityPartition) - || (source instanceof InstanceSpecification))) { + if (!((source instanceof Actor) + || (source instanceof Node) + || (source instanceof UseCase) + || (source instanceof Artifact) + || (source instanceof Class) + || (source instanceof Component) + || (source instanceof Port) + || (source instanceof Property) + || (source instanceof Interface) + || (source instanceof Package) + || (source instanceof ActivityNode) + || (source instanceof ActivityPartition) || (source instanceof InstanceSpecification))) { return false; @@ -821,14 +862,20 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { } } } - //Information Flow target constraint + // Information Flow target constraint if (target != null) { - if (!((target instanceof Actor) || (target instanceof Node) || (target instanceof UseCase) - || (target instanceof Artifact) || (target instanceof Class) - || (target instanceof Component) || (target instanceof Port) || (target instanceof Property) - || (target instanceof Interface) || (target instanceof Package) - || (target instanceof ActivityNode) || (target instanceof ActivityPartition) - || (target instanceof InstanceSpecification))) { + if (!((target instanceof Actor) + || (target instanceof Node) + || (target instanceof UseCase) + || (target instanceof Artifact) + || (target instanceof Class) + || (target instanceof Component) + || (target instanceof Port) + || (target instanceof Property) + || (target instanceof Interface) + || (target instanceof Package) + || (target instanceof ActivityNode) + || (target instanceof ActivityPartition) || (target instanceof InstanceSpecification))) { return false; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/UMLTextNonResizableEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/UMLTextNonResizableEditPolicy.java index 782544516ca..364725db23d 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/UMLTextNonResizableEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/UMLTextNonResizableEditPolicy.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -54,6 +54,7 @@ public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx impl /** * @generated */ + @Override protected void showPrimarySelection() { if (getHostFigure() instanceof WrappingLabel) { ((WrappingLabel) getHostFigure()).setSelected(true); @@ -67,6 +68,7 @@ public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx impl /** * @generated */ + @Override protected void showSelection() { if (getHostFigure() instanceof WrappingLabel) { ((WrappingLabel) getHostFigure()).setSelected(true); @@ -83,6 +85,7 @@ public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx impl /** * @generated */ + @Override protected void hideSelection() { if (getHostFigure() instanceof WrappingLabel) { ((WrappingLabel) getHostFigure()).setSelected(false); @@ -100,6 +103,7 @@ public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx impl /** * @generated */ + @Override protected void showFocus() { if (getHostFigure() instanceof WrappingLabel) { ((WrappingLabel) getHostFigure()).setFocus(true); @@ -113,6 +117,7 @@ public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx impl /** * @generated */ + @Override protected void hideFocus() { if (getHostFigure() instanceof WrappingLabel) { ((WrappingLabel) getHostFigure()).setFocus(false); @@ -230,6 +235,7 @@ public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx impl /** * @generated */ + @Override protected List<?> createSelectionHandles() { MoveHandle moveHandle = new MoveHandle((GraphicalEditPart) getHost()); moveHandle.setBorder(null); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/UMLTextSelectionEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/UMLTextSelectionEditPolicy.java index 531829e4424..f7fba35ff0c 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/UMLTextSelectionEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/edit/policies/UMLTextSelectionEditPolicy.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -48,6 +48,7 @@ public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements I /** * @generated */ + @Override protected void showPrimarySelection() { if (getHostFigure() instanceof WrappingLabel) { ((WrappingLabel) getHostFigure()).setSelected(true); @@ -61,6 +62,7 @@ public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements I /** * @generated */ + @Override protected void showSelection() { if (getHostFigure() instanceof WrappingLabel) { ((WrappingLabel) getHostFigure()).setSelected(true); @@ -77,6 +79,7 @@ public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements I /** * @generated */ + @Override protected void hideSelection() { if (getHostFigure() instanceof WrappingLabel) { ((WrappingLabel) getHostFigure()).setSelected(false); @@ -94,6 +97,7 @@ public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements I /** * @generated */ + @Override protected void showFocus() { if (getHostFigure() instanceof WrappingLabel) { ((WrappingLabel) getHostFigure()).setFocus(true); @@ -107,6 +111,7 @@ public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements I /** * @generated */ + @Override protected void hideFocus() { if (getHostFigure() instanceof WrappingLabel) { ((WrappingLabel) getHostFigure()).setFocus(false); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/expressions/UMLAbstractExpression.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/expressions/UMLAbstractExpression.java index 854c75301e6..2d815e81fab 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/expressions/UMLAbstractExpression.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/expressions/UMLAbstractExpression.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -44,8 +44,7 @@ public abstract class UMLAbstractExpression { String pluginID = UMLDiagramEditorPlugin.ID; this.status = new Status(severity, pluginID, -1, (message != null) ? message : "", throwable); //$NON-NLS-1$ if (!this.status.isOK()) { - UMLDiagramEditorPlugin.getInstance().logError("Expression problem:" + message + "body:" + body(), //$NON-NLS-1$//$NON-NLS-2$ - throwable); + UMLDiagramEditorPlugin.getInstance().logError("Expression problem:" + message + "body:" + body(), throwable); //$NON-NLS-1$ //$NON-NLS-2$ } } @@ -118,7 +117,7 @@ public abstract class UMLAbstractExpression { /** * Expression may return number value which is not directly compatible with feature type (e.g. Double when Integer is expected), or EEnumLiteral meta-object when literal instance is expected - * + * * @generated */ public static Object performCast(Object value, EDataType targetType) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/expressions/UMLOCLFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/expressions/UMLOCLFactory.java index ebb083340a4..f78c88c2c6c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/expressions/UMLOCLFactory.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/expressions/UMLOCLFactory.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -24,9 +24,9 @@ import org.eclipse.ocl.Environment; import org.eclipse.ocl.EvaluationEnvironment; import org.eclipse.ocl.ParserException; import org.eclipse.ocl.ecore.EcoreFactory; +import org.eclipse.ocl.ecore.OCL.Helper; import org.eclipse.ocl.ecore.OCLExpression; import org.eclipse.ocl.ecore.Variable; -import org.eclipse.ocl.ecore.OCL.Helper; import org.eclipse.ocl.options.ParsingOptions; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin; @@ -50,7 +50,8 @@ public class UMLOCLFactory { */ protected UMLOCLFactory() { this.expressions = new UMLAbstractExpression[2]; - this.expressionBodies = new String[] { "\' \'", //$NON-NLS-1$ + this.expressionBodies = new String[] { + "\' \'", //$NON-NLS-1$ "not self.oclIsTypeOf(EnumerationLiteral)", //$NON-NLS-1$ }; } @@ -83,15 +84,14 @@ public class UMLOCLFactory { throw new IllegalArgumentException(); } if (cached.expressions[index] == null) { - cached.expressions[index] = getExpression(cached.expressionBodies[index], context, - environment == null ? Collections.<String, EClassifier>emptyMap() : environment); + cached.expressions[index] = getExpression(cached.expressionBodies[index], context, environment == null ? Collections.<String, EClassifier> emptyMap() : environment); } return cached.expressions[index]; } /** * This is factory method, callers are responsible to keep reference to the return value if they want to reuse parsed expression - * + * * @generated */ public static UMLAbstractExpression getExpression(String body, EClassifier context, @@ -101,11 +101,11 @@ public class UMLOCLFactory { /** * This method will become private in the next release - * + * * @generated */ public static UMLAbstractExpression getExpression(String body, EClassifier context) { - return getExpression(body, context, Collections.<String, EClassifier>emptyMap()); + return getExpression(body, context, Collections.<String, EClassifier> emptyMap()); } /** @@ -143,6 +143,7 @@ public class UMLOCLFactory { /** * @generated */ + @Override @SuppressWarnings("rawtypes") protected Object doEvaluate(Object context, Map env) { if (oclExpression == null) { @@ -166,11 +167,9 @@ public class UMLOCLFactory { /** * @generated */ - private static void initCustomEnv(Environment<?, EClassifier, ?, ?, ?, EParameter, ?, ?, ?, ?, ?, ?> ecoreEnv, - Map<String, EClassifier> environment) { + private static void initCustomEnv(Environment<?, EClassifier, ?, ?, ?, EParameter, ?, ?, ?, ?, ?, ?> ecoreEnv, Map<String, EClassifier> environment) { // Use EObject as implicit root class for any object, to allow eContainer() and other EObject operations from OCL expressions - ParsingOptions.setOption(ecoreEnv, ParsingOptions.implicitRootClass(ecoreEnv), - EcorePackage.eINSTANCE.getEObject()); + ParsingOptions.setOption(ecoreEnv, ParsingOptions.implicitRootClass(ecoreEnv), EcorePackage.eINSTANCE.getEObject()); for (String varName : environment.keySet()) { EClassifier varType = environment.get(varName); ecoreEnv.addElement(varName, createVar(ecoreEnv, varName, varType), false); @@ -180,8 +179,7 @@ public class UMLOCLFactory { /** * @generated */ - private static Variable createVar(Environment<?, EClassifier, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?> ecoreEnv, - String name, EClassifier type) { + private static Variable createVar(Environment<?, EClassifier, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?> ecoreEnv, String name, EClassifier type) { Variable var = EcoreFactory.eINSTANCE.createVariable(); var.setName(name); var.setType(ecoreEnv.getUMLReflection().getOCLType(type)); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLAbstractNavigatorItem.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLAbstractNavigatorItem.java index 26d780ba381..00a244ceaeb 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLAbstractNavigatorItem.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLAbstractNavigatorItem.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -40,8 +40,7 @@ public abstract class UMLAbstractNavigatorItem extends PlatformObject { @Override @SuppressWarnings("rawtypes") public Object getAdapter(Object adaptableObject, Class adapterType) { - if (adaptableObject instanceof org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLAbstractNavigatorItem - && adapterType == ITabbedPropertySheetPageContributor.class) { + if (adaptableObject instanceof org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLAbstractNavigatorItem && adapterType == ITabbedPropertySheetPageContributor.class) { return propertySheetPageContributor; } return null; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLDomainNavigatorContentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLDomainNavigatorContentProvider.java index 311447aa85f..d07c7752683 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLDomainNavigatorContentProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLDomainNavigatorContentProvider.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -73,8 +73,7 @@ public class UMLDomainNavigatorContentProvider implements ICommonContentProvider * @generated */ public UMLDomainNavigatorContentProvider() { - myAdapterFctoryContentProvier = new AdapterFactoryContentProvider( - UMLDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory()); + myAdapterFctoryContentProvier = new AdapterFactoryContentProvider(UMLDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory()); TransactionalEditingDomain editingDomain = WorkspaceEditingDomainFactory.INSTANCE.createEditingDomain(); myEditingDomain = (AdapterFactoryEditingDomain) editingDomain; @SuppressWarnings("serial") @@ -108,8 +107,7 @@ public class UMLDomainNavigatorContentProvider implements ICommonContentProvider @Override public boolean handleResourceChanged(final Resource resource) { - for (Iterator<Resource> it = myEditingDomain.getResourceSet().getResources().iterator(); it - .hasNext();) { + for (Iterator<Resource> it = myEditingDomain.getResourceSet().getResources().iterator(); it.hasNext();) { Resource nextResource = it.next(); nextResource.unload(); } @@ -121,8 +119,7 @@ public class UMLDomainNavigatorContentProvider implements ICommonContentProvider @Override public boolean handleResourceDeleted(Resource resource) { - for (Iterator<Resource> it = myEditingDomain.getResourceSet().getResources().iterator(); it - .hasNext();) { + for (Iterator<Resource> it = myEditingDomain.getResourceSet().getResources().iterator(); it.hasNext();) { Resource nextResource = it.next(); nextResource.unload(); } @@ -134,8 +131,7 @@ public class UMLDomainNavigatorContentProvider implements ICommonContentProvider @Override public boolean handleResourceMoved(Resource resource, final URI newURI) { - for (Iterator<Resource> it = myEditingDomain.getResourceSet().getResources().iterator(); it - .hasNext();) { + for (Iterator<Resource> it = myEditingDomain.getResourceSet().getResources().iterator(); it.hasNext();) { Resource nextResource = it.next(); nextResource.unload(); } @@ -150,6 +146,7 @@ public class UMLDomainNavigatorContentProvider implements ICommonContentProvider /** * @generated */ + @Override public void dispose() { myWorkspaceSynchronizer.dispose(); myWorkspaceSynchronizer = null; @@ -167,6 +164,7 @@ public class UMLDomainNavigatorContentProvider implements ICommonContentProvider /** * @generated */ + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { myViewer = viewer; } @@ -192,6 +190,7 @@ public class UMLDomainNavigatorContentProvider implements ICommonContentProvider /** * @generated */ + @Override public Object[] getElements(Object inputElement) { return getChildren(inputElement); } @@ -199,24 +198,28 @@ public class UMLDomainNavigatorContentProvider implements ICommonContentProvider /** * @generated */ + @Override public void restoreState(IMemento aMemento) { } /** * @generated */ + @Override public void saveState(IMemento aMemento) { } /** * @generated */ + @Override public void init(ICommonContentExtensionSite aConfig) { } /** * @generated */ + @Override public Object[] getChildren(Object parentElement) { if (parentElement instanceof IFile) { IFile file = (IFile) parentElement; @@ -226,9 +229,7 @@ public class UMLDomainNavigatorContentProvider implements ICommonContentProvider } if (parentElement instanceof UMLDomainNavigatorItem) { - return wrapEObjects( - myAdapterFctoryContentProvier.getChildren(((UMLDomainNavigatorItem) parentElement).getEObject()), - parentElement); + return wrapEObjects(myAdapterFctoryContentProvier.getChildren(((UMLDomainNavigatorItem) parentElement).getEObject()), parentElement); } return EMPTY_ARRAY; } @@ -237,11 +238,10 @@ public class UMLDomainNavigatorContentProvider implements ICommonContentProvider * @generated */ public Object[] wrapEObjects(Object[] objects, Object parentElement) { - Collection<UMLDomainNavigatorItem> result = new ArrayList<UMLDomainNavigatorItem>(); + Collection<UMLDomainNavigatorItem> result = new ArrayList<>(); for (int i = 0; i < objects.length; i++) { if (objects[i] instanceof EObject) { - result.add( - new UMLDomainNavigatorItem((EObject) objects[i], parentElement, myAdapterFctoryContentProvier)); + result.add(new UMLDomainNavigatorItem((EObject) objects[i], parentElement, myAdapterFctoryContentProvier)); } } return result.toArray(); @@ -250,6 +250,7 @@ public class UMLDomainNavigatorContentProvider implements ICommonContentProvider /** * @generated */ + @Override public Object getParent(Object element) { if (element instanceof UMLAbstractNavigatorItem) { UMLAbstractNavigatorItem abstractNavigatorItem = (UMLAbstractNavigatorItem) element; @@ -261,6 +262,7 @@ public class UMLDomainNavigatorContentProvider implements ICommonContentProvider /** * @generated */ + @Override public boolean hasChildren(Object element) { return element instanceof IFile || getChildren(element).length > 0; } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLDomainNavigatorItem.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLDomainNavigatorItem.java index 5dbf45c38d2..d04ae5f3000 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLDomainNavigatorItem.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLDomainNavigatorItem.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -107,10 +107,10 @@ public class UMLDomainNavigatorItem extends PlatformObject { /** * @generated */ + @Override public boolean equals(Object obj) { if (obj instanceof org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLDomainNavigatorItem) { - return EcoreUtil.getURI(getEObject()).equals(EcoreUtil.getURI( - ((org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLDomainNavigatorItem) obj).getEObject())); + return EcoreUtil.getURI(getEObject()).equals(EcoreUtil.getURI(((org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLDomainNavigatorItem) obj).getEObject())); } return super.equals(obj); } @@ -118,6 +118,7 @@ public class UMLDomainNavigatorItem extends PlatformObject { /** * @generated */ + @Override public int hashCode() { return EcoreUtil.getURI(getEObject()).hashCode(); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLDomainNavigatorLabelProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLDomainNavigatorLabelProvider.java index 6948c6e3713..0ddf7ab5601 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLDomainNavigatorLabelProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLDomainNavigatorLabelProvider.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -29,18 +29,19 @@ public class UMLDomainNavigatorLabelProvider implements ICommonLabelProvider { /** * @generated */ - private AdapterFactoryLabelProvider myAdapterFactoryLabelProvider = new AdapterFactoryLabelProvider( - UMLDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory()); + private AdapterFactoryLabelProvider myAdapterFactoryLabelProvider = new AdapterFactoryLabelProvider(UMLDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory()); /** * @generated */ + @Override public void init(ICommonContentExtensionSite aConfig) { } /** * @generated */ + @Override public Image getImage(Object element) { if (element instanceof UMLDomainNavigatorItem) { return myAdapterFactoryLabelProvider.getImage(((UMLDomainNavigatorItem) element).getEObject()); @@ -51,6 +52,7 @@ public class UMLDomainNavigatorLabelProvider implements ICommonLabelProvider { /** * @generated */ + @Override public String getText(Object element) { if (element instanceof UMLDomainNavigatorItem) { return myAdapterFactoryLabelProvider.getText(((UMLDomainNavigatorItem) element).getEObject()); @@ -61,6 +63,7 @@ public class UMLDomainNavigatorLabelProvider implements ICommonLabelProvider { /** * @generated */ + @Override public void addListener(ILabelProviderListener listener) { myAdapterFactoryLabelProvider.addListener(listener); } @@ -68,6 +71,7 @@ public class UMLDomainNavigatorLabelProvider implements ICommonLabelProvider { /** * @generated */ + @Override public void dispose() { myAdapterFactoryLabelProvider.dispose(); } @@ -75,6 +79,7 @@ public class UMLDomainNavigatorLabelProvider implements ICommonLabelProvider { /** * @generated */ + @Override public boolean isLabelProperty(Object element, String property) { return myAdapterFactoryLabelProvider.isLabelProperty(element, property); } @@ -82,6 +87,7 @@ public class UMLDomainNavigatorLabelProvider implements ICommonLabelProvider { /** * @generated */ + @Override public void removeListener(ILabelProviderListener listener) { myAdapterFactoryLabelProvider.removeListener(listener); } @@ -89,18 +95,21 @@ public class UMLDomainNavigatorLabelProvider implements ICommonLabelProvider { /** * @generated */ + @Override public void restoreState(IMemento aMemento) { } /** * @generated */ + @Override public void saveState(IMemento aMemento) { } /** * @generated */ + @Override public String getDescription(Object anElement) { return null; } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorActionProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorActionProvider.java index 8c5b00ebed5..7ac41f787a0 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorActionProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorActionProvider.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -58,6 +58,7 @@ public class UMLNavigatorActionProvider extends CommonActionProvider { /** * @generated */ + @Override public void init(ICommonActionExtensionSite aSite) { super.init(aSite); if (aSite.getViewSite() instanceof ICommonViewerWorkbenchSite) { @@ -78,6 +79,7 @@ public class UMLNavigatorActionProvider extends CommonActionProvider { /** * @generated */ + @Override public void fillActionBars(IActionBars actionBars) { if (!myContribute) { return; @@ -92,6 +94,7 @@ public class UMLNavigatorActionProvider extends CommonActionProvider { /** * @generated */ + @Override public void fillContextMenu(IMenuManager menu) { } @@ -143,6 +146,7 @@ public class UMLNavigatorActionProvider extends CommonActionProvider { /** * @generated */ + @Override public void run() { if (myDiagram == null || myDiagram.eResource() == null) { return; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorContentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorContentProvider.java index 171908b7078..e5147ec3b55 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorContentProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorContentProvider.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -103,8 +103,7 @@ public class UMLNavigatorContentProvider implements ICommonContentProvider { @Override public boolean handleResourceChanged(final Resource resource) { - for (Iterator<Resource> it = myEditingDomain.getResourceSet().getResources().iterator(); it - .hasNext();) { + for (Iterator<Resource> it = myEditingDomain.getResourceSet().getResources().iterator(); it.hasNext();) { Resource nextResource = it.next(); nextResource.unload(); } @@ -116,8 +115,7 @@ public class UMLNavigatorContentProvider implements ICommonContentProvider { @Override public boolean handleResourceDeleted(Resource resource) { - for (Iterator<Resource> it = myEditingDomain.getResourceSet().getResources().iterator(); it - .hasNext();) { + for (Iterator<Resource> it = myEditingDomain.getResourceSet().getResources().iterator(); it.hasNext();) { Resource nextResource = it.next(); nextResource.unload(); } @@ -129,8 +127,7 @@ public class UMLNavigatorContentProvider implements ICommonContentProvider { @Override public boolean handleResourceMoved(Resource resource, final URI newURI) { - for (Iterator<Resource> it = myEditingDomain.getResourceSet().getResources().iterator(); it - .hasNext();) { + for (Iterator<Resource> it = myEditingDomain.getResourceSet().getResources().iterator(); it.hasNext();) { Resource nextResource = it.next(); nextResource.unload(); } @@ -145,6 +142,7 @@ public class UMLNavigatorContentProvider implements ICommonContentProvider { /** * @generated */ + @Override public void dispose() { myWorkspaceSynchronizer.dispose(); myWorkspaceSynchronizer = null; @@ -162,6 +160,7 @@ public class UMLNavigatorContentProvider implements ICommonContentProvider { /** * @generated */ + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { myViewer = viewer; } @@ -187,6 +186,7 @@ public class UMLNavigatorContentProvider implements ICommonContentProvider { /** * @generated */ + @Override public Object[] getElements(Object inputElement) { return getChildren(inputElement); } @@ -194,31 +194,35 @@ public class UMLNavigatorContentProvider implements ICommonContentProvider { /** * @generated */ + @Override public void restoreState(IMemento aMemento) { } /** * @generated */ + @Override public void saveState(IMemento aMemento) { } /** * @generated */ + @Override public void init(ICommonContentExtensionSite aConfig) { } /** * @generated */ + @Override public Object[] getChildren(Object parentElement) { if (parentElement instanceof IFile) { IFile file = (IFile) parentElement; URI fileURI = URI.createPlatformResourceURI(file.getFullPath().toString(), true); Resource resource = myEditingDomain.getResourceSet().getResource(fileURI, true); - Collection<Object> result = new ArrayList<Object>(); - List<View> topViews = new ArrayList<View>(resource.getContents().size()); + Collection<Object> result = new ArrayList<>(); + List<View> topViews = new ArrayList<>(resource.getContents().size()); for (EObject o : resource.getContents()) { if (o instanceof View) { topViews.add((View) o); @@ -265,6 +269,7 @@ public class UMLNavigatorContentProvider implements ICommonContentProvider { /** * @generated */ + @Override public Object getParent(Object element) { if (element instanceof UMLAbstractNavigatorItem) { UMLAbstractNavigatorItem abstractNavigatorItem = (UMLAbstractNavigatorItem) element; @@ -276,6 +281,7 @@ public class UMLNavigatorContentProvider implements ICommonContentProvider { /** * @generated */ + @Override public boolean hasChildren(Object element) { return element instanceof IFile || getChildren(element).length > 0; } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorGroup.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorGroup.java index 8451b45f6ed..d62a4fd725e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorGroup.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorGroup.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -34,7 +34,7 @@ public class UMLNavigatorGroup extends UMLAbstractNavigatorItem { /** * @generated */ - private Collection<java.lang.Object> myChildren = new LinkedList<java.lang.Object>(); + private Collection<java.lang.Object> myChildren = new LinkedList<>(); /** * @generated @@ -90,6 +90,7 @@ public class UMLNavigatorGroup extends UMLAbstractNavigatorItem { /** * @generated */ + @Override public boolean equals(Object obj) { if (obj instanceof org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorGroup) { org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorGroup anotherGroup = (org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorGroup) obj; @@ -103,6 +104,7 @@ public class UMLNavigatorGroup extends UMLAbstractNavigatorItem { /** * @generated */ + @Override public int hashCode() { return getGroupName().hashCode(); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorItem.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorItem.java index 24553528194..3e6284c9b18 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorItem.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorItem.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -35,10 +35,8 @@ public class UMLNavigatorItem extends UMLAbstractNavigatorItem { @Override @SuppressWarnings("rawtypes") public Object getAdapter(Object adaptableObject, Class adapterType) { - if (adaptableObject instanceof org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorItem - && (adapterType == View.class || adapterType == EObject.class)) { - return ((org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorItem) adaptableObject) - .getView(); + if (adaptableObject instanceof org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorItem && (adapterType == View.class || adapterType == EObject.class)) { + return ((org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorItem) adaptableObject).getView(); } return null; } @@ -87,10 +85,10 @@ public class UMLNavigatorItem extends UMLAbstractNavigatorItem { /** * @generated */ + @Override public boolean equals(Object obj) { if (obj instanceof org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorItem) { - return EcoreUtil.getURI(getView()).equals(EcoreUtil - .getURI(((org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorItem) obj).getView())); + return EcoreUtil.getURI(getView()).equals(EcoreUtil.getURI(((org.eclipse.papyrus.uml.diagram.clazz.navigator.UMLNavigatorItem) obj).getView())); } return super.equals(obj); } @@ -98,6 +96,7 @@ public class UMLNavigatorItem extends UMLAbstractNavigatorItem { /** * @generated */ + @Override public int hashCode() { return EcoreUtil.getURI(getView()).hashCode(); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorLabelProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorLabelProvider.java index 457778c5166..5678eaa291f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorLabelProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorLabelProvider.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -39,15 +39,14 @@ public class UMLNavigatorLabelProvider extends LabelProvider implements ICommonL * @generated */ static { - UMLDiagramEditorPlugin.getInstance().getImageRegistry().put("Navigator?UnknownElement", //$NON-NLS-1$ - ImageDescriptor.getMissingImageDescriptor()); - UMLDiagramEditorPlugin.getInstance().getImageRegistry().put("Navigator?ImageNotFound", //$NON-NLS-1$ - ImageDescriptor.getMissingImageDescriptor()); + UMLDiagramEditorPlugin.getInstance().getImageRegistry().put("Navigator?UnknownElement", ImageDescriptor.getMissingImageDescriptor()); //$NON-NLS-1$ + UMLDiagramEditorPlugin.getInstance().getImageRegistry().put("Navigator?ImageNotFound", ImageDescriptor.getMissingImageDescriptor()); //$NON-NLS-1$ } /** * @generated */ + @Override public void updateLabel(ViewerLabel label, TreePath elementPath) { Object element = elementPath.getLastSegment(); if (element instanceof UMLNavigatorItem && !isOwnView(((UMLNavigatorItem) element).getView())) { @@ -60,6 +59,7 @@ public class UMLNavigatorLabelProvider extends LabelProvider implements ICommonL /** * @generated */ + @Override public Image getImage(Object element) { if (element instanceof UMLNavigatorGroup) { UMLNavigatorGroup group = (UMLNavigatorGroup) element; @@ -74,6 +74,7 @@ public class UMLNavigatorLabelProvider extends LabelProvider implements ICommonL return getImage(navigatorItem.getView()); } + return super.getImage(element); } @@ -105,6 +106,7 @@ public class UMLNavigatorLabelProvider extends LabelProvider implements ICommonL /** * @generated */ + @Override public String getText(Object element) { if (element instanceof UMLNavigatorGroup) { UMLNavigatorGroup group = (UMLNavigatorGroup) element; @@ -119,6 +121,7 @@ public class UMLNavigatorLabelProvider extends LabelProvider implements ICommonL return getText(navigatorItem.getView()); } + return super.getText(element); } @@ -136,37 +139,41 @@ public class UMLNavigatorLabelProvider extends LabelProvider implements ICommonL * @generated */ private String getUnknownElementText(View view) { - return "<UnknownElement Visual_ID = " + view.getType() + ">"; //$NON-NLS-1$ //$NON-NLS-2$ + return "<UnknownElement Visual_ID = " + view.getType() + ">"; //$NON-NLS-1$ //$NON-NLS-2$ } /** * @generated */ private String getUnresolvedDomainElementProxyText(View view) { - return "<Unresolved domain element Visual_ID = " + view.getType() + ">"; //$NON-NLS-1$ //$NON-NLS-2$ + return "<Unresolved domain element Visual_ID = " + view.getType() + ">"; //$NON-NLS-1$ //$NON-NLS-2$ } /** * @generated */ + @Override public void init(ICommonContentExtensionSite aConfig) { } /** * @generated */ + @Override public void restoreState(IMemento aMemento) { } /** * @generated */ + @Override public void saveState(IMemento aMemento) { } /** * @generated */ + @Override public String getDescription(Object anElement) { return null; } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorLinkHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorLinkHelper.java index 025a02efe2e..02f952c241f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorLinkHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorLinkHelper.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -60,6 +60,7 @@ public class UMLNavigatorLinkHelper implements ILinkHelper { /** * @generated */ + @Override public IStructuredSelection findSelection(IEditorInput anInput) { return StructuredSelection.EMPTY; } @@ -67,6 +68,7 @@ public class UMLNavigatorLinkHelper implements ILinkHelper { /** * @generated */ + @Override public void activateEditor(IWorkbenchPage aPage, IStructuredSelection aSelection) { if (aSelection == null || aSelection.isEmpty()) { return; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorSorter.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorSorter.java index e473a8005b2..8fbc763b63f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorSorter.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/navigator/UMLNavigatorSorter.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -29,6 +29,7 @@ public class UMLNavigatorSorter extends ViewerSorter { /** * @generated */ + @Override public int category(Object element) { if (element instanceof UMLNavigatorItem) { UMLNavigatorItem item = (UMLNavigatorItem) element; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/parsers/AbstractParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/parsers/AbstractParser.java index dbcb00f1c27..3fb27060a68 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/parsers/AbstractParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/parsers/AbstractParser.java @@ -1 +1 @@ -//Since GMFT 3.1 we don't generate class AbstractParser into every diagram, instead extend org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.parsers.AbstractAttributeParser. +// Since GMFT 3.1 we don't generate class AbstractParser into every diagram, instead extend org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.parsers.AbstractAttributeParser. diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/parsers/MessageFormatParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/parsers/MessageFormatParser.java index 581c0055bdb..273683bbaf8 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/parsers/MessageFormatParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/parsers/MessageFormatParser.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -102,6 +102,7 @@ public class MessageFormatParser extends AbstractElementTypeBasedAttributeParser /** * @generated */ + @Override public void setViewPattern(String viewPattern) { super.setViewPattern(viewPattern); viewProcessor = null; @@ -110,6 +111,7 @@ public class MessageFormatParser extends AbstractElementTypeBasedAttributeParser /** * @generated */ + @Override public void setEditorPattern(String editorPattern) { super.setEditorPattern(editorPattern); editorProcessor = null; @@ -130,8 +132,7 @@ public class MessageFormatParser extends AbstractElementTypeBasedAttributeParser */ protected MessageFormat getEditorProcessor() { if (editorProcessor == null) { - editorProcessor = new MessageFormat( - getEditorPattern() == null ? getDefaultEditablePattern() : getEditorPattern()); + editorProcessor = new MessageFormat(getEditorPattern() == null ? getDefaultEditablePattern() : getEditorPattern()); } return editorProcessor; } @@ -158,6 +159,7 @@ public class MessageFormatParser extends AbstractElementTypeBasedAttributeParser /** * @generated */ + @Override public void setEditPattern(String editPattern) { super.setEditPattern(editPattern); editProcessor = null; @@ -168,8 +170,7 @@ public class MessageFormatParser extends AbstractElementTypeBasedAttributeParser */ protected MessageFormat getEditProcessor() { if (editProcessor == null) { - editProcessor = new MessageFormat( - getEditPattern() == null ? getDefaultEditablePattern() : getEditPattern()); + editProcessor = new MessageFormat(getEditPattern() == null ? getDefaultEditablePattern() : getEditPattern()); } return editProcessor; } @@ -177,21 +178,26 @@ public class MessageFormatParser extends AbstractElementTypeBasedAttributeParser /** * @generated */ + @Override public String getEditString(IAdaptable adapter, int flags) { - EObject element = (EObject) adapter.getAdapter(EObject.class); - return getEditorProcessor().format(getEditableValues(element), new StringBuffer(), new FieldPosition(0)) - .toString(); + EObject element = adapter.getAdapter(EObject.class); + return getEditorProcessor().format(getEditableValues(element), new StringBuffer(), new FieldPosition(0)).toString(); } /** * @generated */ + @Override public IParserEditStatus isValidEditString(IAdaptable adapter, String editString) { ParsePosition pos = new ParsePosition(0); Object[] values = getEditProcessor().parse(editString, pos); if (values == null) { - return new ParserEditStatus(UMLDiagramEditorPlugin.ID, IParserEditStatus.UNEDITABLE, - NLS.bind(Messages.MessageFormatParser_InvalidInputError, new Integer(pos.getErrorIndex()))); + return new ParserEditStatus( + UMLDiagramEditorPlugin.ID, + IParserEditStatus.UNEDITABLE, + NLS.bind( + Messages.MessageFormatParser_InvalidInputError, + new Integer(pos.getErrorIndex()))); } return validateNewValues(values); } @@ -199,6 +205,7 @@ public class MessageFormatParser extends AbstractElementTypeBasedAttributeParser /** * @generated */ + @Override public ICommand getParseCommand(IAdaptable adapter, String newString, int flags) { Object[] values = getEditProcessor().parse(newString, new ParsePosition(0)); return getParseCommand(adapter, values, flags); @@ -207,14 +214,15 @@ public class MessageFormatParser extends AbstractElementTypeBasedAttributeParser /** * @generated */ + @Override public String getPrintString(IAdaptable adapter, int flags) { - EObject element = (EObject) adapter.getAdapter(EObject.class); + EObject element = adapter.getAdapter(EObject.class); return getViewProcessor().format(getValues(element), new StringBuffer(), new FieldPosition(0)).toString(); } /** * @generated - * {@inheritDoc} + * {@inheritDoc} * @see AbstractFeatureParser#getModificationCommand(EObject, EStructuralFeature, java.lang.Object) */ @Override @@ -224,12 +232,10 @@ public class MessageFormatParser extends AbstractElementTypeBasedAttributeParser // If the feature to edit is the name, check that this is not really the internationalization to edit and not the name if (feature.equals(UMLPackage.eINSTANCE.getNamedElement_Name())) { - if (InternationalizationPreferencesUtils.getInternationalizationPreference(element) - && null != UMLLabelInternationalization.getInstance().getLabelWithoutUML((NamedElement) element)) { + if (InternationalizationPreferencesUtils.getInternationalizationPreference(element) && null != UMLLabelInternationalization.getInstance().getLabelWithoutUML((NamedElement) element)) { final ModelSet modelSet = (ModelSet) element.eResource().getResourceSet(); if (null != modelSet) { - result = new EMFtoGMFCommandWrapper(UMLLabelInternationalization.getInstance().getSetLabelCommand( - modelSet.getTransactionalEditingDomain(), (NamedElement) element, (String) value, null)); + result = new EMFtoGMFCommandWrapper(UMLLabelInternationalization.getInstance().getSetLabelCommand(modelSet.getTransactionalEditingDomain(), (NamedElement) element, (String) value, null)); } } } @@ -239,7 +245,7 @@ public class MessageFormatParser extends AbstractElementTypeBasedAttributeParser /** * @generated - * {@inheritDoc} + * {@inheritDoc} * @see AbstractAttributeParser#getValue(EObject, EStructuralFeature) */ @Override @@ -247,8 +253,7 @@ public class MessageFormatParser extends AbstractElementTypeBasedAttributeParser Object result = null; if (element instanceof NamedElement && feature.equals(UMLPackage.eINSTANCE.getNamedElement_Name())) { - if (InternationalizationPreferencesUtils.getInternationalizationPreference(element) - && null != UMLLabelInternationalization.getInstance().getLabelWithoutUML((NamedElement) element)) { + if (InternationalizationPreferencesUtils.getInternationalizationPreference(element) && null != UMLLabelInternationalization.getInstance().getLabelWithoutUML((NamedElement) element)) { result = UMLLabelInternationalization.getInstance().getLabelWithoutUML((NamedElement) element); } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/DiagramEditorContextMenuProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/DiagramEditorContextMenuProvider.java index 546827851a4..ca5dd9be55a 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/DiagramEditorContextMenuProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/DiagramEditorContextMenuProvider.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -43,16 +43,17 @@ public class DiagramEditorContextMenuProvider extends DiagramContextMenuProvider /** * @generated */ + @Override public void buildContextMenu(final IMenuManager menu) { getViewer().flush(); try { - TransactionUtil.getEditingDomain((EObject) getViewer().getContents().getModel()) - .runExclusive(new Runnable() { + TransactionUtil.getEditingDomain( + (EObject) getViewer().getContents().getModel()).runExclusive(new Runnable() { @Override public void run() { - ContributionItemService.getInstance() - .contributeToPopupMenu(DiagramEditorContextMenuProvider.this, part); + ContributionItemService.getInstance().contributeToPopupMenu( + DiagramEditorContextMenuProvider.this, part); menu.remove(ActionIds.ACTION_DELETE_FROM_MODEL); } }); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/LoadResourceAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/LoadResourceAction.java index 70eb962f044..4e60b42e43d 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/LoadResourceAction.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/LoadResourceAction.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -24,6 +24,7 @@ public class LoadResourceAction extends DefaultLoadResourceAction { /** * @generated */ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { return super.execute(event); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/Messages.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/Messages.java index 5848410244c..d9ead7988dd 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/Messages.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/Messages.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -256,546 +256,6 @@ public class Messages extends NLS { /** * @generated */ - public static String Nodes1Group_title; - - /** - * @generated - */ - public static String Nodes1Group_desc; - - /** - * @generated - */ - public static String Edges2Group_title; - - /** - * @generated - */ - public static String Edges2Group_desc; - - /** - * @generated - */ - public static String Associations2Group_title; - - /** - * @generated - */ - public static String Associations2Group_desc; - - /** - * @generated - */ - public static String Class1CreationTool_title; - - /** - * @generated - */ - public static String Class1CreationTool_desc; - - /** - * @generated - */ - public static String ClassifierTemplateParameter2CreationTool_title; - - /** - * @generated - */ - public static String ClassifierTemplateParameter2CreationTool_desc; - - /** - * @generated - */ - public static String Comment5CreationTool_title; - - /** - * @generated - */ - public static String Comment5CreationTool_desc; - - /** - * @generated - */ - public static String Component4CreationTool_title; - - /** - * @generated - */ - public static String Component4CreationTool_desc; - - /** - * @generated - */ - public static String Constraint5CreationTool_title; - - /** - * @generated - */ - public static String Constraint5CreationTool_desc; - - /** - * @generated - */ - public static String DataType6CreationTool_title; - - /** - * @generated - */ - public static String DataType6CreationTool_desc; - - /** - * @generated - */ - public static String DurationObservation7CreationTool_title; - - /** - * @generated - */ - public static String DurationObservation7CreationTool_desc; - - /** - * @generated - */ - public static String Enumeration8CreationTool_title; - - /** - * @generated - */ - public static String Enumeration8CreationTool_desc; - - /** - * @generated - */ - public static String EnumerationLiteral9CreationTool_title; - - /** - * @generated - */ - public static String EnumerationLiteral9CreationTool_desc; - - /** - * @generated - */ - public static String Interface10CreationTool_title; - - /** - * @generated - */ - public static String Interface10CreationTool_desc; - - /** - * @generated - */ - public static String InstanceSpecification11CreationTool_title; - - /** - * @generated - */ - public static String InstanceSpecification11CreationTool_desc; - - /** - * @generated - */ - public static String InformationItem12CreationTool_title; - - /** - * @generated - */ - public static String InformationItem12CreationTool_desc; - - /** - * @generated - */ - public static String PrimitiveType13CreationTool_title; - - /** - * @generated - */ - public static String PrimitiveType13CreationTool_desc; - - /** - * @generated - */ - public static String Model14CreationTool_title; - - /** - * @generated - */ - public static String Model14CreationTool_desc; - - /** - * @generated - */ - public static String Operation15CreationTool_title; - - /** - * @generated - */ - public static String Operation15CreationTool_desc; - - /** - * @generated - */ - public static String OperationTemplateParameterCreationTool_title; - - /** - * @generated - */ - public static String OperationTemplateParameterCreationTool_desc; - - /** - * @generated - */ - public static String Package17CreationTool_title; - - /** - * @generated - */ - public static String Package17CreationTool_desc; - - /** - * @generated - */ - public static String Property18CreationTool_title; - - /** - * @generated - */ - public static String Property18CreationTool_desc; - - /** - * @generated - */ - public static String Reception19CreationTool_title; - - /** - * @generated - */ - public static String Reception19CreationTool_desc; - - /** - * @generated - */ - public static String RedefinableTemplateSignature20CreationTool_title; - - /** - * @generated - */ - public static String RedefinableTemplateSignature20CreationTool_desc; - - /** - * @generated - */ - public static String Signal21CreationTool_title; - - /** - * @generated - */ - public static String Signal21CreationTool_desc; - - /** - * @generated - */ - public static String Slot22CreationTool_title; - - /** - * @generated - */ - public static String Slot22CreationTool_desc; - - /** - * @generated - */ - public static String TemplateParameter23CreationTool_title; - - /** - * @generated - */ - public static String TemplateParameter23CreationTool_desc; - - /** - * @generated - */ - public static String TemplateSignatureCreationTool_title; - - /** - * @generated - */ - public static String TemplateSignatureCreationTool_desc; - - /** - * @generated - */ - public static String TimeObservation22CreationTool_title; - - /** - * @generated - */ - public static String TimeObservation22CreationTool_desc; - - /** - * @generated - */ - public static String ConnectableElementTemplateParameter26CreationTool_title; - - /** - * @generated - */ - public static String ConnectableElementTemplateParameter26CreationTool_desc; - - /** - * @generated - */ - public static String Abstraction1CreationTool_title; - - /** - * @generated - */ - public static String Abstraction1CreationTool_desc; - - /** - * @generated - */ - public static String AssociationBranch3CreationTool_title; - - /** - * @generated - */ - public static String AssociationBranch3CreationTool_desc; - - /** - * @generated - */ - public static String AssociationClass4CreationTool_title; - - /** - * @generated - */ - public static String AssociationClass4CreationTool_desc; - - /** - * @generated - */ - public static String ContainmentLink5CreationTool_title; - - /** - * @generated - */ - public static String ContainmentLink5CreationTool_desc; - - /** - * @generated - */ - public static String ContextLink6CreationTool_title; - - /** - * @generated - */ - public static String ContextLink6CreationTool_desc; - - /** - * @generated - */ - public static String Dependency7CreationTool_title; - - /** - * @generated - */ - public static String Dependency7CreationTool_desc; - - /** - * @generated - */ - public static String DependencyBranch8CreationTool_title; - - /** - * @generated - */ - public static String DependencyBranch8CreationTool_desc; - - /** - * @generated - */ - public static String ElementImport9CreationTool_title; - - /** - * @generated - */ - public static String ElementImport9CreationTool_desc; - - /** - * @generated - */ - public static String Generalization10CreationTool_title; - - /** - * @generated - */ - public static String Generalization10CreationTool_desc; - - /** - * @generated - */ - public static String GeneralizationSet11CreationTool_title; - - /** - * @generated - */ - public static String GeneralizationSet11CreationTool_desc; - - /** - * @generated - */ - public static String InformationFlowLinkCreationTool_title; - - /** - * @generated - */ - public static String InformationFlowLinkCreationTool_desc; - - /** - * @generated - */ - public static String InstanceSpecificationLinkCreationTool_title; - - /** - * @generated - */ - public static String InstanceSpecificationLinkCreationTool_desc; - - /** - * @generated - */ - public static String InterfaceRealization14CreationTool_title; - - /** - * @generated - */ - public static String InterfaceRealization14CreationTool_desc; - - /** - * @generated - */ - public static String Link15CreationTool_title; - - /** - * @generated - */ - public static String Link15CreationTool_desc; - - /** - * @generated - */ - public static String PackageImport16CreationTool_title; - - /** - * @generated - */ - public static String PackageImport16CreationTool_desc; - - /** - * @generated - */ - public static String PackageMerge17CreationTool_title; - - /** - * @generated - */ - public static String PackageMerge17CreationTool_desc; - - /** - * @generated - */ - public static String ProfileApplication18CreationTool_title; - - /** - * @generated - */ - public static String ProfileApplication18CreationTool_desc; - - /** - * @generated - */ - public static String Realization19CreationTool_title; - - /** - * @generated - */ - public static String Realization19CreationTool_desc; - - /** - * @generated - */ - public static String Substitution20CreationTool_title; - - /** - * @generated - */ - public static String Substitution20CreationTool_desc; - - /** - * @generated - */ - public static String TemplateBinding21CreationTool_title; - - /** - * @generated - */ - public static String TemplateBinding21CreationTool_desc; - - /** - * @generated - */ - public static String Usage22CreationTool_title; - - /** - * @generated - */ - public static String Usage22CreationTool_desc; - - /** - * @generated - */ - public static String DirectedAssociation1CreationTool_title; - - /** - * @generated - */ - public static String DirectedAssociation1CreationTool_desc; - - /** - * @generated - */ - public static String Association2CreationTool_title; - - /** - * @generated - */ - public static String Association2CreationTool_desc; - - /** - * @generated - */ - public static String DirectedCompositeAssociation3CreationTool_title; - - /** - * @generated - */ - public static String DirectedCompositeAssociation3CreationTool_desc; - - /** - * @generated - */ - public static String DirectedSharedAssociation5CreationTool_title; - - /** - * @generated - */ - public static String DirectedSharedAssociation5CreationTool_desc; - - /** - * @generated - */ public static String ClassAttributeCompartmentEditPartCN_title; /** @@ -1023,5 +483,5 @@ public class Messages extends NLS { */ public static String UMLModelingAssistantProviderMessage; - //TODO: put accessor fields manually + // TODO: put accessor fields manually } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/ModelElementSelectionPage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/ModelElementSelectionPage.java index 15eaebd624c..cea98008f58 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/ModelElementSelectionPage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/ModelElementSelectionPage.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -17,6 +17,7 @@ import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.part.DefaultModelElemen /** * Wizard page that allows to select element from model. + * * @generated */ public class ModelElementSelectionPage extends DefaultModelElementSelectionPage { @@ -30,8 +31,10 @@ public class ModelElementSelectionPage extends DefaultModelElementSelectionPage /** * Override to provide custom model element description. + * * @generated */ + @Override protected String getSelectionTitle() { return Messages.ModelElementSelectionPageMessage; } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLCreationWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLCreationWizard.java index 12c4c99805a..7506f88e21e 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLCreationWizard.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLCreationWizard.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -100,33 +100,37 @@ public class UMLCreationWizard extends Wizard implements INewWizard { /** * @generated */ + @Override public void init(IWorkbench workbench, IStructuredSelection selection) { this.workbench = workbench; this.selection = selection; setWindowTitle(Messages.UMLCreationWizardTitle); - setDefaultPageImageDescriptor( - UMLDiagramEditorPlugin.getBundledImageDescriptor("icons/wizban/NewUMLWizard.gif")); //$NON-NLS-1$ + setDefaultPageImageDescriptor(UMLDiagramEditorPlugin.getBundledImageDescriptor( + "icons/wizban/NewUMLWizard.gif")); //$NON-NLS-1$ setNeedsProgressMonitor(true); } /** * @generated */ + @Override public void addPages() { - diagramModelFilePage = new UMLCreationWizardPage("DiagramModelFile", getSelection(), "PapyrusUMLClass_diagram"); //$NON-NLS-1$ //$NON-NLS-2$ + diagramModelFilePage = new UMLCreationWizardPage( + "DiagramModelFile", getSelection(), "PapyrusUMLClass_diagram"); //$NON-NLS-1$ //$NON-NLS-2$ diagramModelFilePage.setTitle(Messages.UMLCreationWizard_DiagramModelFilePageTitle); diagramModelFilePage.setDescription(Messages.UMLCreationWizard_DiagramModelFilePageDescription); addPage(diagramModelFilePage); - domainModelFilePage = new UMLCreationWizardPage("DomainModelFile", getSelection(), "PapyrusUMLClass") { //$NON-NLS-1$ //$NON-NLS-2$ + domainModelFilePage = new UMLCreationWizardPage( + "DomainModelFile", getSelection(), "PapyrusUMLClass") { //$NON-NLS-1$ //$NON-NLS-2$ @Override public void setVisible(boolean visible) { if (visible) { String fileName = diagramModelFilePage.getFileName(); fileName = fileName.substring(0, fileName.length() - ".PapyrusUMLClass_diagram".length()); //$NON-NLS-1$ - setFileName(UMLDiagramEditorUtil.getUniqueFileName(getContainerFullPath(), fileName, - "PapyrusUMLClass")); //$NON-NLS-1$ + setFileName(UMLDiagramEditorUtil.getUniqueFileName( + getContainerFullPath(), fileName, "PapyrusUMLClass")); //$NON-NLS-1$ } super.setVisible(visible); } @@ -139,19 +143,22 @@ public class UMLCreationWizard extends Wizard implements INewWizard { /** * @generated */ + @Override public boolean performFinish() { IRunnableWithProgress op = new WorkspaceModifyOperation(null) { @Override - protected void execute(IProgressMonitor monitor) throws CoreException, InterruptedException { + protected void execute(IProgressMonitor monitor) + throws CoreException, InterruptedException { diagram = UMLDiagramEditorUtil.createDiagram(diagramModelFilePage.getURI(), - domainModelFilePage.getURI(), monitor); + domainModelFilePage.getURI(), + monitor); if (isOpenNewlyCreatedDiagramEditor() && diagram != null) { try { UMLDiagramEditorUtil.openDiagram(diagram); } catch (PartInitException e) { - ErrorDialog.openError(getContainer().getShell(), Messages.UMLCreationWizardOpenEditorError, - null, e.getStatus()); + ErrorDialog.openError(getContainer().getShell(), + Messages.UMLCreationWizardOpenEditorError, null, e.getStatus()); } } } @@ -162,10 +169,12 @@ public class UMLCreationWizard extends Wizard implements INewWizard { return false; } catch (InvocationTargetException e) { if (e.getTargetException() instanceof CoreException) { - ErrorDialog.openError(getContainer().getShell(), Messages.UMLCreationWizardCreationError, null, + ErrorDialog.openError(getContainer().getShell(), + Messages.UMLCreationWizardCreationError, null, ((CoreException) e.getTargetException()).getStatus()); } else { - UMLDiagramEditorPlugin.getInstance().logError("Error creating diagram", e.getTargetException()); //$NON-NLS-1$ + UMLDiagramEditorPlugin.getInstance().logError( + "Error creating diagram", e.getTargetException()); //$NON-NLS-1$ } return false; } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLCreationWizardPage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLCreationWizardPage.java index 139e57f0bba..22e22af4614 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLCreationWizardPage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLCreationWizardPage.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -41,7 +41,7 @@ public class UMLCreationWizardPage extends WizardNewFileCreationPage { /** * Override to create files with this extension. - * + * * @generated */ protected String getExtension() { @@ -73,22 +73,26 @@ public class UMLCreationWizardPage extends WizardNewFileCreationPage { /** * @generated */ + @Override public void createControl(Composite parent) { super.createControl(parent); - setFileName(UMLDiagramEditorUtil.getUniqueFileName(getContainerFullPath(), getFileName(), getExtension())); + setFileName(UMLDiagramEditorUtil.getUniqueFileName( + getContainerFullPath(), getFileName(), getExtension())); setPageComplete(validatePage()); } /** * @generated */ + @Override protected boolean validatePage() { if (!super.validatePage()) { return false; } String extension = getExtension(); if (extension != null && !getFilePath().toString().endsWith("." + extension)) { - setErrorMessage(NLS.bind(Messages.UMLCreationWizardPageExtensionError, extension)); + setErrorMessage(NLS.bind( + Messages.UMLCreationWizardPageExtensionError, extension)); return false; } return true; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramActionBarContributor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramActionBarContributor.java index 932072d1dd9..2cc68291c8f 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramActionBarContributor.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramActionBarContributor.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -30,6 +30,7 @@ public class UMLDiagramActionBarContributor extends DiagramActionBarContributor * @generated */ + @Override protected Class<UMLDiagramEditor> getEditorClass() { return UMLDiagramEditor.class; } @@ -37,6 +38,7 @@ public class UMLDiagramActionBarContributor extends DiagramActionBarContributor /** * @generated */ + @Override protected String getEditorId() { return UMLDiagramEditor.ID; } @@ -44,6 +46,7 @@ public class UMLDiagramActionBarContributor extends DiagramActionBarContributor /** * @generated */ + @Override public void init(IActionBars bars, IWorkbenchPage page) { super.init(bars, page); // print preview diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramEditor.java index cd4b0a33628..2a10afc9ba6 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramEditor.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramEditor.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -24,7 +24,6 @@ import org.eclipse.gef.GraphicalViewer; import org.eclipse.gef.KeyHandler; import org.eclipse.gef.Tool; import org.eclipse.gef.commands.CommandStackListener; -import org.eclipse.gef.palette.PaletteRoot; import org.eclipse.gef.ui.palette.PaletteViewer; import org.eclipse.gef.ui.palette.PaletteViewerProvider; import org.eclipse.gmf.runtime.common.core.service.IProviderChangeListener; @@ -124,6 +123,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /** * @generated */ + @Override protected String getContextID() { return CONTEXT_ID; } @@ -131,21 +131,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /** * @generated */ - protected PaletteRoot createPaletteRoot(PaletteRoot existingPaletteRoot) { - PaletteRoot paletteRoot; - if (existingPaletteRoot == null) { - paletteRoot = PapyrusPaletteService.getInstance().createPalette(this, getDefaultPaletteContent()); - } else { - PapyrusPaletteService.getInstance().updatePalette(existingPaletteRoot, this, getDefaultPaletteContent()); - paletteRoot = existingPaletteRoot; - } - applyCustomizationsToPalette(paletteRoot); - return paletteRoot; - } - - /** - * @generated - */ + @Override protected PreferencesHint getPreferencesHint() { return UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT; } @@ -153,6 +139,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /** * @generated */ + @Override public String getContributorId() { return UMLDiagramEditorPlugin.ID; } @@ -160,6 +147,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /** * @generated */ + @Override @SuppressWarnings("rawtypes") public Object getAdapter(Class type) { if (type == IShowInTargetList.class) { @@ -177,6 +165,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /** * @generated */ + @Override protected final IDocumentProvider getDocumentProvider(IEditorInput input) { return documentProvider; } @@ -184,6 +173,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /** * @generated */ + @Override public TransactionalEditingDomain getEditingDomain() { return editingDomain; } @@ -191,6 +181,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /** * @generated */ + @Override protected final void setDocumentProvider(IEditorInput input) { // Already set in the constructor } @@ -198,6 +189,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /** * @generated */ + @Override public void gotoMarker(IMarker marker) { MarkerNavigationService.getInstance().gotoMarker(this, marker); } @@ -205,6 +197,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /** * @generated */ + @Override public boolean isSaveAsAllowed() { return true; } @@ -212,6 +205,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /** * @generated */ + @Override public void doSaveAs() { performSaveAs(new NullProgressMonitor()); } @@ -219,6 +213,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /** * @generated */ + @Override protected void performSaveAs(IProgressMonitor progressMonitor) { // Nothing } @@ -226,6 +221,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /** * @generated */ + @Override public ShowInContext getShowInContext() { return new ShowInContext(getEditorInput(), getNavigatorSelection()); } @@ -240,10 +236,10 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /** * @generated */ + @Override protected void configureGraphicalViewer() { super.configureGraphicalViewer(); - DiagramEditorContextMenuProvider provider = new DiagramEditorContextMenuProvider(this, - getDiagramGraphicalViewer()); + DiagramEditorContextMenuProvider provider = new DiagramEditorContextMenuProvider(this, getDiagramGraphicalViewer()); getDiagramGraphicalViewer().setContextMenu(provider); getSite().registerContextMenu(ActionIds.DIAGRAM_EDITOR_CONTEXT_MENU, provider, getDiagramGraphicalViewer()); } @@ -251,6 +247,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /** * @generated */ + @Override protected TransactionalEditingDomain createEditingDomain() { // Already configured return editingDomain; @@ -259,6 +256,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /** * @generated */ + @Override protected void configureDiagramEditDomain() { super.configureDiagramEditDomain(); getDiagramEditDomain().getDiagramCommandStack().addCommandStackListener(new CommandStackListener() { @@ -283,6 +281,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /** * @generated */ + @Override public void doSave(IProgressMonitor progressMonitor) { // The saving of the resource is done by the CoreMultiDiagramEditor getDirtyState().saved(); @@ -301,6 +300,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /** * @generated */ + @Override protected void setUndoContext(IUndoContext context) { if (dirtyState != null) { dirtyState.dispose(); @@ -313,6 +313,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /** * @generated */ + @Override public boolean isDirty() { return getDirtyState().isDirty(); } @@ -320,6 +321,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /** * @generated */ + @Override public void providerChanged(ProviderChangeEvent event) { // update the palette if the palette service has changed if (PapyrusPaletteService.getInstance().equals(event.getSource())) { @@ -331,6 +333,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /** * @generated */ + @Override public void dispose() { // remove palette service listener // remove preference listener @@ -354,6 +357,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /** * @generated */ + @Override protected PaletteViewer constructPaletteViewer() { return new PapyrusPaletteViewer(); } @@ -361,6 +365,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /** * @generated */ + @Override protected PaletteViewerProvider createPaletteViewerProvider() { getEditDomain().setPaletteRoot(createPaletteRoot(null)); return new PaletteViewerProvider(getEditDomain()) { @@ -413,7 +418,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh * whenever a key is released, and the Tool is in the proper state. Override * to support pressing the enter key to create a shape or connection * (between two selected shapes) - * + * * @param event * the KeyEvent * @return <code>true</code> if KeyEvent was handled in some way @@ -463,7 +468,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /** * Override to support double-clicking a palette tool entry to create a * shape or connection (between two selected shapes). - * + * * @see MouseListener#mouseDoubleClick(MouseEvent) */ @Override diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramEditorPlugin.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramEditorPlugin.java index 311516dd76c..8156ad181ac 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramEditorPlugin.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramEditorPlugin.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -33,8 +33,8 @@ import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; /** - * @generated - */ + * @generated + */ public class UMLDiagramEditorPlugin extends AbstractUIPlugin { /** @@ -91,6 +91,7 @@ public class UMLDiagramEditorPlugin extends AbstractUIPlugin { /** * @generated */ + @Override public void start(BundleContext context) throws Exception { super.start(context); instance = this; @@ -105,6 +106,7 @@ public class UMLDiagramEditorPlugin extends AbstractUIPlugin { /** * @generated */ + @Override public void stop(BundleContext context) throws Exception { adapterFactory = null; linkConstraints = null; @@ -124,9 +126,9 @@ public class UMLDiagramEditorPlugin extends AbstractUIPlugin { /** * @generated */ + @Override public IPreferenceStore getPreferenceStore() { - IPreferenceStore store = org.eclipse.papyrus.infra.gmfdiag.preferences.Activator.getDefault() - .getPreferenceStore(); + IPreferenceStore store = org.eclipse.papyrus.infra.gmfdiag.preferences.Activator.getDefault().getPreferenceStore(); return store; } @@ -141,9 +143,11 @@ public class UMLDiagramEditorPlugin extends AbstractUIPlugin { * @generated */ public ImageDescriptor getItemImageDescriptor(Object item) { - IItemLabelProvider labelProvider = (IItemLabelProvider) adapterFactory.adapt(item, IItemLabelProvider.class); + IItemLabelProvider labelProvider = (IItemLabelProvider) adapterFactory.adapt( + item, IItemLabelProvider.class); if (labelProvider != null) { - return ExtendedImageRegistry.getInstance().getImageDescriptor(labelProvider.getImage(item)); + return ExtendedImageRegistry.getInstance().getImageDescriptor( + labelProvider.getImage(item)); } return null; } @@ -151,9 +155,10 @@ public class UMLDiagramEditorPlugin extends AbstractUIPlugin { /** * Returns an image descriptor for the image file at the given * plug-in relative path. - * + * * @generated - * @param path the path + * @param path + * the path * @return the image descriptor */ public static ImageDescriptor getBundledImageDescriptor(String path) { @@ -164,16 +169,17 @@ public class UMLDiagramEditorPlugin extends AbstractUIPlugin { * Respects images residing in any plug-in. If path is relative, * then this bundle is looked up for the image, otherwise, for absolute * path, first segment is taken as id of plug-in with image - * + * * @generated - * @param path the path to image, either absolute (with plug-in id as first segment), or relative for bundled images + * @param path + * the path to image, either absolute (with plug-in id as first segment), or relative for bundled images * @return the image descriptor */ public static ImageDescriptor findImageDescriptor(String path) { final IPath p = new Path(path); if (p.isAbsolute() && p.segmentCount() > 1) { - return AbstractUIPlugin.imageDescriptorFromPlugin(p.segment(0), - p.removeFirstSegments(1).makeAbsolute().toString()); + return AbstractUIPlugin.imageDescriptorFromPlugin( + p.segment(0), p.removeFirstSegments(1).makeAbsolute().toString()); } else { return getBundledImageDescriptor(p.makeAbsolute().toString()); } @@ -182,9 +188,10 @@ public class UMLDiagramEditorPlugin extends AbstractUIPlugin { /** * Returns an image for the image file at the given plugin relative path. * Client do not need to dispose this image. Images will be disposed automatically. - * + * * @generated - * @param path the path + * @param path + * the path * @return image instance */ public Image getBundledImage(String path) { @@ -198,11 +205,12 @@ public class UMLDiagramEditorPlugin extends AbstractUIPlugin { /** * Returns string from plug-in's resource bundle - * + * * @generated */ public static String getString(String key) { - return Platform.getResourceString(getInstance().getBundle(), "%" + key); //$NON-NLS-1$ + return Platform.getResourceString( + getInstance().getBundle(), "%" + key); //$NON-NLS-1$ } /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramEditorUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramEditorUtil.java index 25515ad8d89..b3a84f21ce5 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramEditorUtil.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramEditorUtil.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -75,7 +75,7 @@ public class UMLDiagramEditorUtil { * @generated */ public static Map<?, ?> getSaveOptions() { - HashMap<String, Object> saveOptions = new HashMap<String, Object>(); + HashMap<String, Object> saveOptions = new HashMap<>(); saveOptions.put(XMLResource.OPTION_ENCODING, "UTF-8"); //$NON-NLS-1$ saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER); return saveOptions; @@ -118,7 +118,7 @@ public class UMLDiagramEditorUtil { /** * Runs the wizard in a dialog. - * + * * @generated */ public static void runWizard(Shell shell, Wizard wizard, String settingsKey) { @@ -136,6 +136,7 @@ public class UMLDiagramEditorUtil { /** * This method should be called within a workspace modify operation since it creates resources. + * * @generated */ public static Resource createDiagram(URI diagramURI, URI modelURI, IProgressMonitor progressMonitor) { @@ -144,16 +145,15 @@ public class UMLDiagramEditorUtil { final Resource diagramResource = editingDomain.getResourceSet().createResource(diagramURI); final Resource modelResource = editingDomain.getResourceSet().createResource(modelURI); final String diagramName = diagramURI.lastSegment(); - AbstractTransactionalCommand command = new AbstractTransactionalCommand(editingDomain, - Messages.UMLDiagramEditorUtil_CreateDiagramCommandLabel, Collections.EMPTY_LIST) { + AbstractTransactionalCommand command = new AbstractTransactionalCommand(editingDomain, Messages.UMLDiagramEditorUtil_CreateDiagramCommandLabel, Collections.EMPTY_LIST) { @Override - protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) - throws ExecutionException { + protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { Package model = createInitialModel(); attachModelToResource(model, modelResource); - Diagram diagram = ViewService.createDiagram(model, ModelEditPart.MODEL_ID, - UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT); + Diagram diagram = ViewService.createDiagram( + model, + ModelEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT); if (diagram != null) { diagramResource.getContents().add(diagram); diagram.setName(diagramName); @@ -161,10 +161,8 @@ public class UMLDiagramEditorUtil { } try { - modelResource - .save(org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorUtil.getSaveOptions()); - diagramResource - .save(org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorUtil.getSaveOptions()); + modelResource.save(org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorUtil.getSaveOptions()); + diagramResource.save(org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorUtil.getSaveOptions()); } catch (IOException e) { UMLDiagramEditorPlugin.getInstance().logError("Unable to store model and diagram resources", e); //$NON-NLS-1$ @@ -173,8 +171,7 @@ public class UMLDiagramEditorUtil { } }; try { - OperationHistoryFactory.getOperationHistory().execute(command, new SubProgressMonitor(progressMonitor, 1), - null); + OperationHistoryFactory.getOperationHistory().execute(command, new SubProgressMonitor(progressMonitor, 1), null); } catch (ExecutionException e) { UMLDiagramEditorPlugin.getInstance().logError("Unable to create model and diagram", e); //$NON-NLS-1$ } @@ -184,21 +181,23 @@ public class UMLDiagramEditorUtil { } /** - * Create a new instance of domain element associated with canvas. - * <!-- begin-user-doc --> + * Create a new instance of domain element associated with canvas. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @generated - */ + * + * @generated + */ private static Package createInitialModel() { return UMLFactory.eINSTANCE.createPackage(); } /** - * Store model element in the resource. - * <!-- begin-user-doc --> + * Store model element in the resource. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @generated - */ + * + * @generated + */ private static void attachModelToResource(Package model, Resource resource) { resource.getContents().add(model); } @@ -218,8 +217,7 @@ public class UMLDiagramEditorUtil { } if (!editParts.isEmpty()) { - diagramPart.getDiagramGraphicalViewer() - .reveal(firstPrimary != null ? firstPrimary : (EditPart) editParts.get(0)); + diagramPart.getDiagramGraphicalViewer().reveal(firstPrimary != null ? firstPrimary : (EditPart) editParts.get(0)); } } @@ -276,7 +274,7 @@ public class UMLDiagramEditorUtil { } View view = null; - LinkedList<EditPart> editPartHolder = new LinkedList<EditPart>(); + LinkedList<EditPart> editPartHolder = new LinkedList<>(); if (hasStructuralURI && !lazyElement2ViewMap.getElement2ViewMap().isEmpty()) { view = lazyElement2ViewMap.getElement2ViewMap().get(targetElement); } else if (findElementsInDiagramByID(diagramEditPart, targetElement, editPartHolder) > 0) { @@ -289,6 +287,7 @@ public class UMLDiagramEditorUtil { /** * XXX This is quite suspicious code (especially editPartTmpHolder) and likely to be removed soon + * * @generated */ public static class LazyElement2ViewMap { @@ -320,7 +319,7 @@ public class UMLDiagramEditorUtil { */ public final Map<EObject, View> getElement2ViewMap() { if (element2ViewMap == null) { - element2ViewMap = new HashMap<EObject, View>(); + element2ViewMap = new HashMap<>(); // map possible notation elements to itself as these can't be found by view.getElement() for (EObject element : elementSet) { if (element instanceof View) { @@ -345,8 +344,7 @@ public class UMLDiagramEditorUtil { return true; } - if (parentView.isSetElement() && !element2ViewMap.containsKey(parentView.getElement()) - && elements.contains(parentView.getElement())) { + if (parentView.isSetElement() && !element2ViewMap.containsKey(parentView.getElement()) && elements.contains(parentView.getElement())) { element2ViewMap.put(parentView.getElement(), parentView); if (elements.size() == element2ViewMap.size()) { return true; @@ -364,6 +362,6 @@ public class UMLDiagramEditorUtil { } return complete; } - } //LazyElement2ViewMap + } // LazyElement2ViewMap } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramUpdater.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramUpdater.java index 927b048f23c..e28ad44ff75 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramUpdater.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramUpdater.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -78,19 +78,20 @@ import org.eclipse.uml2.uml.UMLPackage; import org.eclipse.uml2.uml.Usage; /** - * @generated - */ + * @generated + */ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ protected UMLDiagramUpdater() { - //to prevent instantiation allowing the override + // to prevent instantiation allowing the override } /** * @generated */ + @Override public List<UMLNodeDescriptor> getSemanticChildren(View view) { String vid = UMLVisualIDRegistry.getVisualID(view); if (vid != null) { @@ -228,8 +229,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Package modelElement = (Package) view.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getPackagedElements().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getPackagedElements() + .iterator(); it.hasNext();) { PackageableElement childElement = (PackageableElement) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (DependencyNodeEditPart.VISUAL_ID.equals(visualID)) { @@ -301,7 +303,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } } - for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) { + for (Iterator<?> it = modelElement.getOwnedComments() + .iterator(); it.hasNext();) { Comment childElement = (Comment) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (CommentEditPart.VISUAL_ID.equals(visualID)) { @@ -309,7 +312,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } } - for (Iterator<?> it = modelElement.getOwnedMembers().iterator(); it.hasNext();) { + for (Iterator<?> it = modelElement.getOwnedMembers() + .iterator(); it.hasNext();) { NamedElement childElement = (NamedElement) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (DefaultNamedElementEditPart.VISUAL_ID.equals(visualID)) { @@ -339,7 +343,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Component modelElement = (Component) view.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); { TemplateSignature childElement = modelElement.getOwnedTemplateSignature(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); @@ -358,7 +362,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Signal modelElement = (Signal) view.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); { TemplateSignature childElement = modelElement.getOwnedTemplateSignature(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); @@ -377,7 +381,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Interface modelElement = (Interface) view.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); { TemplateSignature childElement = modelElement.getOwnedTemplateSignature(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); @@ -396,7 +400,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Model modelElement = (Model) view.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); { TemplateSignature childElement = modelElement.getOwnedTemplateSignature(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); @@ -418,7 +422,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Enumeration modelElement = (Enumeration) view.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); { TemplateSignature childElement = modelElement.getOwnedTemplateSignature(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); @@ -437,7 +441,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Package modelElement = (Package) view.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); { TemplateSignature childElement = modelElement.getOwnedTemplateSignature(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); @@ -459,7 +463,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Class modelElement = (Class) view.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); { TemplateSignature childElement = modelElement.getOwnedTemplateSignature(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); @@ -478,7 +482,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } PrimitiveType modelElement = (PrimitiveType) view.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); { TemplateSignature childElement = modelElement.getOwnedTemplateSignature(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); @@ -497,7 +501,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } DataType modelElement = (DataType) view.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); { TemplateSignature childElement = modelElement.getOwnedTemplateSignature(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); @@ -516,7 +520,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Component modelElement = (Component) view.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); { TemplateSignature childElement = modelElement.getOwnedTemplateSignature(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); @@ -535,7 +539,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Signal modelElement = (Signal) view.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); { TemplateSignature childElement = modelElement.getOwnedTemplateSignature(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); @@ -554,7 +558,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Interface modelElement = (Interface) view.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); { TemplateSignature childElement = modelElement.getOwnedTemplateSignature(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); @@ -573,7 +577,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Model modelElement = (Model) view.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); { TemplateSignature childElement = modelElement.getOwnedTemplateSignature(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); @@ -595,7 +599,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Enumeration modelElement = (Enumeration) view.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); { TemplateSignature childElement = modelElement.getOwnedTemplateSignature(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); @@ -614,7 +618,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Package modelElement = (Package) view.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); { TemplateSignature childElement = modelElement.getOwnedTemplateSignature(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); @@ -636,7 +640,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Class modelElement = (Class) view.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); { TemplateSignature childElement = modelElement.getOwnedTemplateSignature(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); @@ -655,7 +659,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } PrimitiveType modelElement = (PrimitiveType) view.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); { TemplateSignature childElement = modelElement.getOwnedTemplateSignature(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); @@ -674,7 +678,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } DataType modelElement = (DataType) view.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); { TemplateSignature childElement = modelElement.getOwnedTemplateSignature(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); @@ -697,8 +701,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Class modelElement = (Class) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getOwnedAttributes() + .iterator(); it.hasNext();) { Property childElement = (Property) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (PropertyForClassEditPart.VISUAL_ID.equals(visualID)) { @@ -721,8 +726,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Class modelElement = (Class) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getOwnedReceptions().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getOwnedReceptions() + .iterator(); it.hasNext();) { Reception childElement = (Reception) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (ReceptionEditPart.VISUAL_ID.equals(visualID)) { @@ -730,7 +736,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } } - for (Iterator<?> it = modelElement.getOwnedOperations().iterator(); it.hasNext();) { + for (Iterator<?> it = modelElement.getOwnedOperations() + .iterator(); it.hasNext();) { Operation childElement = (Operation) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (OperationForClassEditPart.VISUAL_ID.equals(visualID)) { @@ -753,8 +760,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Class modelElement = (Class) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getNestedClassifiers() + .iterator(); it.hasNext();) { Classifier childElement = (Classifier) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (NestedClassForClassEditPart.VISUAL_ID.equals(visualID)) { @@ -801,8 +809,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Component modelElement = (Component) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getOwnedAttributes() + .iterator(); it.hasNext();) { Property childElement = (Property) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (PropertyForComponentEditPart.VISUAL_ID.equals(visualID)) { @@ -825,8 +834,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Component modelElement = (Component) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getOwnedOperations().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getOwnedOperations() + .iterator(); it.hasNext();) { Operation childElement = (Operation) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (OperationForComponentEditPart.VISUAL_ID.equals(visualID)) { @@ -834,7 +844,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } } - for (Iterator<?> it = modelElement.getOwnedReceptions().iterator(); it.hasNext();) { + for (Iterator<?> it = modelElement.getOwnedReceptions() + .iterator(); it.hasNext();) { Reception childElement = (Reception) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (ReceptionEditPart.VISUAL_ID.equals(visualID)) { @@ -857,8 +868,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Component modelElement = (Component) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getNestedClassifiers() + .iterator(); it.hasNext();) { Classifier childElement = (Classifier) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (NestedClassForComponentEditPart.VISUAL_ID.equals(visualID)) { @@ -905,8 +917,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Signal modelElement = (Signal) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getOwnedAttributes() + .iterator(); it.hasNext();) { Property childElement = (Property) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (PropertyForSignalEditPart.VISUAL_ID.equals(visualID)) { @@ -929,8 +942,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Interface modelElement = (Interface) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getOwnedAttributes() + .iterator(); it.hasNext();) { Property childElement = (Property) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (PropertyForInterfaceEditPart.VISUAL_ID.equals(visualID)) { @@ -953,8 +967,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Interface modelElement = (Interface) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getOwnedOperations().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getOwnedOperations() + .iterator(); it.hasNext();) { Operation childElement = (Operation) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (OperationForInterfaceEditpart.VISUAL_ID.equals(visualID)) { @@ -962,7 +977,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } } - for (Iterator<?> it = modelElement.getOwnedReceptions().iterator(); it.hasNext();) { + for (Iterator<?> it = modelElement.getOwnedReceptions() + .iterator(); it.hasNext();) { Reception childElement = (Reception) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (ReceptionInInterfaceEditPart.VISUAL_ID.equals(visualID)) { @@ -985,8 +1001,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Interface modelElement = (Interface) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getNestedClassifiers() + .iterator(); it.hasNext();) { Classifier childElement = (Classifier) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (NestedClassForInterfaceEditPart.VISUAL_ID.equals(visualID)) { @@ -1014,7 +1031,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } } - for (Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) { + for (Iterator<?> it = modelElement.getNestedClassifiers() + .iterator(); it.hasNext();) { Classifier childElement = (Classifier) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (NestedComponentForInterfaceEditPart.VISUAL_ID.equals(visualID)) { @@ -1037,8 +1055,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } PrimitiveType modelElement = (PrimitiveType) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getOwnedAttributes() + .iterator(); it.hasNext();) { Property childElement = (Property) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (PropertyforPrimitiveTypeEditPart.VISUAL_ID.equals(visualID)) { @@ -1061,8 +1080,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } PrimitiveType modelElement = (PrimitiveType) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getOwnedOperations().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getOwnedOperations() + .iterator(); it.hasNext();) { Operation childElement = (Operation) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (OperationForPrimitiveTypeEditPart.VISUAL_ID.equals(visualID)) { @@ -1085,8 +1105,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } DataType modelElement = (DataType) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getOwnedAttributes() + .iterator(); it.hasNext();) { Property childElement = (Property) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (PropertyforDataTypeEditPart.VISUAL_ID.equals(visualID)) { @@ -1109,8 +1130,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } DataType modelElement = (DataType) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getOwnedOperations().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getOwnedOperations() + .iterator(); it.hasNext();) { Operation childElement = (Operation) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (OperationForDataTypeEditPart.VISUAL_ID.equals(visualID)) { @@ -1133,8 +1155,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Model modelElement = (Model) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getPackagedElements().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getPackagedElements() + .iterator(); it.hasNext();) { PackageableElement childElement = (PackageableElement) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (InstanceSpecificationEditPartCN.VISUAL_ID.equals(visualID)) { @@ -1186,7 +1209,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } } - for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) { + for (Iterator<?> it = modelElement.getOwnedComments() + .iterator(); it.hasNext();) { Comment childElement = (Comment) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (CommentEditPartCN.VISUAL_ID.equals(visualID)) { @@ -1209,8 +1233,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Package modelElement = (Package) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getPackagedElements().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getPackagedElements() + .iterator(); it.hasNext();) { PackageableElement childElement = (PackageableElement) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (InstanceSpecificationEditPartCN.VISUAL_ID.equals(visualID)) { @@ -1262,7 +1287,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } } - for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) { + for (Iterator<?> it = modelElement.getOwnedComments() + .iterator(); it.hasNext();) { Comment childElement = (Comment) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (CommentEditPartCN.VISUAL_ID.equals(visualID)) { @@ -1285,8 +1311,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Enumeration modelElement = (Enumeration) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getOwnedLiterals().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getOwnedLiterals() + .iterator(); it.hasNext();) { EnumerationLiteral childElement = (EnumerationLiteral) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (EnumerationLiteralEditPart.VISUAL_ID.equals(visualID)) { @@ -1309,8 +1336,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } InstanceSpecification modelElement = (InstanceSpecification) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getSlots().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getSlots() + .iterator(); it.hasNext();) { Slot childElement = (Slot) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (SlotEditPart.VISUAL_ID.equals(visualID)) { @@ -1333,8 +1361,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Class modelElement = (Class) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getOwnedAttributes() + .iterator(); it.hasNext();) { Property childElement = (Property) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (PropertyForClassEditPart.VISUAL_ID.equals(visualID)) { @@ -1357,8 +1386,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Class modelElement = (Class) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getOwnedReceptions().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getOwnedReceptions() + .iterator(); it.hasNext();) { Reception childElement = (Reception) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (ReceptionEditPart.VISUAL_ID.equals(visualID)) { @@ -1366,7 +1396,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } } - for (Iterator<?> it = modelElement.getOwnedOperations().iterator(); it.hasNext();) { + for (Iterator<?> it = modelElement.getOwnedOperations() + .iterator(); it.hasNext();) { Operation childElement = (Operation) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (OperationForClassEditPart.VISUAL_ID.equals(visualID)) { @@ -1389,8 +1420,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Class modelElement = (Class) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getNestedClassifiers() + .iterator(); it.hasNext();) { Classifier childElement = (Classifier) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (NestedClassForClassEditPart.VISUAL_ID.equals(visualID)) { @@ -1437,8 +1469,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Component modelElement = (Component) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getOwnedAttributes() + .iterator(); it.hasNext();) { Property childElement = (Property) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (PropertyForComponentEditPart.VISUAL_ID.equals(visualID)) { @@ -1461,8 +1494,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Component modelElement = (Component) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getOwnedOperations().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getOwnedOperations() + .iterator(); it.hasNext();) { Operation childElement = (Operation) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (OperationForComponentEditPart.VISUAL_ID.equals(visualID)) { @@ -1470,7 +1504,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } } - for (Iterator<?> it = modelElement.getOwnedReceptions().iterator(); it.hasNext();) { + for (Iterator<?> it = modelElement.getOwnedReceptions() + .iterator(); it.hasNext();) { Reception childElement = (Reception) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (ReceptionEditPart.VISUAL_ID.equals(visualID)) { @@ -1493,8 +1528,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Component modelElement = (Component) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getNestedClassifiers() + .iterator(); it.hasNext();) { Classifier childElement = (Classifier) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (NestedClassForComponentEditPart.VISUAL_ID.equals(visualID)) { @@ -1541,8 +1577,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Interface modelElement = (Interface) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getOwnedAttributes() + .iterator(); it.hasNext();) { Property childElement = (Property) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (PropertyForInterfaceEditPart.VISUAL_ID.equals(visualID)) { @@ -1565,8 +1602,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Interface modelElement = (Interface) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getOwnedOperations().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getOwnedOperations() + .iterator(); it.hasNext();) { Operation childElement = (Operation) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (OperationForInterfaceEditpart.VISUAL_ID.equals(visualID)) { @@ -1574,7 +1612,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } } - for (Iterator<?> it = modelElement.getOwnedReceptions().iterator(); it.hasNext();) { + for (Iterator<?> it = modelElement.getOwnedReceptions() + .iterator(); it.hasNext();) { Reception childElement = (Reception) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (ReceptionInInterfaceEditPart.VISUAL_ID.equals(visualID)) { @@ -1597,8 +1636,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Interface modelElement = (Interface) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getNestedClassifiers() + .iterator(); it.hasNext();) { Classifier childElement = (Classifier) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (NestedClassForInterfaceEditPart.VISUAL_ID.equals(visualID)) { @@ -1626,7 +1666,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } } - for (Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) { + for (Iterator<?> it = modelElement.getNestedClassifiers() + .iterator(); it.hasNext();) { Classifier childElement = (Classifier) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (NestedComponentForInterfaceEditPart.VISUAL_ID.equals(visualID)) { @@ -1649,8 +1690,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } PrimitiveType modelElement = (PrimitiveType) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getOwnedAttributes() + .iterator(); it.hasNext();) { Property childElement = (Property) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (PropertyforPrimitiveTypeEditPart.VISUAL_ID.equals(visualID)) { @@ -1673,8 +1715,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } PrimitiveType modelElement = (PrimitiveType) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getOwnedOperations().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getOwnedOperations() + .iterator(); it.hasNext();) { Operation childElement = (Operation) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (OperationForPrimitiveTypeEditPart.VISUAL_ID.equals(visualID)) { @@ -1697,8 +1740,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } DataType modelElement = (DataType) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getOwnedAttributes() + .iterator(); it.hasNext();) { Property childElement = (Property) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (PropertyforDataTypeEditPart.VISUAL_ID.equals(visualID)) { @@ -1721,8 +1765,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } DataType modelElement = (DataType) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getOwnedOperations().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getOwnedOperations() + .iterator(); it.hasNext();) { Operation childElement = (Operation) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (OperationForDataTypeEditPart.VISUAL_ID.equals(visualID)) { @@ -1745,8 +1790,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } AssociationClass modelElement = (AssociationClass) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getOwnedAttributes() + .iterator(); it.hasNext();) { Property childElement = (Property) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (PropertyForComponentEditPart.VISUAL_ID.equals(visualID)) { @@ -1769,8 +1815,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } InstanceSpecification modelElement = (InstanceSpecification) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getSlots().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getSlots() + .iterator(); it.hasNext();) { Slot childElement = (Slot) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (SlotEditPart.VISUAL_ID.equals(visualID)) { @@ -1793,8 +1840,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Signal modelElement = (Signal) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getOwnedAttributes() + .iterator(); it.hasNext();) { Property childElement = (Property) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (PropertyForSignalEditPart.VISUAL_ID.equals(visualID)) { @@ -1817,8 +1865,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Model modelElement = (Model) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getPackagedElements().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getPackagedElements() + .iterator(); it.hasNext();) { PackageableElement childElement = (PackageableElement) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (InstanceSpecificationEditPartCN.VISUAL_ID.equals(visualID)) { @@ -1870,7 +1919,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } } - for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) { + for (Iterator<?> it = modelElement.getOwnedComments() + .iterator(); it.hasNext();) { Comment childElement = (Comment) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (CommentEditPartCN.VISUAL_ID.equals(visualID)) { @@ -1893,8 +1943,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Package modelElement = (Package) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getPackagedElements().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getPackagedElements() + .iterator(); it.hasNext();) { PackageableElement childElement = (PackageableElement) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (InstanceSpecificationEditPartCN.VISUAL_ID.equals(visualID)) { @@ -1946,7 +1997,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } } - for (Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) { + for (Iterator<?> it = modelElement.getOwnedComments() + .iterator(); it.hasNext();) { Comment childElement = (Comment) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (CommentEditPartCN.VISUAL_ID.equals(visualID)) { @@ -1969,8 +2021,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } Enumeration modelElement = (Enumeration) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getOwnedLiterals().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getOwnedLiterals() + .iterator(); it.hasNext();) { EnumerationLiteral childElement = (EnumerationLiteral) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (EnumerationLiteralEditPart.VISUAL_ID.equals(visualID)) { @@ -1993,8 +2046,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } AssociationClass modelElement = (AssociationClass) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getOwnedOperations().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getOwnedOperations() + .iterator(); it.hasNext();) { Operation childElement = (Operation) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (OperationForComponentEditPart.VISUAL_ID.equals(visualID)) { @@ -2017,8 +2071,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } AssociationClass modelElement = (AssociationClass) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getNestedClassifiers() + .iterator(); it.hasNext();) { Classifier childElement = (Classifier) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (NestedClassForComponentEditPart.VISUAL_ID.equals(visualID)) { @@ -2042,8 +2097,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } RedefinableTemplateSignature modelElement = (RedefinableTemplateSignature) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getParameters().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getParameters() + .iterator(); it.hasNext();) { TemplateParameter childElement = (TemplateParameter) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (ClassifierTemplateParameterEditPart.VISUAL_ID.equals(visualID)) { @@ -2078,8 +2134,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { return Collections.emptyList(); } TemplateSignature modelElement = (TemplateSignature) containerView.getElement(); - LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>(); - for (Iterator<?> it = modelElement.getParameters().iterator(); it.hasNext();) { + LinkedList<UMLNodeDescriptor> result = new LinkedList<>(); + for (Iterator<?> it = modelElement.getParameters() + .iterator(); it.hasNext();) { TemplateParameter childElement = (TemplateParameter) it.next(); String visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement); if (ClassifierTemplateParameterEditPart.VISUAL_ID.equals(visualID)) { @@ -2108,6 +2165,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ + @Override public List<UMLLinkDescriptor> getContainedLinks(View view) { String vid = UMLVisualIDRegistry.getVisualID(view); if (vid != null) { @@ -2310,6 +2368,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ + @Override public List<UMLLinkDescriptor> getIncomingLinks(View view) { String vid = UMLVisualIDRegistry.getVisualID(view); if (vid != null) { @@ -2510,6 +2569,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { /** * @generated */ + @Override public List<UMLLinkDescriptor> getOutgoingLinks(View view) { String vid = UMLVisualIDRegistry.getVisualID(view); if (vid != null) { @@ -2712,7 +2772,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getPackage_ClassDiagram_ContainedLinks(View view) { Package modelElement = (Package) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_AssociationClass_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Association_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Association_BranchEdge(modelElement)); @@ -2744,7 +2804,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getAssociationClass_Shape_ContainedLinks(View view) { AssociationClass modelElement = (AssociationClass) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); @@ -2759,7 +2819,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getAssociation_Shape_ContainedLinks(View view) { Association modelElement = (Association) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); @@ -2780,7 +2840,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getComponent_Shape_ContainedLinks(View view) { Component modelElement = (Component) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); @@ -2795,7 +2855,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getSignal_Shape_ContainedLinks(View view) { Signal modelElement = (Signal) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); @@ -2809,7 +2869,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getInterface_Shape_ContainedLinks(View view) { Interface modelElement = (Interface) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); @@ -2823,7 +2883,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getModel_Shape_ContainedLinks(View view) { Model modelElement = (Model) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_AssociationClass_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Association_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Association_BranchEdge(modelElement)); @@ -2848,7 +2908,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getEnumeration_Shape_ContainedLinks(View view) { Enumeration modelElement = (Enumeration) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); @@ -2862,7 +2922,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getPackage_Shape_ContainedLinks(View view) { Package modelElement = (Package) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_AssociationClass_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Association_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Association_BranchEdge(modelElement)); @@ -2887,7 +2947,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getInformationItem_Shape_ContainedLinks(View view) { InformationItem modelElement = (InformationItem) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); @@ -2901,7 +2961,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getClass_Shape_ContainedLinks(View view) { Class modelElement = (Class) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); @@ -2916,7 +2976,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getPrimitiveType_Shape_ContainedLinks(View view) { PrimitiveType modelElement = (PrimitiveType) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); @@ -2930,7 +2990,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getDataType_Shape_ContainedLinks(View view) { DataType modelElement = (DataType) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); @@ -2944,7 +3004,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getConstraint_PackagedElementShape_ContainedLinks(View view) { Constraint modelElement = (Constraint) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement)); result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ContextEdge(modelElement)); return result; @@ -2955,7 +3015,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getComment_Shape_ContainedLinks(View view) { Comment modelElement = (Comment) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement)); return result; } @@ -2972,7 +3032,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getDurationObservation_Shape_ContainedLinks(View view) { DurationObservation modelElement = (DurationObservation) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement)); return result; } @@ -2982,7 +3042,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getTimeObservation_Shape_ContainedLinks(View view) { TimeObservation modelElement = (TimeObservation) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement)); return result; } @@ -3041,7 +3101,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getClass_ClassNestedClassifierLabel_ContainedLinks(View view) { Class modelElement = (Class) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); @@ -3056,7 +3116,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getClass_ComponentNestedClassifierLabel_ContainedLinks(View view) { Class modelElement = (Class) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); @@ -3071,7 +3131,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getClass_InterfaceNestedClassifierLabel_ContainedLinks(View view) { Class modelElement = (Class) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); @@ -3086,7 +3146,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getOperation_ClassOperationLabel_ContainedLinks(View view) { Operation modelElement = (Operation) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_PackageImport_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_Edge(modelElement)); @@ -3098,7 +3158,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getOperation_ComponentOperationLabel_ContainedLinks(View view) { Operation modelElement = (Operation) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_PackageImport_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_Edge(modelElement)); @@ -3110,7 +3170,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getOperation_InterfaceOperationLabel_ContainedLinks(View view) { Operation modelElement = (Operation) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_PackageImport_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_Edge(modelElement)); @@ -3122,7 +3182,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getOperation_PrimitiveTypeOperationLabel_ContainedLinks(View view) { Operation modelElement = (Operation) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_PackageImport_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_Edge(modelElement)); @@ -3134,7 +3194,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getOperation_DataTypeOperationLabel_ContainedLinks(View view) { Operation modelElement = (Operation) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_PackageImport_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_TemplateBinding_Edge(modelElement)); @@ -3182,7 +3242,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getReception_ReceptionLabel_ContainedLinks(View view) { Reception modelElement = (Reception) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; @@ -3193,7 +3253,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getReception_InterfaceReceptionLabel_ContainedLinks(View view) { Reception modelElement = (Reception) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_PackageImport_Edge(modelElement)); return result; @@ -3232,7 +3292,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getComponent_Shape_CN_ContainedLinks(View view) { Component modelElement = (Component) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); @@ -3247,7 +3307,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getSignal_Shape_CN_ContainedLinks(View view) { Signal modelElement = (Signal) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); @@ -3261,7 +3321,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getInterface_Shape_CN_ContainedLinks(View view) { Interface modelElement = (Interface) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); @@ -3275,7 +3335,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getModel_Shape_CN_ContainedLinks(View view) { Model modelElement = (Model) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_AssociationClass_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Association_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Association_BranchEdge(modelElement)); @@ -3300,7 +3360,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getEnumeration_Shape_CN_ContainedLinks(View view) { Enumeration modelElement = (Enumeration) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); @@ -3314,7 +3374,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getPackage_Shape_CN_ContainedLinks(View view) { Package modelElement = (Package) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_AssociationClass_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Association_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Association_BranchEdge(modelElement)); @@ -3339,7 +3399,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getInformationItem_Shape_CN_ContainedLinks(View view) { InformationItem modelElement = (InformationItem) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); @@ -3353,7 +3413,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getClass_Shape_CN_ContainedLinks(View view) { Class modelElement = (Class) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); @@ -3368,7 +3428,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getPrimitiveType_Shape_CN_ContainedLinks(View view) { PrimitiveType modelElement = (PrimitiveType) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); @@ -3382,7 +3442,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getDataType_Shape_CN_ContainedLinks(View view) { DataType modelElement = (DataType) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); @@ -3396,7 +3456,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getComment_Shape_CN_ContainedLinks(View view) { Comment modelElement = (Comment) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement)); return result; } @@ -3406,7 +3466,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getConstraint_PackagedElementShape_CN_ContainedLinks(View view) { Constraint modelElement = (Constraint) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement)); result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ContextEdge(modelElement)); return result; @@ -3417,7 +3477,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getInterface_ClassNestedClassifierLabel_ContainedLinks(View view) { Interface modelElement = (Interface) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); @@ -3431,7 +3491,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getInterface_ComponentNestedClassifierLabel_ContainedLinks(View view) { Interface modelElement = (Interface) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); @@ -3445,7 +3505,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getInterface_InterfaceNestedClassifierLabel_ContainedLinks(View view) { Interface modelElement = (Interface) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); @@ -3459,7 +3519,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getEnumeration_ClassNestedClassifierLabel_ContainedLinks(View view) { Enumeration modelElement = (Enumeration) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); @@ -3473,7 +3533,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getEnumeration_ComponentNestedClassifierLabel_ContainedLinks(View view) { Enumeration modelElement = (Enumeration) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); @@ -3487,7 +3547,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getEnumeration_InterfaceNestedClassifierLabel_ContainedLinks(View view) { Enumeration modelElement = (Enumeration) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); @@ -3501,7 +3561,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getPrimitiveType_ClassNestedClassifierLabel_ContainedLinks(View view) { PrimitiveType modelElement = (PrimitiveType) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); @@ -3515,7 +3575,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getPrimitiveType_ComponentNestedClassifierLabel_ContainedLinks(View view) { PrimitiveType modelElement = (PrimitiveType) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); @@ -3529,7 +3589,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getPrimitiveType_InterfaceNestedClassifierLabel_ContainedLinks(View view) { PrimitiveType modelElement = (PrimitiveType) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); @@ -3543,7 +3603,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getDataType_ClassNestedClassifierLabel_ContainedLinks(View view) { DataType modelElement = (DataType) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); @@ -3557,7 +3617,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getDataType_ComponentNestedClassifierLabel_ContainedLinks(View view) { DataType modelElement = (DataType) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); @@ -3571,7 +3631,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getDataType_InterfaceNestedClassifierLabel_ContainedLinks(View view) { DataType modelElement = (DataType) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); @@ -3585,7 +3645,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getSignal_ClassNestedClassifierLabel_ContainedLinks(View view) { Signal modelElement = (Signal) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); @@ -3599,7 +3659,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getSignal_ComponentNestedClassifierLabel_ContainedLinks(View view) { Signal modelElement = (Signal) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); @@ -3613,7 +3673,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getSignal_InterfaceNestedClassifierLabel_ContainedLinks(View view) { Signal modelElement = (Signal) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); @@ -3627,7 +3687,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getComponent_ClassNestedClassifierLabel_ContainedLinks(View view) { Component modelElement = (Component) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); @@ -3642,7 +3702,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getComponent_InterfaceNestedClassifierLabel_ContainedLinks(View view) { Component modelElement = (Component) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); @@ -3657,7 +3717,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getComponent_ComponentNestedClassifierLabel_ContainedLinks(View view) { Component modelElement = (Component) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); @@ -3672,7 +3732,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getAssociationClass_Edge_ContainedLinks(View view) { AssociationClass modelElement = (AssociationClass) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); @@ -3687,7 +3747,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getAssociation_Edge_ContainedLinks(View view) { Association modelElement = (Association) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); @@ -3701,7 +3761,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getAssociation_BranchEdge_ContainedLinks(View view) { Association modelElement = (Association) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getContainedTypeModelFacetLinks_Generalization_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_Substitution_Edge(modelElement)); result.addAll(getContainedTypeModelFacetLinks_ElementImport_Edge(modelElement)); @@ -3827,9 +3887,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getDependency_Shape_IncomingLinks(View view) { Dependency modelElement = (Dependency) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_Realization_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer)); @@ -3837,8 +3896,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_Edge(modelElement, crossReferencer)); @@ -3850,9 +3908,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getAssociationClass_Shape_IncomingLinks(View view) { AssociationClass modelElement = (AssociationClass) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_BranchEdge(modelElement, crossReferencer)); @@ -3865,8 +3922,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); @@ -3880,9 +3936,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getAssociation_Shape_IncomingLinks(View view) { Association modelElement = (Association) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_BranchEdge(modelElement, crossReferencer)); @@ -3895,8 +3950,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); @@ -3910,9 +3964,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getInstanceSpecification_Shape_IncomingLinks(View view) { InstanceSpecification modelElement = (InstanceSpecification) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_Realization_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer)); @@ -3920,8 +3973,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_Edge(modelElement, crossReferencer)); @@ -3933,9 +3985,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getComponent_Shape_IncomingLinks(View view) { Component modelElement = (Component) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_BranchEdge(modelElement, crossReferencer)); @@ -3948,8 +3999,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); @@ -3963,9 +4013,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getSignal_Shape_IncomingLinks(View view) { Signal modelElement = (Signal) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_BranchEdge(modelElement, crossReferencer)); @@ -3978,8 +4027,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); @@ -3993,9 +4041,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getInterface_Shape_IncomingLinks(View view) { Interface modelElement = (Interface) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_BranchEdge(modelElement, crossReferencer)); @@ -4009,8 +4056,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); @@ -4024,9 +4070,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getModel_Shape_IncomingLinks(View view) { Model modelElement = (Model) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_Realization_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer)); @@ -4036,8 +4081,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_PackageImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_PackageMerge_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); @@ -4051,9 +4095,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getEnumeration_Shape_IncomingLinks(View view) { Enumeration modelElement = (Enumeration) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_BranchEdge(modelElement, crossReferencer)); @@ -4066,8 +4109,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); @@ -4081,9 +4123,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getPackage_Shape_IncomingLinks(View view) { Package modelElement = (Package) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_Realization_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer)); @@ -4093,8 +4134,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_PackageImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_PackageMerge_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); @@ -4108,9 +4148,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getInformationItem_Shape_IncomingLinks(View view) { InformationItem modelElement = (InformationItem) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_BranchEdge(modelElement, crossReferencer)); @@ -4123,8 +4162,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); @@ -4138,9 +4176,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getClass_Shape_IncomingLinks(View view) { Class modelElement = (Class) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_BranchEdge(modelElement, crossReferencer)); @@ -4153,8 +4190,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); @@ -4168,9 +4204,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getPrimitiveType_Shape_IncomingLinks(View view) { PrimitiveType modelElement = (PrimitiveType) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_BranchEdge(modelElement, crossReferencer)); @@ -4183,8 +4218,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); @@ -4198,9 +4232,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getDataType_Shape_IncomingLinks(View view) { DataType modelElement = (DataType) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_BranchEdge(modelElement, crossReferencer)); @@ -4213,8 +4246,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); @@ -4228,9 +4260,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getConstraint_PackagedElementShape_IncomingLinks(View view) { Constraint modelElement = (Constraint) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_Realization_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer)); @@ -4238,8 +4269,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_Edge(modelElement, crossReferencer)); @@ -4251,12 +4281,10 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getComment_Shape_IncomingLinks(View view) { Comment modelElement = (Comment) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); return result; } @@ -4272,9 +4300,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getDurationObservation_Shape_IncomingLinks(View view) { DurationObservation modelElement = (DurationObservation) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_Realization_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer)); @@ -4282,8 +4309,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_Edge(modelElement, crossReferencer)); @@ -4295,9 +4321,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getTimeObservation_Shape_IncomingLinks(View view) { TimeObservation modelElement = (TimeObservation) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_Realization_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer)); @@ -4305,8 +4330,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_Edge(modelElement, crossReferencer)); @@ -4318,17 +4342,15 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getNamedElement_DefaultShape_IncomingLinks(View view) { NamedElement modelElement = (NamedElement) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_Realization_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_Edge(modelElement, crossReferencer)); @@ -4495,17 +4517,15 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getRedefinableTemplateSignature_Shape_IncomingLinks(View view) { RedefinableTemplateSignature modelElement = (RedefinableTemplateSignature) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_Realization_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Dependency_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_Edge(modelElement, crossReferencer)); @@ -4517,12 +4537,10 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getTemplateSignature_Shape_IncomingLinks(View view) { TemplateSignature modelElement = (TemplateSignature) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); return result; } @@ -4531,9 +4549,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getInstanceSpecification_Shape_CN_IncomingLinks(View view) { InstanceSpecification modelElement = (InstanceSpecification) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_Realization_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer)); @@ -4541,8 +4558,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_Edge(modelElement, crossReferencer)); @@ -4554,9 +4570,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getComponent_Shape_CN_IncomingLinks(View view) { Component modelElement = (Component) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_BranchEdge(modelElement, crossReferencer)); @@ -4569,8 +4584,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); @@ -4584,9 +4598,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getSignal_Shape_CN_IncomingLinks(View view) { Signal modelElement = (Signal) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_BranchEdge(modelElement, crossReferencer)); @@ -4599,8 +4612,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); @@ -4614,9 +4626,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getInterface_Shape_CN_IncomingLinks(View view) { Interface modelElement = (Interface) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_BranchEdge(modelElement, crossReferencer)); @@ -4630,8 +4641,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); @@ -4645,9 +4655,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getModel_Shape_CN_IncomingLinks(View view) { Model modelElement = (Model) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_Realization_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer)); @@ -4657,8 +4666,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_PackageImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_PackageMerge_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); @@ -4672,9 +4680,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getEnumeration_Shape_CN_IncomingLinks(View view) { Enumeration modelElement = (Enumeration) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_BranchEdge(modelElement, crossReferencer)); @@ -4687,8 +4694,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); @@ -4702,9 +4708,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getPackage_Shape_CN_IncomingLinks(View view) { Package modelElement = (Package) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_Realization_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer)); @@ -4714,8 +4719,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_PackageImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_PackageMerge_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); @@ -4729,9 +4733,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getInformationItem_Shape_CN_IncomingLinks(View view) { InformationItem modelElement = (InformationItem) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_BranchEdge(modelElement, crossReferencer)); @@ -4744,8 +4747,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); @@ -4759,9 +4761,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getClass_Shape_CN_IncomingLinks(View view) { Class modelElement = (Class) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_BranchEdge(modelElement, crossReferencer)); @@ -4774,8 +4775,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); @@ -4789,9 +4789,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getPrimitiveType_Shape_CN_IncomingLinks(View view) { PrimitiveType modelElement = (PrimitiveType) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_BranchEdge(modelElement, crossReferencer)); @@ -4804,8 +4803,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); @@ -4819,9 +4817,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getDataType_Shape_CN_IncomingLinks(View view) { DataType modelElement = (DataType) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_BranchEdge(modelElement, crossReferencer)); @@ -4834,8 +4831,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); @@ -4849,12 +4845,10 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getComment_Shape_CN_IncomingLinks(View view) { Comment modelElement = (Comment) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); return result; } @@ -4863,9 +4857,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getConstraint_PackagedElementShape_CN_IncomingLinks(View view) { Constraint modelElement = (Constraint) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_Realization_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer)); @@ -4873,8 +4866,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_Edge(modelElement, crossReferencer)); @@ -5012,9 +5004,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getAssociationClass_Edge_IncomingLinks(View view) { AssociationClass modelElement = (AssociationClass) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_BranchEdge(modelElement, crossReferencer)); @@ -5027,8 +5018,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); @@ -5042,9 +5032,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getAssociation_Edge_IncomingLinks(View view) { Association modelElement = (Association) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_BranchEdge(modelElement, crossReferencer)); @@ -5057,8 +5046,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); @@ -5072,9 +5060,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getAssociation_BranchEdge_IncomingLinks(View view) { Association modelElement = (Association) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_AssociationClass_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Association_BranchEdge(modelElement, crossReferencer)); @@ -5087,8 +5074,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_TemplateBinding_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); @@ -5102,12 +5088,10 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getGeneralization_Edge_IncomingLinks(View view) { Generalization modelElement = (Generalization) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_GeneralizationSet_Edge(modelElement, crossReferencer)); return result; } @@ -5117,9 +5101,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getInterfaceRealization_Edge_IncomingLinks(View view) { InterfaceRealization modelElement = (InterfaceRealization) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_Realization_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer)); @@ -5127,8 +5110,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_Edge(modelElement, crossReferencer)); @@ -5140,9 +5122,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getSubstitution_Edge_IncomingLinks(View view) { Substitution modelElement = (Substitution) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_Realization_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer)); @@ -5150,8 +5131,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_Edge(modelElement, crossReferencer)); @@ -5163,9 +5143,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getRealization_Edge_IncomingLinks(View view) { Realization modelElement = (Realization) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_Realization_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer)); @@ -5173,8 +5152,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_Edge(modelElement, crossReferencer)); @@ -5186,9 +5164,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getAbstraction_Edge_IncomingLinks(View view) { Abstraction modelElement = (Abstraction) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_Realization_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer)); @@ -5196,8 +5173,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_Edge(modelElement, crossReferencer)); @@ -5209,9 +5185,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getUsage_Edge_IncomingLinks(View view) { Usage modelElement = (Usage) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_Realization_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer)); @@ -5219,8 +5194,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_Edge(modelElement, crossReferencer)); @@ -5232,9 +5206,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getDependency_Edge_IncomingLinks(View view) { Dependency modelElement = (Dependency) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_Realization_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer)); @@ -5242,8 +5215,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_Edge(modelElement, crossReferencer)); @@ -5255,9 +5227,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getDependency_BranchEdge_IncomingLinks(View view) { Dependency modelElement = (Dependency) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_Realization_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer)); @@ -5265,8 +5236,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_Edge(modelElement, crossReferencer)); @@ -5278,12 +5248,10 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getElementImport_Edge_IncomingLinks(View view) { ElementImport modelElement = (ElementImport) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); return result; } @@ -5292,12 +5260,10 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getPackageImport_Edge_IncomingLinks(View view) { PackageImport modelElement = (PackageImport) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); return result; } @@ -5306,12 +5272,10 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getPackageMerge_Edge_IncomingLinks(View view) { PackageMerge modelElement = (PackageMerge) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); return result; } @@ -5320,12 +5284,10 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getProfileApplication_Edge_IncomingLinks(View view) { ProfileApplication modelElement = (ProfileApplication) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); return result; } @@ -5334,12 +5296,10 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getTemplateBinding_Edge_IncomingLinks(View view) { TemplateBinding modelElement = (TemplateBinding) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); return result; } @@ -5348,9 +5308,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getGeneralizationSet_Edge_IncomingLinks(View view) { GeneralizationSet modelElement = (GeneralizationSet) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_Realization_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer)); @@ -5358,8 +5317,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_Edge(modelElement, crossReferencer)); @@ -5371,9 +5329,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getInstanceSpecification_Edge_IncomingLinks(View view) { InstanceSpecification modelElement = (InstanceSpecification) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_Realization_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer)); @@ -5381,8 +5338,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_Edge(modelElement, crossReferencer)); @@ -5394,9 +5350,8 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getInformationFlow_Edge_IncomingLinks(View view) { InformationFlow modelElement = (InformationFlow) view.getElement(); - CrossReferenceAdapter crossReferencer = CrossReferenceAdapter - .getCrossReferenceAdapter(view.eResource().getResourceSet()); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getIncomingTypeModelFacetLinks_Realization_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Abstraction_Edge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_Usage_Edge(modelElement, crossReferencer)); @@ -5404,8 +5359,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { result.addAll(getIncomingTypeModelFacetLinks_Dependency_BranchEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_ElementImport_Edge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement, crossReferencer)); - result.addAll( - getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); + result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge(modelElement, crossReferencer)); result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_Edge(modelElement, crossReferencer)); @@ -5417,7 +5371,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getDependency_Shape_OutgoingLinks(View view) { Dependency modelElement = (Dependency) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_Realization_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement)); @@ -5432,7 +5386,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getAssociationClass_Shape_OutgoingLinks(View view) { AssociationClass modelElement = (AssociationClass) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_BranchEdge(modelElement)); @@ -5456,7 +5410,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getAssociation_Shape_OutgoingLinks(View view) { Association modelElement = (Association) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_BranchEdge(modelElement)); @@ -5479,7 +5433,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getInstanceSpecification_Shape_OutgoingLinks(View view) { InstanceSpecification modelElement = (InstanceSpecification) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_Realization_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement)); @@ -5494,7 +5448,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getComponent_Shape_OutgoingLinks(View view) { Component modelElement = (Component) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_BranchEdge(modelElement)); @@ -5518,7 +5472,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getSignal_Shape_OutgoingLinks(View view) { Signal modelElement = (Signal) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_BranchEdge(modelElement)); @@ -5541,7 +5495,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getInterface_Shape_OutgoingLinks(View view) { Interface modelElement = (Interface) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_BranchEdge(modelElement)); @@ -5564,7 +5518,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getModel_Shape_OutgoingLinks(View view) { Model modelElement = (Model) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_Realization_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement)); @@ -5584,7 +5538,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getEnumeration_Shape_OutgoingLinks(View view) { Enumeration modelElement = (Enumeration) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_BranchEdge(modelElement)); @@ -5607,7 +5561,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getPackage_Shape_OutgoingLinks(View view) { Package modelElement = (Package) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_Realization_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement)); @@ -5627,7 +5581,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getInformationItem_Shape_OutgoingLinks(View view) { InformationItem modelElement = (InformationItem) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_BranchEdge(modelElement)); @@ -5650,7 +5604,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getClass_Shape_OutgoingLinks(View view) { Class modelElement = (Class) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_BranchEdge(modelElement)); @@ -5674,7 +5628,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getPrimitiveType_Shape_OutgoingLinks(View view) { PrimitiveType modelElement = (PrimitiveType) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_BranchEdge(modelElement)); @@ -5697,7 +5651,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getDataType_Shape_OutgoingLinks(View view) { DataType modelElement = (DataType) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_BranchEdge(modelElement)); @@ -5720,7 +5674,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getConstraint_PackagedElementShape_OutgoingLinks(View view) { Constraint modelElement = (Constraint) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_Realization_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement)); @@ -5737,7 +5691,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getComment_Shape_OutgoingLinks(View view) { Comment modelElement = (Comment) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement)); return result; } @@ -5754,7 +5708,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getDurationObservation_Shape_OutgoingLinks(View view) { DurationObservation modelElement = (DurationObservation) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_Realization_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement)); @@ -5770,7 +5724,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getTimeObservation_Shape_OutgoingLinks(View view) { TimeObservation modelElement = (TimeObservation) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_Realization_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement)); @@ -5786,7 +5740,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getNamedElement_DefaultShape_OutgoingLinks(View view) { NamedElement modelElement = (NamedElement) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_Realization_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement)); @@ -5956,7 +5910,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getRedefinableTemplateSignature_Shape_OutgoingLinks(View view) { RedefinableTemplateSignature modelElement = (RedefinableTemplateSignature) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_Realization_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement)); @@ -5978,7 +5932,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getInstanceSpecification_Shape_CN_OutgoingLinks(View view) { InstanceSpecification modelElement = (InstanceSpecification) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_Realization_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement)); @@ -5993,7 +5947,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getComponent_Shape_CN_OutgoingLinks(View view) { Component modelElement = (Component) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_BranchEdge(modelElement)); @@ -6017,7 +5971,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getSignal_Shape_CN_OutgoingLinks(View view) { Signal modelElement = (Signal) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_BranchEdge(modelElement)); @@ -6040,7 +5994,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getInterface_Shape_CN_OutgoingLinks(View view) { Interface modelElement = (Interface) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_BranchEdge(modelElement)); @@ -6063,7 +6017,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getModel_Shape_CN_OutgoingLinks(View view) { Model modelElement = (Model) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_Realization_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement)); @@ -6083,7 +6037,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getEnumeration_Shape_CN_OutgoingLinks(View view) { Enumeration modelElement = (Enumeration) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_BranchEdge(modelElement)); @@ -6106,7 +6060,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getPackage_Shape_CN_OutgoingLinks(View view) { Package modelElement = (Package) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_Realization_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement)); @@ -6126,7 +6080,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getInformationItem_Shape_CN_OutgoingLinks(View view) { InformationItem modelElement = (InformationItem) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_BranchEdge(modelElement)); @@ -6149,7 +6103,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getClass_Shape_CN_OutgoingLinks(View view) { Class modelElement = (Class) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_BranchEdge(modelElement)); @@ -6173,7 +6127,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getPrimitiveType_Shape_CN_OutgoingLinks(View view) { PrimitiveType modelElement = (PrimitiveType) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_BranchEdge(modelElement)); @@ -6196,7 +6150,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getDataType_Shape_CN_OutgoingLinks(View view) { DataType modelElement = (DataType) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_BranchEdge(modelElement)); @@ -6219,7 +6173,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getComment_Shape_CN_OutgoingLinks(View view) { Comment modelElement = (Comment) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElementEdge(modelElement)); return result; } @@ -6229,7 +6183,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getConstraint_PackagedElementShape_CN_OutgoingLinks(View view) { Constraint modelElement = (Constraint) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_Realization_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement)); @@ -6372,7 +6326,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getAssociationClass_Edge_OutgoingLinks(View view) { AssociationClass modelElement = (AssociationClass) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_BranchEdge(modelElement)); @@ -6396,7 +6350,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getAssociation_Edge_OutgoingLinks(View view) { Association modelElement = (Association) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_BranchEdge(modelElement)); @@ -6419,7 +6373,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getAssociation_BranchEdge_OutgoingLinks(View view) { Association modelElement = (Association) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_AssociationClass_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Association_BranchEdge(modelElement)); @@ -6442,7 +6396,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getGeneralization_Edge_OutgoingLinks(View view) { Generalization modelElement = (Generalization) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_GeneralizationSet_Edge(modelElement)); return result; } @@ -6452,7 +6406,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getInterfaceRealization_Edge_OutgoingLinks(View view) { InterfaceRealization modelElement = (InterfaceRealization) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_Realization_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement)); @@ -6467,7 +6421,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getSubstitution_Edge_OutgoingLinks(View view) { Substitution modelElement = (Substitution) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_Realization_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement)); @@ -6482,7 +6436,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getRealization_Edge_OutgoingLinks(View view) { Realization modelElement = (Realization) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_Realization_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement)); @@ -6497,7 +6451,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getAbstraction_Edge_OutgoingLinks(View view) { Abstraction modelElement = (Abstraction) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_Realization_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement)); @@ -6512,7 +6466,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getUsage_Edge_OutgoingLinks(View view) { Usage modelElement = (Usage) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_Realization_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement)); @@ -6527,7 +6481,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getDependency_Edge_OutgoingLinks(View view) { Dependency modelElement = (Dependency) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_Realization_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement)); @@ -6542,7 +6496,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getDependency_BranchEdge_OutgoingLinks(View view) { Dependency modelElement = (Dependency) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_Realization_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement)); @@ -6592,7 +6546,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getGeneralizationSet_Edge_OutgoingLinks(View view) { GeneralizationSet modelElement = (GeneralizationSet) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_Realization_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement)); @@ -6607,7 +6561,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getInstanceSpecification_Edge_OutgoingLinks(View view) { InstanceSpecification modelElement = (InstanceSpecification) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_Realization_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement)); @@ -6622,7 +6576,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ public List<UMLLinkDescriptor> getInformationFlow_Edge_OutgoingLinks(View view) { InformationFlow modelElement = (InformationFlow) view.getElement(); - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); result.addAll(getOutgoingTypeModelFacetLinks_Realization_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_Edge(modelElement)); result.addAll(getOutgoingTypeModelFacetLinks_Usage_Edge(modelElement)); @@ -6636,8 +6590,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { * @generated */ protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_AssociationClass_Edge(Package container) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); + for (Iterator<?> links = container.getPackagedElements() + .iterator(); links.hasNext();) { EObject linkObject = (EObject) links.next(); if (false == linkObject instanceof AssociationClass) { continue; @@ -6658,8 +6613,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } Type src = (Type) theSource; - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.AssociationClass_Edge, - AssociationClassLinkEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.AssociationClass_Edge, AssociationClassLinkEditPart.VISUAL_ID)); } return result; } @@ -6668,8 +6622,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { * @generated */ protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Association_Edge(Package container) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); + for (Iterator<?> links = container.getPackagedElements() + .iterator(); links.hasNext();) { EObject linkObject = (EObject) links.next(); if (false == linkObject instanceof Association) { continue; @@ -6690,8 +6645,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } Type src = (Type) theSource; - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Association_Edge, - AssociationEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Association_Edge, AssociationEditPart.VISUAL_ID)); } return result; } @@ -6700,8 +6654,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { * @generated */ protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Association_BranchEdge(Package container) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); + for (Iterator<?> links = container.getPackagedElements() + .iterator(); links.hasNext();) { EObject linkObject = (EObject) links.next(); if (false == linkObject instanceof Association) { continue; @@ -6722,8 +6677,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } Type src = (Type) theSource; - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Association_BranchEdge, - AssociationBranchEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Association_BranchEdge, AssociationBranchEditPart.VISUAL_ID)); } return result; } @@ -6732,8 +6686,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { * @generated */ protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Generalization_Edge(Classifier container) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for (Iterator<?> links = container.getGeneralizations().iterator(); links.hasNext();) { + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); + for (Iterator<?> links = container.getGeneralizations() + .iterator(); links.hasNext();) { EObject linkObject = (EObject) links.next(); if (false == linkObject instanceof Generalization) { continue; @@ -6743,8 +6698,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } Classifier dst = link.getGeneral(); - result.add(new UMLLinkDescriptor(container, dst, link, UMLElementTypes.Generalization_Edge, - GeneralizationEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(container, dst, link, UMLElementTypes.Generalization_Edge, GeneralizationEditPart.VISUAL_ID)); } return result; } @@ -6754,8 +6708,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_InterfaceRealization_Edge( BehavioredClassifier container) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for (Iterator<?> links = container.getInterfaceRealizations().iterator(); links.hasNext();) { + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); + for (Iterator<?> links = container.getInterfaceRealizations() + .iterator(); links.hasNext();) { EObject linkObject = (EObject) links.next(); if (false == linkObject instanceof InterfaceRealization) { continue; @@ -6765,8 +6720,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } Interface dst = link.getContract(); - result.add(new UMLLinkDescriptor(container, dst, link, UMLElementTypes.InterfaceRealization_Edge, - InterfaceRealizationEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(container, dst, link, UMLElementTypes.InterfaceRealization_Edge, InterfaceRealizationEditPart.VISUAL_ID)); } return result; } @@ -6775,8 +6729,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { * @generated */ protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Substitution_Edge(Classifier container) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for (Iterator<?> links = container.getSubstitutions().iterator(); links.hasNext();) { + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); + for (Iterator<?> links = container.getSubstitutions() + .iterator(); links.hasNext();) { EObject linkObject = (EObject) links.next(); if (false == linkObject instanceof Substitution) { continue; @@ -6787,8 +6742,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { } Classifier dst = link.getContract(); Classifier src = link.getSubstitutingClassifier(); - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Substitution_Edge, - SubstitutionEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Substitution_Edge, SubstitutionEditPart.VISUAL_ID)); } return result; } @@ -6797,8 +6751,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { * @generated */ protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Realization_Edge(Package container) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); + for (Iterator<?> links = container.getPackagedElements() + .iterator(); links.hasNext();) { EObject linkObject = (EObject) links.next(); if (false == linkObject instanceof Realization) { continue; @@ -6819,8 +6774,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } NamedElement src = (NamedElement) theSource; - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Realization_Edge, - RealizationEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Realization_Edge, RealizationEditPart.VISUAL_ID)); } return result; } @@ -6829,8 +6783,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { * @generated */ protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Abstraction_Edge(Package container) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); + for (Iterator<?> links = container.getPackagedElements() + .iterator(); links.hasNext();) { EObject linkObject = (EObject) links.next(); if (false == linkObject instanceof Abstraction) { continue; @@ -6851,8 +6806,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } NamedElement src = (NamedElement) theSource; - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Abstraction_Edge, - AbstractionEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Abstraction_Edge, AbstractionEditPart.VISUAL_ID)); } return result; } @@ -6861,8 +6815,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { * @generated */ protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Usage_Edge(Package container) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); + for (Iterator<?> links = container.getPackagedElements() + .iterator(); links.hasNext();) { EObject linkObject = (EObject) links.next(); if (false == linkObject instanceof Usage) { continue; @@ -6892,8 +6847,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { * @generated */ protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Dependency_Edge(Package container) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); + for (Iterator<?> links = container.getPackagedElements() + .iterator(); links.hasNext();) { EObject linkObject = (EObject) links.next(); if (false == linkObject instanceof Dependency) { continue; @@ -6914,8 +6870,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } NamedElement src = (NamedElement) theSource; - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_Edge, - DependencyEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_Edge, DependencyEditPart.VISUAL_ID)); } return result; } @@ -6924,8 +6879,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { * @generated */ protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Dependency_BranchEdge(Package container) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); + for (Iterator<?> links = container.getPackagedElements() + .iterator(); links.hasNext();) { EObject linkObject = (EObject) links.next(); if (false == linkObject instanceof Dependency) { continue; @@ -6946,8 +6902,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } NamedElement src = (NamedElement) theSource; - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_BranchEdge, - DependencyBranchEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_BranchEdge, DependencyBranchEditPart.VISUAL_ID)); } return result; } @@ -6956,8 +6911,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { * @generated */ protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_ElementImport_Edge(Namespace container) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for (Iterator<?> links = container.getElementImports().iterator(); links.hasNext();) { + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); + for (Iterator<?> links = container.getElementImports() + .iterator(); links.hasNext();) { EObject linkObject = (EObject) links.next(); if (false == linkObject instanceof ElementImport) { continue; @@ -6967,8 +6923,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } PackageableElement dst = link.getImportedElement(); - result.add(new UMLLinkDescriptor(container, dst, link, UMLElementTypes.ElementImport_Edge, - ElementImportEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(container, dst, link, UMLElementTypes.ElementImport_Edge, ElementImportEditPart.VISUAL_ID)); } return result; } @@ -6977,8 +6932,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { * @generated */ protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_PackageImport_Edge(Namespace container) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for (Iterator<?> links = container.getPackageImports().iterator(); links.hasNext();) { + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); + for (Iterator<?> links = container.getPackageImports() + .iterator(); links.hasNext();) { EObject linkObject = (EObject) links.next(); if (false == linkObject instanceof PackageImport) { continue; @@ -6988,8 +6944,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } Package dst = link.getImportedPackage(); - result.add(new UMLLinkDescriptor(container, dst, link, UMLElementTypes.PackageImport_Edge, - PackageImportEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(container, dst, link, UMLElementTypes.PackageImport_Edge, PackageImportEditPart.VISUAL_ID)); } return result; } @@ -6998,8 +6953,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { * @generated */ protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_PackageMerge_Edge(Package container) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for (Iterator<?> links = container.getPackageMerges().iterator(); links.hasNext();) { + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); + for (Iterator<?> links = container.getPackageMerges() + .iterator(); links.hasNext();) { EObject linkObject = (EObject) links.next(); if (false == linkObject instanceof PackageMerge) { continue; @@ -7010,8 +6966,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { } Package dst = link.getMergedPackage(); Package src = link.getReceivingPackage(); - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.PackageMerge_Edge, - PackageMergeEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.PackageMerge_Edge, PackageMergeEditPart.VISUAL_ID)); } return result; } @@ -7020,8 +6975,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { * @generated */ protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_ProfileApplication_Edge(Package container) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for (Iterator<?> links = container.getProfileApplications().iterator(); links.hasNext();) { + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); + for (Iterator<?> links = container.getProfileApplications() + .iterator(); links.hasNext();) { EObject linkObject = (EObject) links.next(); if (false == linkObject instanceof ProfileApplication) { continue; @@ -7031,8 +6987,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } Profile dst = link.getAppliedProfile(); - result.add(new UMLLinkDescriptor(container, dst, link, UMLElementTypes.ProfileApplication_Edge, - ProfileApplicationEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(container, dst, link, UMLElementTypes.ProfileApplication_Edge, ProfileApplicationEditPart.VISUAL_ID)); } return result; } @@ -7042,8 +6997,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_TemplateBinding_Edge( TemplateableElement container) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for (Iterator<?> links = container.getTemplateBindings().iterator(); links.hasNext();) { + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); + for (Iterator<?> links = container.getTemplateBindings() + .iterator(); links.hasNext();) { EObject linkObject = (EObject) links.next(); if (false == linkObject instanceof TemplateBinding) { continue; @@ -7054,8 +7010,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { } TemplateableElement dst = link.getBoundElement(); TemplateableElement src = link.getBoundElement(); - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.TemplateBinding_Edge, - TemplateBindingEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.TemplateBinding_Edge, TemplateBindingEditPart.VISUAL_ID)); } return result; } @@ -7064,8 +7019,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { * @generated */ protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_GeneralizationSet_Edge(Package container) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); + for (Iterator<?> links = container.getPackagedElements() + .iterator(); links.hasNext();) { EObject linkObject = (EObject) links.next(); if (false == linkObject instanceof GeneralizationSet) { continue; @@ -7086,8 +7042,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } Generalization src = (Generalization) theSource; - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.GeneralizationSet_Edge, - GeneralizationSetEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.GeneralizationSet_Edge, GeneralizationSetEditPart.VISUAL_ID)); } return result; } @@ -7097,15 +7052,15 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_InstanceSpecification_Edge( Package container) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); + for (Iterator<?> links = container.getPackagedElements() + .iterator(); links.hasNext();) { EObject linkObject = (EObject) links.next(); if (false == linkObject instanceof InstanceSpecification) { continue; } InstanceSpecification link = (InstanceSpecification) linkObject; - if (!InstanceSpecificationLinkEditPart.VISUAL_ID - .equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { + if (!InstanceSpecificationLinkEditPart.VISUAL_ID.equals(UMLVisualIDRegistry.getLinkWithClassVisualID(link))) { continue; } List<?> targets = link.getSlots(); @@ -7120,8 +7075,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } Slot src = (Slot) theSource; - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.InstanceSpecification_Edge, - InstanceSpecificationLinkEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.InstanceSpecification_Edge, InstanceSpecificationLinkEditPart.VISUAL_ID)); } return result; } @@ -7130,8 +7084,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { * @generated */ protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_InformationFlow_Edge(Package container) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); + for (Iterator<?> links = container.getPackagedElements() + .iterator(); links.hasNext();) { EObject linkObject = (EObject) links.next(); if (false == linkObject instanceof InformationFlow) { continue; @@ -7152,8 +7107,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } NamedElement src = (NamedElement) theSource; - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.InformationFlow_Edge, - InformationFlowEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.InformationFlow_Edge, InformationFlowEditPart.VISUAL_ID)); } return result; } @@ -7163,11 +7117,10 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_AssociationClass_Edge(Type target, CrossReferenceAdapter crossReferencer) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target); for (EStructuralFeature.Setting setting : settings) { - if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getAssociation_EndType() - || false == setting.getEObject() instanceof AssociationClass) { + if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getAssociation_EndType() || false == setting.getEObject() instanceof AssociationClass) { continue; } AssociationClass link = (AssociationClass) setting.getEObject(); @@ -7180,8 +7133,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } Type src = (Type) theSource; - result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.AssociationClass_Edge, - AssociationClassLinkEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.AssociationClass_Edge, AssociationClassLinkEditPart.VISUAL_ID)); } return result; } @@ -7191,11 +7143,10 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Association_Edge(Type target, CrossReferenceAdapter crossReferencer) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target); for (EStructuralFeature.Setting setting : settings) { - if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getAssociation_EndType() - || false == setting.getEObject() instanceof Association) { + if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getAssociation_EndType() || false == setting.getEObject() instanceof Association) { continue; } Association link = (Association) setting.getEObject(); @@ -7208,8 +7159,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } Type src = (Type) theSource; - result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Association_Edge, - AssociationEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Association_Edge, AssociationEditPart.VISUAL_ID)); } return result; } @@ -7219,11 +7169,10 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Association_BranchEdge(Type target, CrossReferenceAdapter crossReferencer) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target); for (EStructuralFeature.Setting setting : settings) { - if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getAssociation_EndType() - || false == setting.getEObject() instanceof Association) { + if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getAssociation_EndType() || false == setting.getEObject() instanceof Association) { continue; } Association link = (Association) setting.getEObject(); @@ -7236,8 +7185,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } Type src = (Type) theSource; - result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Association_BranchEdge, - AssociationBranchEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Association_BranchEdge, AssociationBranchEditPart.VISUAL_ID)); } return result; } @@ -7247,11 +7195,10 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Generalization_Edge(Classifier target, CrossReferenceAdapter crossReferencer) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target); for (EStructuralFeature.Setting setting : settings) { - if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getGeneralization_General() - || false == setting.getEObject() instanceof Generalization) { + if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getGeneralization_General() || false == setting.getEObject() instanceof Generalization) { continue; } Generalization link = (Generalization) setting.getEObject(); @@ -7262,8 +7209,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } Classifier container = (Classifier) link.eContainer(); - result.add(new UMLLinkDescriptor(container, target, link, UMLElementTypes.Generalization_Edge, - GeneralizationEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(container, target, link, UMLElementTypes.Generalization_Edge, GeneralizationEditPart.VISUAL_ID)); } return result; @@ -7274,11 +7220,10 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_InterfaceRealization_Edge(Interface target, CrossReferenceAdapter crossReferencer) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target); for (EStructuralFeature.Setting setting : settings) { - if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getInterfaceRealization_Contract() - || false == setting.getEObject() instanceof InterfaceRealization) { + if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getInterfaceRealization_Contract() || false == setting.getEObject() instanceof InterfaceRealization) { continue; } InterfaceRealization link = (InterfaceRealization) setting.getEObject(); @@ -7289,8 +7234,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } BehavioredClassifier container = (BehavioredClassifier) link.eContainer(); - result.add(new UMLLinkDescriptor(container, target, link, UMLElementTypes.InterfaceRealization_Edge, - InterfaceRealizationEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(container, target, link, UMLElementTypes.InterfaceRealization_Edge, InterfaceRealizationEditPart.VISUAL_ID)); } return result; @@ -7301,11 +7245,10 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Substitution_Edge(Classifier target, CrossReferenceAdapter crossReferencer) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target); for (EStructuralFeature.Setting setting : settings) { - if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getSubstitution_Contract() - || false == setting.getEObject() instanceof Substitution) { + if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getSubstitution_Contract() || false == setting.getEObject() instanceof Substitution) { continue; } Substitution link = (Substitution) setting.getEObject(); @@ -7313,8 +7256,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } Classifier src = link.getSubstitutingClassifier(); - result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Substitution_Edge, - SubstitutionEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Substitution_Edge, SubstitutionEditPart.VISUAL_ID)); } return result; } @@ -7324,11 +7266,10 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Realization_Edge(NamedElement target, CrossReferenceAdapter crossReferencer) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target); for (EStructuralFeature.Setting setting : settings) { - if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() - || false == setting.getEObject() instanceof Realization) { + if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Realization) { continue; } Realization link = (Realization) setting.getEObject(); @@ -7341,8 +7282,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } NamedElement src = (NamedElement) theSource; - result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Realization_Edge, - RealizationEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Realization_Edge, RealizationEditPart.VISUAL_ID)); } return result; } @@ -7352,11 +7292,10 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Abstraction_Edge(NamedElement target, CrossReferenceAdapter crossReferencer) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target); for (EStructuralFeature.Setting setting : settings) { - if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() - || false == setting.getEObject() instanceof Abstraction) { + if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Abstraction) { continue; } Abstraction link = (Abstraction) setting.getEObject(); @@ -7369,8 +7308,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } NamedElement src = (NamedElement) theSource; - result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Abstraction_Edge, - AbstractionEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Abstraction_Edge, AbstractionEditPart.VISUAL_ID)); } return result; } @@ -7380,11 +7318,10 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Usage_Edge(NamedElement target, CrossReferenceAdapter crossReferencer) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target); for (EStructuralFeature.Setting setting : settings) { - if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() - || false == setting.getEObject() instanceof Usage) { + if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Usage) { continue; } Usage link = (Usage) setting.getEObject(); @@ -7407,11 +7344,10 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Dependency_Edge(NamedElement target, CrossReferenceAdapter crossReferencer) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target); for (EStructuralFeature.Setting setting : settings) { - if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() - || false == setting.getEObject() instanceof Dependency) { + if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Dependency) { continue; } Dependency link = (Dependency) setting.getEObject(); @@ -7424,8 +7360,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } NamedElement src = (NamedElement) theSource; - result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Dependency_Edge, - DependencyEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Dependency_Edge, DependencyEditPart.VISUAL_ID)); } return result; } @@ -7435,11 +7370,10 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Dependency_BranchEdge(NamedElement target, CrossReferenceAdapter crossReferencer) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target); for (EStructuralFeature.Setting setting : settings) { - if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() - || false == setting.getEObject() instanceof Dependency) { + if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Dependency) { continue; } Dependency link = (Dependency) setting.getEObject(); @@ -7452,8 +7386,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } NamedElement src = (NamedElement) theSource; - result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Dependency_BranchEdge, - DependencyBranchEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Dependency_BranchEdge, DependencyBranchEditPart.VISUAL_ID)); } return result; } @@ -7463,11 +7396,10 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_ElementImport_Edge(PackageableElement target, CrossReferenceAdapter crossReferencer) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target); for (EStructuralFeature.Setting setting : settings) { - if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getElementImport_ImportedElement() - || false == setting.getEObject() instanceof ElementImport) { + if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getElementImport_ImportedElement() || false == setting.getEObject() instanceof ElementImport) { continue; } ElementImport link = (ElementImport) setting.getEObject(); @@ -7478,8 +7410,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } Namespace container = (Namespace) link.eContainer(); - result.add(new UMLLinkDescriptor(container, target, link, UMLElementTypes.ElementImport_Edge, - ElementImportEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(container, target, link, UMLElementTypes.ElementImport_Edge, ElementImportEditPart.VISUAL_ID)); } return result; @@ -7490,11 +7421,10 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_PackageImport_Edge(Package target, CrossReferenceAdapter crossReferencer) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target); for (EStructuralFeature.Setting setting : settings) { - if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getPackageImport_ImportedPackage() - || false == setting.getEObject() instanceof PackageImport) { + if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getPackageImport_ImportedPackage() || false == setting.getEObject() instanceof PackageImport) { continue; } PackageImport link = (PackageImport) setting.getEObject(); @@ -7505,8 +7435,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } Namespace container = (Namespace) link.eContainer(); - result.add(new UMLLinkDescriptor(container, target, link, UMLElementTypes.PackageImport_Edge, - PackageImportEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(container, target, link, UMLElementTypes.PackageImport_Edge, PackageImportEditPart.VISUAL_ID)); } return result; @@ -7517,11 +7446,10 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_PackageMerge_Edge(Package target, CrossReferenceAdapter crossReferencer) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target); for (EStructuralFeature.Setting setting : settings) { - if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getPackageMerge_MergedPackage() - || false == setting.getEObject() instanceof PackageMerge) { + if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getPackageMerge_MergedPackage() || false == setting.getEObject() instanceof PackageMerge) { continue; } PackageMerge link = (PackageMerge) setting.getEObject(); @@ -7529,8 +7457,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } Package src = link.getReceivingPackage(); - result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.PackageMerge_Edge, - PackageMergeEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.PackageMerge_Edge, PackageMergeEditPart.VISUAL_ID)); } return result; } @@ -7540,12 +7467,11 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ protected Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_Comment_AnnotatedElementEdge( Element target, CrossReferenceAdapter crossReferencer) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target); for (EStructuralFeature.Setting setting : settings) { if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getComment_AnnotatedElement()) { - result.add(new UMLLinkDescriptor(setting.getEObject(), target, - UMLElementTypes.Comment_AnnotatedElementEdge, CommentAnnotatedElementEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.Comment_AnnotatedElementEdge, CommentAnnotatedElementEditPart.VISUAL_ID)); } } return result; @@ -7556,13 +7482,11 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ protected Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge( Element target, CrossReferenceAdapter crossReferencer) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target); for (EStructuralFeature.Setting setting : settings) { if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getConstraint_ConstrainedElement()) { - result.add(new UMLLinkDescriptor(setting.getEObject(), target, - UMLElementTypes.Constraint_ConstrainedElementEdge, - ConstraintConstrainedElementEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.Constraint_ConstrainedElementEdge, ConstraintConstrainedElementEditPart.VISUAL_ID)); } } return result; @@ -7573,11 +7497,10 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_TemplateBinding_Edge( TemplateableElement target, CrossReferenceAdapter crossReferencer) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target); for (EStructuralFeature.Setting setting : settings) { - if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getTemplateBinding_BoundElement() - || false == setting.getEObject() instanceof TemplateBinding) { + if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getTemplateBinding_BoundElement() || false == setting.getEObject() instanceof TemplateBinding) { continue; } TemplateBinding link = (TemplateBinding) setting.getEObject(); @@ -7585,8 +7508,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } TemplateableElement src = link.getBoundElement(); - result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.TemplateBinding_Edge, - TemplateBindingEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.TemplateBinding_Edge, TemplateBindingEditPart.VISUAL_ID)); } return result; } @@ -7596,11 +7518,10 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_GeneralizationSet_Edge(Generalization target, CrossReferenceAdapter crossReferencer) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target); for (EStructuralFeature.Setting setting : settings) { - if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getGeneralizationSet_Generalization() - || false == setting.getEObject() instanceof GeneralizationSet) { + if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getGeneralizationSet_Generalization() || false == setting.getEObject() instanceof GeneralizationSet) { continue; } GeneralizationSet link = (GeneralizationSet) setting.getEObject(); @@ -7613,8 +7534,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } Generalization src = (Generalization) theSource; - result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.GeneralizationSet_Edge, - GeneralizationSetEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.GeneralizationSet_Edge, GeneralizationSetEditPart.VISUAL_ID)); } return result; } @@ -7624,12 +7544,11 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ protected Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_TimeObservation_EventEdge( NamedElement target, CrossReferenceAdapter crossReferencer) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target); for (EStructuralFeature.Setting setting : settings) { if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getTimeObservation_Event()) { - result.add(new UMLLinkDescriptor(setting.getEObject(), target, - UMLElementTypes.TimeObservation_EventEdge, ConnectorTimeObservationEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.TimeObservation_EventEdge, ConnectorTimeObservationEditPart.VISUAL_ID)); } } return result; @@ -7640,12 +7559,11 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ protected Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_DurationObservation_EventEdge( NamedElement target, CrossReferenceAdapter crossReferencer) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target); for (EStructuralFeature.Setting setting : settings) { if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getDurationObservation_Event()) { - result.add(new UMLLinkDescriptor(setting.getEObject(), target, - UMLElementTypes.DurationObservation_EventEdge, ConnectorDurationObservationEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.DurationObservation_EventEdge, ConnectorDurationObservationEditPart.VISUAL_ID)); } } return result; @@ -7656,11 +7574,10 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_InformationFlow_Edge(NamedElement target, CrossReferenceAdapter crossReferencer) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target); for (EStructuralFeature.Setting setting : settings) { - if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getInformationFlow_InformationTarget() - || false == setting.getEObject() instanceof InformationFlow) { + if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getInformationFlow_InformationTarget() || false == setting.getEObject() instanceof InformationFlow) { continue; } InformationFlow link = (InformationFlow) setting.getEObject(); @@ -7673,8 +7590,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { continue; } NamedElement src = (NamedElement) theSource; - result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.InformationFlow_Edge, - InformationFlowEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.InformationFlow_Edge, InformationFlowEditPart.VISUAL_ID)); } return result; } @@ -7684,12 +7600,11 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ protected Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_Constraint_ContextEdge(Namespace target, CrossReferenceAdapter crossReferencer) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target); for (EStructuralFeature.Setting setting : settings) { if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getConstraint_Context()) { - result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.Constraint_ContextEdge, - ContextLinkEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.Constraint_ContextEdge, ContextLinkEditPart.VISUAL_ID)); } } return result; @@ -7711,8 +7626,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { if (container == null) { return Collections.emptyList(); } - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); + for (Iterator<?> links = container.getPackagedElements() + .iterator(); links.hasNext();) { EObject linkObject = (EObject) links.next(); if (false == linkObject instanceof AssociationClass) { continue; @@ -7736,8 +7652,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { if (src != source) { continue; } - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.AssociationClass_Edge, - AssociationClassLinkEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.AssociationClass_Edge, AssociationClassLinkEditPart.VISUAL_ID)); } return result; } @@ -7758,8 +7673,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { if (container == null) { return Collections.emptyList(); } - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); + for (Iterator<?> links = container.getPackagedElements() + .iterator(); links.hasNext();) { EObject linkObject = (EObject) links.next(); if (false == linkObject instanceof Association) { continue; @@ -7783,8 +7699,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { if (src != source) { continue; } - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Association_Edge, - AssociationEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Association_Edge, AssociationEditPart.VISUAL_ID)); } return result; } @@ -7805,8 +7720,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { if (container == null) { return Collections.emptyList(); } - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); + for (Iterator<?> links = container.getPackagedElements() + .iterator(); links.hasNext();) { EObject linkObject = (EObject) links.next(); if (false == linkObject instanceof Association) { continue; @@ -7830,8 +7746,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { if (src != source) { continue; } - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Association_BranchEdge, - AssociationBranchEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Association_BranchEdge, AssociationBranchEditPart.VISUAL_ID)); } return result; } @@ -7852,8 +7767,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { if (container == null) { return Collections.emptyList(); } - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for (Iterator<?> links = container.getSubstitutions().iterator(); links.hasNext();) { + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); + for (Iterator<?> links = container.getSubstitutions() + .iterator(); links.hasNext();) { EObject linkObject = (EObject) links.next(); if (false == linkObject instanceof Substitution) { continue; @@ -7867,8 +7783,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { if (src != source) { continue; } - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Substitution_Edge, - SubstitutionEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Substitution_Edge, SubstitutionEditPart.VISUAL_ID)); } return result; } @@ -7889,8 +7804,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { if (container == null) { return Collections.emptyList(); } - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); + for (Iterator<?> links = container.getPackagedElements() + .iterator(); links.hasNext();) { EObject linkObject = (EObject) links.next(); if (false == linkObject instanceof Realization) { continue; @@ -7914,8 +7830,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { if (src != source) { continue; } - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Realization_Edge, - RealizationEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Realization_Edge, RealizationEditPart.VISUAL_ID)); } return result; } @@ -7936,8 +7851,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { if (container == null) { return Collections.emptyList(); } - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); + for (Iterator<?> links = container.getPackagedElements() + .iterator(); links.hasNext();) { EObject linkObject = (EObject) links.next(); if (false == linkObject instanceof Abstraction) { continue; @@ -7961,8 +7877,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { if (src != source) { continue; } - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Abstraction_Edge, - AbstractionEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Abstraction_Edge, AbstractionEditPart.VISUAL_ID)); } return result; } @@ -7983,8 +7898,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { if (container == null) { return Collections.emptyList(); } - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); + for (Iterator<?> links = container.getPackagedElements() + .iterator(); links.hasNext();) { EObject linkObject = (EObject) links.next(); if (false == linkObject instanceof Usage) { continue; @@ -8029,8 +7945,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { if (container == null) { return Collections.emptyList(); } - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); + for (Iterator<?> links = container.getPackagedElements() + .iterator(); links.hasNext();) { EObject linkObject = (EObject) links.next(); if (false == linkObject instanceof Dependency) { continue; @@ -8054,8 +7971,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { if (src != source) { continue; } - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_Edge, - DependencyEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_Edge, DependencyEditPart.VISUAL_ID)); } return result; } @@ -8076,8 +7992,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { if (container == null) { return Collections.emptyList(); } - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); + for (Iterator<?> links = container.getPackagedElements() + .iterator(); links.hasNext();) { EObject linkObject = (EObject) links.next(); if (false == linkObject instanceof Dependency) { continue; @@ -8101,8 +8018,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { if (src != source) { continue; } - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_BranchEdge, - DependencyBranchEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_BranchEdge, DependencyBranchEditPart.VISUAL_ID)); } return result; } @@ -8123,8 +8039,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { if (container == null) { return Collections.emptyList(); } - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for (Iterator<?> links = container.getPackageMerges().iterator(); links.hasNext();) { + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); + for (Iterator<?> links = container.getPackageMerges() + .iterator(); links.hasNext();) { EObject linkObject = (EObject) links.next(); if (false == linkObject instanceof PackageMerge) { continue; @@ -8138,8 +8055,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { if (src != source) { continue; } - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.PackageMerge_Edge, - PackageMergeEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.PackageMerge_Edge, PackageMergeEditPart.VISUAL_ID)); } return result; } @@ -8149,11 +8065,11 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElementEdge( Comment source) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for (Iterator<?> destinations = source.getAnnotatedElements().iterator(); destinations.hasNext();) { + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); + for (Iterator<?> destinations = source.getAnnotatedElements() + .iterator(); destinations.hasNext();) { Element destination = (Element) destinations.next(); - result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.Comment_AnnotatedElementEdge, - CommentAnnotatedElementEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.Comment_AnnotatedElementEdge, CommentAnnotatedElementEditPart.VISUAL_ID)); } return result; } @@ -8163,11 +8079,11 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElementEdge( Constraint source) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for (Iterator<?> destinations = source.getConstrainedElements().iterator(); destinations.hasNext();) { + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); + for (Iterator<?> destinations = source.getConstrainedElements() + .iterator(); destinations.hasNext();) { Element destination = (Element) destinations.next(); - result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.Constraint_ConstrainedElementEdge, - ConstraintConstrainedElementEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.Constraint_ConstrainedElementEdge, ConstraintConstrainedElementEditPart.VISUAL_ID)); } return result; } @@ -8189,8 +8105,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { if (container == null) { return Collections.emptyList(); } - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for (Iterator<?> links = container.getTemplateBindings().iterator(); links.hasNext();) { + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); + for (Iterator<?> links = container.getTemplateBindings() + .iterator(); links.hasNext();) { EObject linkObject = (EObject) links.next(); if (false == linkObject instanceof TemplateBinding) { continue; @@ -8204,8 +8121,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { if (src != source) { continue; } - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.TemplateBinding_Edge, - TemplateBindingEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.TemplateBinding_Edge, TemplateBindingEditPart.VISUAL_ID)); } return result; } @@ -8227,8 +8143,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { if (container == null) { return Collections.emptyList(); } - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); + for (Iterator<?> links = container.getPackagedElements() + .iterator(); links.hasNext();) { EObject linkObject = (EObject) links.next(); if (false == linkObject instanceof GeneralizationSet) { continue; @@ -8252,8 +8169,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { if (src != source) { continue; } - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.GeneralizationSet_Edge, - GeneralizationSetEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.GeneralizationSet_Edge, GeneralizationSetEditPart.VISUAL_ID)); } return result; } @@ -8263,13 +8179,12 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_TimeObservation_EventEdge( TimeObservation source) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); NamedElement destination = source.getEvent(); if (destination == null) { return result; } - result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.TimeObservation_EventEdge, - ConnectorTimeObservationEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.TimeObservation_EventEdge, ConnectorTimeObservationEditPart.VISUAL_ID)); return result; } @@ -8278,11 +8193,11 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_DurationObservation_EventEdge( DurationObservation source) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for (Iterator<?> destinations = source.getEvents().iterator(); destinations.hasNext();) { + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); + for (Iterator<?> destinations = source.getEvents() + .iterator(); destinations.hasNext();) { NamedElement destination = (NamedElement) destinations.next(); - result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.DurationObservation_EventEdge, - ConnectorDurationObservationEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.DurationObservation_EventEdge, ConnectorDurationObservationEditPart.VISUAL_ID)); } return result; } @@ -8303,8 +8218,9 @@ public class UMLDiagramUpdater implements DiagramUpdater { if (container == null) { return Collections.emptyList(); } - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); - for (Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) { + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); + for (Iterator<?> links = container.getPackagedElements() + .iterator(); links.hasNext();) { EObject linkObject = (EObject) links.next(); if (false == linkObject instanceof InformationFlow) { continue; @@ -8328,8 +8244,7 @@ public class UMLDiagramUpdater implements DiagramUpdater { if (src != source) { continue; } - result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.InformationFlow_Edge, - InformationFlowEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.InformationFlow_Edge, InformationFlowEditPart.VISUAL_ID)); } return result; } @@ -8339,13 +8254,12 @@ public class UMLDiagramUpdater implements DiagramUpdater { */ protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_Constraint_ContextEdge( Constraint source) { - LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>(); + LinkedList<UMLLinkDescriptor> result = new LinkedList<>(); Namespace destination = source.getContext(); if (destination == null) { return result; } - result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.Constraint_ContextEdge, - ContextLinkEditPart.VISUAL_ID)); + result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.Constraint_ContextEdge, ContextLinkEditPart.VISUAL_ID)); return result; } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDocumentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDocumentProvider.java index de841bd327c..c5ee56c0d27 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDocumentProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDocumentProvider.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -75,12 +75,13 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi /** * @generated */ + @Override protected ElementInfo createElementInfo(Object element) throws CoreException { if (false == element instanceof FileEditorInput && false == element instanceof URIEditorInput) { throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, - NLS.bind(Messages.UMLDocumentProvider_IncorrectInputError, - new Object[] { element, "org.eclipse.ui.part.FileEditorInput", //$NON-NLS-1$ - "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ + NLS.bind( + Messages.UMLDocumentProvider_IncorrectInputError, + new Object[] { element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$ null)); } IEditorInput editorInput = (IEditorInput) element; @@ -95,12 +96,13 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi /** * @generated */ + @Override protected IDocument createDocument(Object element) throws CoreException { if (false == element instanceof FileEditorInput && false == element instanceof URIEditorInput) { throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, - NLS.bind(Messages.UMLDocumentProvider_IncorrectInputError, - new Object[] { element, "org.eclipse.ui.part.FileEditorInput", //$NON-NLS-1$ - "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ + NLS.bind( + Messages.UMLDocumentProvider_IncorrectInputError, + new Object[] { element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$ null)); } IDocument document = createEmptyDocument(); @@ -113,9 +115,11 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi * Sets up the given document as it would be provided for the given element. The * content of the document is not changed. This default implementation is empty. * Subclasses may reimplement. - * - * @param element the blue-print element - * @param document the document to set up + * + * @param element + * the blue-print element + * @param document + * the document to set up * @generated */ protected void setupDocument(Object element, IDocument document) { @@ -144,6 +148,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi /** * @generated */ + @Override protected IDocument createEmptyDocument() { DiagramDocument document = new DiagramDocument(); document.setEditingDomain(createEditingDomain()); @@ -156,9 +161,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi private TransactionalEditingDomain createEditingDomain() { TransactionalEditingDomain editingDomain = DiagramEditingDomainFactory.getInstance().createEditingDomain(); editingDomain.setID("org.eclipse.papyrus.uml.diagram.clazz.EditingDomain"); //$NON-NLS-1$ - final NotificationFilter diagramResourceModifiedFilter = NotificationFilter - .createNotifierFilter(editingDomain.getResourceSet()) - .and(NotificationFilter.createEventTypeFilter(Notification.ADD)) + final NotificationFilter diagramResourceModifiedFilter = NotificationFilter.createNotifierFilter(editingDomain.getResourceSet()).and(NotificationFilter.createEventTypeFilter(Notification.ADD)) .and(NotificationFilter.createFeatureFilter(ResourceSet.class, ResourceSet.RESOURCE_SET__RESOURCES)); editingDomain.getResourceSet().eAdapters().add(new Adapter() { @@ -216,7 +219,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi try { @SuppressWarnings({ "rawtypes", "unchecked" }) Map<?, ?> options = new HashMap(GMFResourceFactory.getDefaultLoadOptions()); - // @see 171060 + // @see 171060 // options.put(org.eclipse.emf.ecore.xmi.XMLResource.OPTION_RECORD_UNKNOWN_FEATURE, Boolean.TRUE); resource.load(options); } catch (IOException e) { @@ -253,9 +256,9 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi } } else { throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, - NLS.bind(Messages.UMLDocumentProvider_IncorrectInputError, - new Object[] { element, "org.eclipse.ui.part.FileEditorInput", //$NON-NLS-1$ - "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ + NLS.bind( + Messages.UMLDocumentProvider_IncorrectInputError, + new Object[] { element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$ null)); } } @@ -263,6 +266,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi /** * @generated */ + @Override public long getModificationStamp(Object element) { ResourceSetInfo info = getResourceSetInfo(element); if (info != null) { @@ -274,6 +278,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi /** * @generated */ + @Override public boolean isDeleted(Object element) { IDiagramDocument document = getDiagramDocument(element); if (document != null) { @@ -296,6 +301,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi /** * @generated */ + @Override protected void disposeElementInfo(Object element, ElementInfo info) { if (info instanceof ResourceSetInfo) { ResourceSetInfo resourceSetInfo = (ResourceSetInfo) info; @@ -307,10 +313,11 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi /** * @generated */ + @Override protected void doValidateState(Object element, Object computationContext) throws CoreException { ResourceSetInfo info = getResourceSetInfo(element); if (info != null) { - LinkedList<IFile> files2Validate = new LinkedList<IFile>(); + LinkedList<IFile> files2Validate = new LinkedList<>(); for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) { Resource nextResource = it.next(); IFile file = WorkspaceSynchronizer.getFile(nextResource); @@ -318,8 +325,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi files2Validate.add(file); } } - ResourcesPlugin.getWorkspace().validateEdit(files2Validate.toArray(new IFile[files2Validate.size()]), - computationContext); + ResourcesPlugin.getWorkspace().validateEdit(files2Validate.toArray(new IFile[files2Validate.size()]), computationContext); } super.doValidateState(element, computationContext); @@ -328,6 +334,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi /** * @generated */ + @Override public boolean isReadOnly(Object element) { ResourceSetInfo info = getResourceSetInfo(element); if (info != null) { @@ -347,6 +354,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi /** * @generated */ + @Override public boolean isModifiable(Object element) { if (!isStateValidated(element)) { if (element instanceof FileEditorInput || element instanceof URIEditorInput) { @@ -392,6 +400,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi /** * @generated */ + @Override protected void doUpdateStateCache(Object element) throws CoreException { ResourceSetInfo info = getResourceSetInfo(element); if (info != null) { @@ -403,6 +412,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi /** * @generated */ + @Override public boolean isSynchronized(Object element) { ResourceSetInfo info = getResourceSetInfo(element); if (info != null) { @@ -414,10 +424,11 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi /** * @generated */ + @Override protected ISchedulingRule getResetRule(Object element) { ResourceSetInfo info = getResourceSetInfo(element); if (info != null) { - LinkedList<ISchedulingRule> rules = new LinkedList<ISchedulingRule>(); + LinkedList<ISchedulingRule> rules = new LinkedList<>(); for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) { Resource nextResource = it.next(); IFile file = WorkspaceSynchronizer.getFile(nextResource); @@ -433,10 +444,11 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi /** * @generated */ + @Override protected ISchedulingRule getSaveRule(Object element) { ResourceSetInfo info = getResourceSetInfo(element); if (info != null) { - LinkedList<ISchedulingRule> rules = new LinkedList<ISchedulingRule>(); + LinkedList<ISchedulingRule> rules = new LinkedList<>(); for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) { Resource nextResource = it.next(); IFile file = WorkspaceSynchronizer.getFile(nextResource); @@ -452,10 +464,11 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi /** * @generated */ + @Override protected ISchedulingRule getSynchronizeRule(Object element) { ResourceSetInfo info = getResourceSetInfo(element); if (info != null) { - LinkedList<ISchedulingRule> rules = new LinkedList<ISchedulingRule>(); + LinkedList<ISchedulingRule> rules = new LinkedList<>(); for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) { Resource nextResource = it.next(); IFile file = WorkspaceSynchronizer.getFile(nextResource); @@ -471,10 +484,11 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi /** * @generated */ + @Override protected ISchedulingRule getValidateStateRule(Object element) { ResourceSetInfo info = getResourceSetInfo(element); if (info != null) { - LinkedList<ISchedulingRule> files = new LinkedList<ISchedulingRule>(); + LinkedList<ISchedulingRule> files = new LinkedList<>(); for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) { Resource nextResource = it.next(); IFile file = WorkspaceSynchronizer.getFile(nextResource); @@ -482,8 +496,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi files.add(file); } } - return ResourcesPlugin.getWorkspace().getRuleFactory() - .validateEditRule(files.toArray(new IFile[files.size()])); + return ResourcesPlugin.getWorkspace().getRuleFactory().validateEditRule(files.toArray(new IFile[files.size()])); } return null; } @@ -513,6 +526,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi /** * @generated */ + @Override protected void doSynchronize(Object element, IProgressMonitor monitor) throws CoreException { ResourceSetInfo info = getResourceSetInfo(element); if (info != null) { @@ -528,31 +542,32 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi /** * @generated */ + @Override protected void doSaveDocument(IProgressMonitor monitor, Object element, IDocument document, boolean overwrite) throws CoreException { ResourceSetInfo info = getResourceSetInfo(element); if (info != null) { if (!overwrite && !info.isSynchronized()) { - throw new CoreException( - new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, IResourceStatus.OUT_OF_SYNC_LOCAL, - Messages.UMLDocumentProvider_UnsynchronizedFileSaveError, null)); + throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, + IResourceStatus.OUT_OF_SYNC_LOCAL, + Messages.UMLDocumentProvider_UnsynchronizedFileSaveError, + null)); } info.stopResourceListening(); fireElementStateChanging(element); try { - monitor.beginTask(Messages.UMLDocumentProvider_SaveDiagramTask, - info.getResourceSet().getResources().size() + 1); //"Saving diagram" + monitor.beginTask(Messages.UMLDocumentProvider_SaveDiagramTask, info.getResourceSet().getResources().size() + 1); // "Saving diagram" for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) { Resource nextResource = it.next(); - monitor.setTaskName( - NLS.bind(Messages.UMLDocumentProvider_SaveNextResourceTask, nextResource.getURI())); + monitor.setTaskName(NLS.bind( + Messages.UMLDocumentProvider_SaveNextResourceTask, + nextResource.getURI())); if (nextResource.isLoaded() && !info.getEditingDomain().isReadOnly(nextResource)) { try { nextResource.save(UMLDiagramEditorUtil.getSaveOptions()); } catch (IOException e) { fireElementStateChangeFailed(element); - throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, - EditorStatusCodes.RESOURCE_FAILURE, e.getLocalizedMessage(), null)); + throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, EditorStatusCodes.RESOURCE_FAILURE, e.getLocalizedMessage(), null)); } } monitor.worked(1); @@ -577,28 +592,23 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi } else { fireElementStateChangeFailed(element); throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, - NLS.bind(Messages.UMLDocumentProvider_IncorrectInputError, - new Object[] { element, "org.eclipse.ui.part.FileEditorInput", //$NON-NLS-1$ - "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ + NLS.bind( + Messages.UMLDocumentProvider_IncorrectInputError, + new Object[] { element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$ null)); } if (false == document instanceof IDiagramDocument) { fireElementStateChangeFailed(element); throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, - "Incorrect document used: " + document //$NON-NLS-1$ - + " instead of org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument", //$NON-NLS-1$ - null)); + "Incorrect document used: " + document + " instead of org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument", null)); //$NON-NLS-1$ //$NON-NLS-2$ } IDiagramDocument diagramDocument = (IDiagramDocument) document; - final Resource newResource = diagramDocument.getEditingDomain().getResourceSet() - .createResource(newResoruceURI); + final Resource newResource = diagramDocument.getEditingDomain().getResourceSet().createResource(newResoruceURI); final Diagram diagramCopy = EcoreUtil.copy(diagramDocument.getDiagram()); try { - new AbstractTransactionalCommand(diagramDocument.getEditingDomain(), - NLS.bind(Messages.UMLDocumentProvider_SaveAsOperation, diagramCopy.getName()), affectedFiles) { + new AbstractTransactionalCommand(diagramDocument.getEditingDomain(), NLS.bind(Messages.UMLDocumentProvider_SaveAsOperation, diagramCopy.getName()), affectedFiles) { @Override - protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) - throws ExecutionException { + protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { newResource.getContents().add(diagramCopy); return CommandResult.newOKCommandResult(); } @@ -606,12 +616,10 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi newResource.save(UMLDiagramEditorUtil.getSaveOptions()); } catch (ExecutionException e) { fireElementStateChangeFailed(element); - throw new CoreException( - new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, e.getLocalizedMessage(), null)); + throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, e.getLocalizedMessage(), null)); } catch (IOException e) { fireElementStateChangeFailed(element); - throw new CoreException( - new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, e.getLocalizedMessage(), null)); + throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, e.getLocalizedMessage(), null)); } newResource.unload(); } @@ -626,8 +634,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi try { file.refreshLocal(IResource.DEPTH_INFINITE, monitor); } catch (CoreException ex) { - UMLDiagramEditorPlugin.getInstance().logError(Messages.UMLDocumentProvider_handleElementContentChanged, - ex); + UMLDiagramEditorPlugin.getInstance().logError(Messages.UMLDocumentProvider_handleElementContentChanged, ex); // Error message to log was initially taken from org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal.l10n.EditorMessages.FileDocumentProvider_handleElementContentChanged } } @@ -653,8 +660,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi */ protected void handleElementMoved(IEditorInput input, URI uri) { if (input instanceof FileEditorInput) { - IFile newFile = ResourcesPlugin.getWorkspace().getRoot() - .getFile(new Path(URI.decode(uri.path())).removeFirstSegments(1)); + IFile newFile = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(URI.decode(uri.path())).removeFirstSegments(1)); fireElementMoved(input, newFile == null ? null : new FileEditorInput(newFile)); return; } @@ -665,6 +671,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi /** * @generated */ + @Override public IEditorInput createInputWithEditingDomain(IEditorInput editorInput, TransactionalEditingDomain domain) { return editorInput; } @@ -672,6 +679,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi /** * @generated */ + @Override public IDiagramDocument getDiagramDocument(Object element) { IDocument doc = getDocument(element); if (doc instanceof IDiagramDocument) { @@ -683,6 +691,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi /** * @generated */ + @Override protected IRunnableContext getOperationRunner(IProgressMonitor monitor) { return null; } @@ -705,7 +714,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi /** * @generated */ - private LinkedList<Resource> myUnSynchronizedResources = new LinkedList<Resource>(); + private LinkedList<Resource> myUnSynchronizedResources = new LinkedList<>(); /** * @generated @@ -781,7 +790,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi * @generated */ public Iterator<Resource> getLoadedResourcesIterator() { - return new ArrayList<Resource>(getResourceSet().getResources()).iterator(); + return new ArrayList<>(getResourceSet().getResources()).iterator(); } /** @@ -890,12 +899,14 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi /** * @generated */ + @Override public void dispose() { } /** * @generated */ + @Override public boolean handleResourceChanged(final Resource resource) { synchronized (ResourceSetInfo.this) { if (ResourceSetInfo.this.fCanBeSaved) { @@ -915,6 +926,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi /** * @generated */ + @Override public boolean handleResourceDeleted(Resource resource) { synchronized (ResourceSetInfo.this) { if (ResourceSetInfo.this.fCanBeSaved) { @@ -934,6 +946,7 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi /** * @generated */ + @Override public boolean handleResourceMoved(Resource resource, final URI newURI) { synchronized (ResourceSetInfo.this) { if (ResourceSetInfo.this.fCanBeSaved) { @@ -978,14 +991,13 @@ public class UMLDocumentProvider extends AbstractDocumentProvider implements IDi */ public ResourceSetModificationListener(ResourceSetInfo info) { myInfo = info; - myModifiedFilter = NotificationFilter.createEventTypeFilter(Notification.SET) - .or(NotificationFilter.createEventTypeFilter(Notification.UNSET)) - .and(NotificationFilter.createFeatureFilter(Resource.class, Resource.RESOURCE__IS_MODIFIED)); + myModifiedFilter = NotificationFilter.createEventTypeFilter(Notification.SET).or(NotificationFilter.createEventTypeFilter(Notification.UNSET)).and(NotificationFilter.createFeatureFilter(Resource.class, Resource.RESOURCE__IS_MODIFIED)); } /** * @generated */ + @Override public void notifyChanged(Notification notification) { if (notification.getNotifier() instanceof ResourceSet) { super.notifyChanged(notification); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLInitDiagramFileAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLInitDiagramFileAction.java index 94ff4b67720..bf1f2964fbe 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLInitDiagramFileAction.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLInitDiagramFileAction.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -50,6 +50,7 @@ public class UMLInitDiagramFileAction implements IObjectActionDelegate { /** * @generated */ + @Override public void setActivePart(IAction action, IWorkbenchPart targetPart) { this.targetPart = targetPart; } @@ -57,6 +58,7 @@ public class UMLInitDiagramFileAction implements IObjectActionDelegate { /** * @generated */ + @Override public void selectionChanged(IAction action, ISelection selection) { domainModelURI = null; action.setEnabled(false); @@ -78,6 +80,7 @@ public class UMLInitDiagramFileAction implements IObjectActionDelegate { /** * @generated */ + @Override public void run(IAction action) { TransactionalEditingDomain editingDomain = WorkspaceEditingDomainFactory.INSTANCE.createEditingDomain(); ResourceSet resourceSet = editingDomain.getResourceSet(); @@ -86,15 +89,19 @@ public class UMLInitDiagramFileAction implements IObjectActionDelegate { Resource resource = resourceSet.getResource(domainModelURI, true); diagramRoot = resource.getContents().get(0); } catch (WrappedException ex) { - UMLDiagramEditorPlugin.getInstance().logError("Unable to load resource: " + domainModelURI, ex); //$NON-NLS-1$ + UMLDiagramEditorPlugin.getInstance().logError( + "Unable to load resource: " + domainModelURI, ex); //$NON-NLS-1$ } if (diagramRoot == null) { - MessageDialog.openError(getShell(), Messages.InitDiagramFile_ResourceErrorDialogTitle, + MessageDialog.openError(getShell(), + Messages.InitDiagramFile_ResourceErrorDialogTitle, Messages.InitDiagramFile_ResourceErrorDialogMessage); return; } Wizard wizard = new UMLNewDiagramFileWizard(domainModelURI, diagramRoot, editingDomain); - wizard.setWindowTitle(NLS.bind(Messages.InitDiagramFile_WizardTitle, ModelEditPart.MODEL_ID)); + wizard.setWindowTitle(NLS.bind( + Messages.InitDiagramFile_WizardTitle, + ModelEditPart.MODEL_ID)); UMLDiagramEditorUtil.runWizard(getShell(), wizard, "InitDiagramFile"); //$NON-NLS-1$ } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLLinkDescriptor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLLinkDescriptor.java index 76db5f3b072..b5da1c32cf0 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLLinkDescriptor.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLLinkDescriptor.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLMatchingStrategy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLMatchingStrategy.java index 387f9dc0ca9..e07c657ae3e 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLMatchingStrategy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLMatchingStrategy.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -27,6 +27,7 @@ public class UMLMatchingStrategy implements IEditorMatchingStrategy { /** * @generated */ + @Override public boolean matches(IEditorReference editorRef, IEditorInput input) { IEditorInput editorInput; try { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLNewDiagramFileWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLNewDiagramFileWizard.java index ed0e6ab6d6e..0a07960252a 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLNewDiagramFileWizard.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLNewDiagramFileWizard.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -70,11 +70,11 @@ public class UMLNewDiagramFileWizard extends Wizard { assert diagramRoot != null : "Doagram root element must be specified"; //$NON-NLS-1$ assert editingDomain != null : "Editing domain must be specified"; //$NON-NLS-1$ - myFileCreationPage = new WizardNewFileCreationPage(Messages.UMLNewDiagramFileWizard_CreationPageName, - StructuredSelection.EMPTY); + myFileCreationPage = new WizardNewFileCreationPage(Messages.UMLNewDiagramFileWizard_CreationPageName, StructuredSelection.EMPTY); myFileCreationPage.setTitle(Messages.UMLNewDiagramFileWizard_CreationPageTitle); - myFileCreationPage.setDescription( - NLS.bind(Messages.UMLNewDiagramFileWizard_CreationPageDescription, ModelEditPart.MODEL_ID)); + myFileCreationPage.setDescription(NLS.bind( + Messages.UMLNewDiagramFileWizard_CreationPageDescription, + ModelEditPart.MODEL_ID)); IPath filePath; String fileName = URI.decode(domainModelURI.trimFileExtension().lastSegment()); if (domainModelURI.isPlatformResource()) { @@ -86,11 +86,10 @@ public class UMLNewDiagramFileWizard extends Wizard { throw new IllegalArgumentException("Unsupported URI: " + domainModelURI); //$NON-NLS-1$ } myFileCreationPage.setContainerFullPath(filePath); - myFileCreationPage - .setFileName(UMLDiagramEditorUtil.getUniqueFileName(filePath, fileName, "PapyrusUMLClass_diagram")); //$NON-NLS-1$ + myFileCreationPage.setFileName(UMLDiagramEditorUtil.getUniqueFileName( + filePath, fileName, "PapyrusUMLClass_diagram")); //$NON-NLS-1$ - diagramRootElementSelectionPage = new DiagramRootElementSelectionPage( - Messages.UMLNewDiagramFileWizard_RootSelectionPageName); + diagramRootElementSelectionPage = new DiagramRootElementSelectionPage(Messages.UMLNewDiagramFileWizard_RootSelectionPageName); diagramRootElementSelectionPage.setTitle(Messages.UMLNewDiagramFileWizard_RootSelectionPageTitle); diagramRootElementSelectionPage.setDescription(Messages.UMLNewDiagramFileWizard_RootSelectionPageDescription); diagramRootElementSelectionPage.setModelElement(diagramRoot); @@ -101,6 +100,7 @@ public class UMLNewDiagramFileWizard extends Wizard { /** * @generated */ + @Override public void addPages() { addPage(myFileCreationPage); addPage(diagramRootElementSelectionPage); @@ -109,41 +109,48 @@ public class UMLNewDiagramFileWizard extends Wizard { /** * @generated */ + @Override public boolean performFinish() { - LinkedList<IFile> affectedFiles = new LinkedList<IFile>(); + LinkedList<IFile> affectedFiles = new LinkedList<>(); IFile diagramFile = myFileCreationPage.createNewFile(); UMLDiagramEditorUtil.setCharset(diagramFile); affectedFiles.add(diagramFile); URI diagramModelURI = URI.createPlatformResourceURI(diagramFile.getFullPath().toString(), true); ResourceSet resourceSet = myEditingDomain.getResourceSet(); final Resource diagramResource = resourceSet.createResource(diagramModelURI); - AbstractTransactionalCommand command = new AbstractTransactionalCommand(myEditingDomain, - Messages.UMLNewDiagramFileWizard_InitDiagramCommand, affectedFiles) { + AbstractTransactionalCommand command = new AbstractTransactionalCommand( + myEditingDomain, Messages.UMLNewDiagramFileWizard_InitDiagramCommand, affectedFiles) { @Override - protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) + protected CommandResult doExecuteWithResult( + IProgressMonitor monitor, IAdaptable info) throws ExecutionException { - String diagramVID = UMLVisualIDRegistry - .getDiagramVisualID(diagramRootElementSelectionPage.getModelElement()); + String diagramVID = UMLVisualIDRegistry.getDiagramVisualID(diagramRootElementSelectionPage.getModelElement()); if (diagramVID.equals(ModelEditPart.VISUAL_ID)) { - return CommandResult.newErrorCommandResult(Messages.UMLNewDiagramFileWizard_IncorrectRootError); + return CommandResult.newErrorCommandResult( + Messages.UMLNewDiagramFileWizard_IncorrectRootError); } - Diagram diagram = ViewService.createDiagram(diagramRootElementSelectionPage.getModelElement(), - ModelEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT); + Diagram diagram = ViewService.createDiagram( + diagramRootElementSelectionPage.getModelElement(), ModelEditPart.MODEL_ID, + UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT); diagramResource.getContents().add(diagram); return CommandResult.newOKCommandResult(); } }; try { - OperationHistoryFactory.getOperationHistory().execute(command, new NullProgressMonitor(), null); + OperationHistoryFactory.getOperationHistory().execute( + command, new NullProgressMonitor(), null); diagramResource.save(UMLDiagramEditorUtil.getSaveOptions()); UMLDiagramEditorUtil.openDiagram(diagramResource); } catch (ExecutionException e) { - UMLDiagramEditorPlugin.getInstance().logError("Unable to create model and diagram", e); //$NON-NLS-1$ + UMLDiagramEditorPlugin.getInstance().logError( + "Unable to create model and diagram", e); //$NON-NLS-1$ } catch (IOException ex) { - UMLDiagramEditorPlugin.getInstance().logError("Save operation failed for: " + diagramModelURI, ex); //$NON-NLS-1$ + UMLDiagramEditorPlugin.getInstance().logError( + "Save operation failed for: " + diagramModelURI, ex); //$NON-NLS-1$ } catch (PartInitException ex) { - UMLDiagramEditorPlugin.getInstance().logError("Unable to open editor", ex); //$NON-NLS-1$ + UMLDiagramEditorPlugin.getInstance().logError( + "Unable to open editor", ex); //$NON-NLS-1$ } return true; } @@ -163,6 +170,7 @@ public class UMLNewDiagramFileWizard extends Wizard { /** * @generated */ + @Override protected String getSelectionTitle() { return Messages.UMLNewDiagramFileWizard_RootSelectionPageSelectionTitle; } @@ -170,13 +178,15 @@ public class UMLNewDiagramFileWizard extends Wizard { /** * @generated */ + @Override protected boolean validatePage() { if (getModelElement() == null) { setErrorMessage(Messages.UMLNewDiagramFileWizard_RootSelectionPageNoSelectionMessage); return false; } - boolean result = ViewService.getInstance() - .provides(new CreateDiagramViewOperation(new EObjectAdapter(getModelElement()), + boolean result = ViewService.getInstance().provides( + new CreateDiagramViewOperation( + new EObjectAdapter(getModelElement()), ModelEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT)); setErrorMessage(result ? null : Messages.UMLNewDiagramFileWizard_RootSelectionPageInvalidSelectionMessage); return result; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLNodeDescriptor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLNodeDescriptor.java index 6fbc36ca7f4..78a97ae9cf5 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLNodeDescriptor.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLNodeDescriptor.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLUriEditorInputTester.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLUriEditorInputTester.java index 7dd3ffda409..fb7abdd0d7d 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLUriEditorInputTester.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLUriEditorInputTester.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -24,6 +24,7 @@ public class UMLUriEditorInputTester extends PropertyTester { /** * @generated */ + @Override public boolean test(Object receiver, String method, Object[] args, Object expectedValue) { if (false == receiver instanceof URIEditorInput) { return false; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLVisualIDRegistry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLVisualIDRegistry.java index fcd45b042e3..4267abca07b 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLVisualIDRegistry.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/UMLVisualIDRegistry.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -23,14 +23,13 @@ import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.*; import org.eclipse.papyrus.uml.diagram.clazz.expressions.UMLOCLFactory; import org.eclipse.uml2.uml.InstanceSpecification; import org.eclipse.uml2.uml.Package; -import org.eclipse.uml2.uml.Property; import org.eclipse.uml2.uml.UMLPackage; /** * This registry is used to determine which type of visual object should be * created for the corresponding Diagram, Node, ChildNode or Link represented * by a domain model object. - * + * * @generated */ public class UMLVisualIDRegistry { @@ -100,15 +99,13 @@ public class UMLVisualIDRegistry { if (domainElement == null) { return ""; } - String containerModelID = org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry - .getModelID(containerView); + String containerModelID = org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry.getModelID(containerView); if (!ModelEditPart.MODEL_ID.equals(containerModelID)) { return ""; } String containerVisualID; if (ModelEditPart.MODEL_ID.equals(containerModelID)) { - containerVisualID = org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry - .getVisualID(containerView); + containerVisualID = org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry.getVisualID(containerView); } else { if (containerView instanceof Diagram) { containerVisualID = ModelEditPart.VISUAL_ID; @@ -128,8 +125,7 @@ public class UMLVisualIDRegistry { if (UMLPackage.eINSTANCE.getAssociation().isSuperTypeOf(domainElement.eClass())) { return AssociationNodeEditPart.VISUAL_ID; } - if (UMLPackage.eINSTANCE.getInstanceSpecification().isSuperTypeOf(domainElement.eClass()) - && isInstanceSpecification_Shape((InstanceSpecification) domainElement)) { + if (UMLPackage.eINSTANCE.getInstanceSpecification().isSuperTypeOf(domainElement.eClass()) && isInstanceSpecification_Shape((InstanceSpecification) domainElement)) { return InstanceSpecificationEditPart.VISUAL_ID; } if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) { @@ -417,8 +413,7 @@ public class UMLVisualIDRegistry { } break; case ModelPackageableElementCompartmentEditPartCN.VISUAL_ID: - if (UMLPackage.eINSTANCE.getInstanceSpecification().isSuperTypeOf(domainElement.eClass()) - && isInstanceSpecification_Shape_CN((InstanceSpecification) domainElement)) { + if (UMLPackage.eINSTANCE.getInstanceSpecification().isSuperTypeOf(domainElement.eClass()) && isInstanceSpecification_Shape_CN((InstanceSpecification) domainElement)) { return InstanceSpecificationEditPartCN.VISUAL_ID; } if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) { @@ -459,8 +454,7 @@ public class UMLVisualIDRegistry { } break; case PackagePackageableElementCompartmentEditPartCN.VISUAL_ID: - if (UMLPackage.eINSTANCE.getInstanceSpecification().isSuperTypeOf(domainElement.eClass()) - && isInstanceSpecification_Shape_CN((InstanceSpecification) domainElement)) { + if (UMLPackage.eINSTANCE.getInstanceSpecification().isSuperTypeOf(domainElement.eClass()) && isInstanceSpecification_Shape_CN((InstanceSpecification) domainElement)) { return InstanceSpecificationEditPartCN.VISUAL_ID; } if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) { @@ -654,8 +648,7 @@ public class UMLVisualIDRegistry { } break; case ModelPackageableElementCompartmentEditPartTN.VISUAL_ID: - if (UMLPackage.eINSTANCE.getInstanceSpecification().isSuperTypeOf(domainElement.eClass()) - && isInstanceSpecification_Shape_CN((InstanceSpecification) domainElement)) { + if (UMLPackage.eINSTANCE.getInstanceSpecification().isSuperTypeOf(domainElement.eClass()) && isInstanceSpecification_Shape_CN((InstanceSpecification) domainElement)) { return InstanceSpecificationEditPartCN.VISUAL_ID; } if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) { @@ -696,8 +689,7 @@ public class UMLVisualIDRegistry { } break; case PackagePackageableElementCompartmentEditPart.VISUAL_ID: - if (UMLPackage.eINSTANCE.getInstanceSpecification().isSuperTypeOf(domainElement.eClass()) - && isInstanceSpecification_Shape_CN((InstanceSpecification) domainElement)) { + if (UMLPackage.eINSTANCE.getInstanceSpecification().isSuperTypeOf(domainElement.eClass()) && isInstanceSpecification_Shape_CN((InstanceSpecification) domainElement)) { return InstanceSpecificationEditPartCN.VISUAL_ID; } if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) { @@ -756,8 +748,7 @@ public class UMLVisualIDRegistry { if (UMLPackage.eINSTANCE.getClassifierTemplateParameter().isSuperTypeOf(domainElement.eClass())) { return ClassifierTemplateParameterEditPart.VISUAL_ID; } - if (UMLPackage.eINSTANCE.getConnectableElementTemplateParameter() - .isSuperTypeOf(domainElement.eClass())) { + if (UMLPackage.eINSTANCE.getConnectableElementTemplateParameter().isSuperTypeOf(domainElement.eClass())) { return ConnectableElementTemplateParameterEditPart.VISUAL_ID; } if (UMLPackage.eINSTANCE.getOperationTemplateParameter().isSuperTypeOf(domainElement.eClass())) { @@ -787,15 +778,13 @@ public class UMLVisualIDRegistry { * @generated */ public static boolean canCreateNode(View containerView, String nodeVisualID) { - String containerModelID = org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry - .getModelID(containerView); + String containerModelID = org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry.getModelID(containerView); if (!ModelEditPart.MODEL_ID.equals(containerModelID)) { return false; } String containerVisualID; if (ModelEditPart.MODEL_ID.equals(containerModelID)) { - containerVisualID = org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry - .getVisualID(containerView); + containerVisualID = org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry.getVisualID(containerView); } else { if (containerView instanceof Diagram) { containerVisualID = ModelEditPart.VISUAL_ID; @@ -1997,8 +1986,7 @@ public class UMLVisualIDRegistry { if (UMLPackage.eINSTANCE.getGeneralizationSet().isSuperTypeOf(domainElement.eClass())) { return GeneralizationSetEditPart.VISUAL_ID; } - if (UMLPackage.eINSTANCE.getInstanceSpecification().isSuperTypeOf(domainElement.eClass()) - && isInstanceSpecification_Edge((InstanceSpecification) domainElement)) { + if (UMLPackage.eINSTANCE.getInstanceSpecification().isSuperTypeOf(domainElement.eClass()) && isInstanceSpecification_Edge((InstanceSpecification) domainElement)) { return InstanceSpecificationLinkEditPart.VISUAL_ID; } if (UMLPackage.eINSTANCE.getInformationFlow().isSuperTypeOf(domainElement.eClass())) { @@ -2010,7 +1998,7 @@ public class UMLVisualIDRegistry { /** * User can change implementation of this method to handle some specific * situations not covered by default logic. - * + * * @generated */ private static boolean isDiagram(Package element) { @@ -2021,8 +2009,7 @@ public class UMLVisualIDRegistry { * @generated */ private static boolean isInstanceSpecification_Shape(InstanceSpecification domainElement) { - Object result = UMLOCLFactory.getExpression(1, UMLPackage.eINSTANCE.getInstanceSpecification(), null) - .evaluate(domainElement); + Object result = UMLOCLFactory.getExpression(1, UMLPackage.eINSTANCE.getInstanceSpecification(), null).evaluate(domainElement); return result instanceof Boolean && ((Boolean) result).booleanValue(); } @@ -2030,8 +2017,7 @@ public class UMLVisualIDRegistry { * @generated */ private static boolean isInstanceSpecification_Shape_CN(InstanceSpecification domainElement) { - Object result = UMLOCLFactory.getExpression(1, UMLPackage.eINSTANCE.getInstanceSpecification(), null) - .evaluate(domainElement); + Object result = UMLOCLFactory.getExpression(1, UMLPackage.eINSTANCE.getInstanceSpecification(), null).evaluate(domainElement); return result instanceof Boolean && ((Boolean) result).booleanValue(); } @@ -2039,8 +2025,7 @@ public class UMLVisualIDRegistry { * @generated */ private static boolean isInstanceSpecification_Edge(InstanceSpecification domainElement) { - Object result = UMLOCLFactory.getExpression(1, UMLPackage.eINSTANCE.getInstanceSpecification(), null) - .evaluate(domainElement); + Object result = UMLOCLFactory.getExpression(1, UMLPackage.eINSTANCE.getInstanceSpecification(), null).evaluate(domainElement); return result instanceof Boolean && ((Boolean) result).booleanValue(); } @@ -2049,7 +2034,7 @@ public class UMLVisualIDRegistry { */ public static boolean checkNodeVisualID(View containerView, EObject domainElement, String candidate) { if (candidate == null) { - //unrecognized id is always bad + // unrecognized id is always bad return false; } String basic = getNodeVisualID(containerView, domainElement); @@ -2200,8 +2185,7 @@ public class UMLVisualIDRegistry { */ @Override public String getNodeVisualID(View containerView, EObject domainElement) { - return org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry.getNodeVisualID(containerView, - domainElement); + return org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry.getNodeVisualID(containerView, domainElement); } /** @@ -2209,8 +2193,7 @@ public class UMLVisualIDRegistry { */ @Override public boolean checkNodeVisualID(View containerView, EObject domainElement, String candidate) { - return org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry.checkNodeVisualID(containerView, - domainElement, candidate); + return org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry.checkNodeVisualID(containerView, domainElement, candidate); } /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/ValidateAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/ValidateAction.java index ca806a74d8a..f49912bdc6b 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/ValidateAction.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/part/ValidateAction.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -72,18 +72,22 @@ public class ValidateAction extends Action { /** * @generated */ + @Override public void run() { IWorkbenchPart workbenchPart = page.getActivePart(); if (workbenchPart instanceof IDiagramWorkbenchPart) { final IDiagramWorkbenchPart part = (IDiagramWorkbenchPart) workbenchPart; try { - new WorkspaceModifyDelegatingOperation(new IRunnableWithProgress() { + new WorkspaceModifyDelegatingOperation( + new IRunnableWithProgress() { - @Override - public void run(IProgressMonitor monitor) throws InterruptedException, InvocationTargetException { - runValidation(part.getDiagramEditPart(), part.getDiagram()); - } - }).run(new NullProgressMonitor()); + @Override + public void run(IProgressMonitor monitor) + throws InterruptedException, InvocationTargetException { + runValidation(part.getDiagramEditPart(), part.getDiagram()); + } + }) + .run(new NullProgressMonitor()); } catch (Exception e) { UMLDiagramEditorPlugin.getInstance().logError("Validation action failed", e); //$NON-NLS-1$ } @@ -96,8 +100,8 @@ public class ValidateAction extends Action { public static void runValidation(View view) { try { if (UMLDiagramEditorUtil.openDiagram(view.eResource())) { - IEditorPart editorPart = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage() - .getActiveEditor(); + IEditorPart editorPart = PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getActivePage().getActiveEditor(); if (editorPart instanceof IDiagramWorkbenchPart) { runValidation(((IDiagramWorkbenchPart) editorPart).getDiagramEditPart(), view); } else { @@ -105,7 +109,8 @@ public class ValidateAction extends Action { } } } catch (Exception e) { - UMLDiagramEditorPlugin.getInstance().logError("Validation action failed", e); //$NON-NLS-1$ + UMLDiagramEditorPlugin.getInstance().logError( + "Validation action failed", e); //$NON-NLS-1$ } } @@ -118,8 +123,8 @@ public class ValidateAction extends Action { shell = new Shell(); } - DiagramEditPart diagramEditPart = OffscreenEditPartFactory.getInstance() - .createDiagramEditPart(view.getDiagram(), shell); + DiagramEditPart diagramEditPart = OffscreenEditPartFactory.getInstance().createDiagramEditPart( + view.getDiagram(), shell); runValidation(diagramEditPart, view); } @@ -165,8 +170,8 @@ public class ValidateAction extends Action { } Diagnostic diagnostic = runEMFValidator(view); createMarkers(target, diagnostic, diagramEditPart); - IBatchValidator validator = (IBatchValidator) ModelValidationService.getInstance() - .newValidator(EvaluationMode.BATCH); + IBatchValidator validator = (IBatchValidator) ModelValidationService.getInstance().newValidator( + EvaluationMode.BATCH); validator.setIncludeLiveConstraints(true); if (view.isSetElement() && view.getElement() != null) { IStatus status = validator.validate(view.getElement()); @@ -188,10 +193,11 @@ public class ValidateAction extends Action { collectTargetElements(rootStatus, new HashSet<EObject>(), allStatuses)); for (Iterator it = allStatuses.iterator(); it.hasNext();) { IConstraintStatus nextStatus = (IConstraintStatus) it.next(); - View view = UMLDiagramEditorUtil.findView(diagramEditPart, nextStatus.getTarget(), element2ViewMap); + View view = UMLDiagramEditorUtil.findView( + diagramEditPart, nextStatus.getTarget(), element2ViewMap); addMarker(diagramEditPart.getViewer(), target, view.eResource().getURIFragment(view), - EMFCoreUtil.getQualifiedName(nextStatus.getTarget(), true), nextStatus.getMessage(), - nextStatus.getSeverity()); + EMFCoreUtil.getQualifiedName(nextStatus.getTarget(), true), + nextStatus.getMessage(), nextStatus.getSeverity()); } } @@ -203,7 +209,7 @@ public class ValidateAction extends Action { return; } final Diagnostic rootStatus = emfValidationStatus; - List<Diagnostic> allDiagnostics = new ArrayList<Diagnostic>(); + List<Diagnostic> allDiagnostics = new ArrayList<>(); UMLDiagramEditorUtil.LazyElement2ViewMap element2ViewMap = new UMLDiagramEditorUtil.LazyElement2ViewMap( diagramEditPart.getDiagramView(), collectTargetElements(rootStatus, new HashSet<EObject>(), allDiagnostics)); @@ -212,10 +218,11 @@ public class ValidateAction extends Action { List<?> data = nextDiagnostic.getData(); if (data != null && !data.isEmpty() && data.get(0) instanceof EObject) { EObject element = (EObject) data.get(0); - View view = UMLDiagramEditorUtil.findView(diagramEditPart, element, element2ViewMap); + View view = UMLDiagramEditorUtil.findView( + diagramEditPart, element, element2ViewMap); addMarker(diagramEditPart.getViewer(), target, view.eResource().getURIFragment(view), - EMFCoreUtil.getQualifiedName(element, true), nextDiagnostic.getMessage(), - diagnosticToStatusSeverity(nextDiagnostic.getSeverity())); + EMFCoreUtil.getQualifiedName(element, true), + nextDiagnostic.getMessage(), diagnosticToStatusSeverity(nextDiagnostic.getSeverity())); } } } @@ -223,12 +230,12 @@ public class ValidateAction extends Action { /** * @generated */ - private static void addMarker(EditPartViewer viewer, IFile target, String elementId, String location, - String message, int statusSeverity) { + private static void addMarker(EditPartViewer viewer, IFile target, String elementId, String location, String message, int statusSeverity) { if (target == null) { return; } - UMLMarkerNavigationProvider.addMarker(target, elementId, location, message, statusSeverity); + UMLMarkerNavigationProvider.addMarker( + target, elementId, location, message, statusSeverity); } /** @@ -241,7 +248,8 @@ public class ValidateAction extends Action { return IStatus.INFO; } else if (diagnosticSeverity == Diagnostic.WARNING) { return IStatus.WARNING; - } else if (diagnosticSeverity == Diagnostic.ERROR || diagnosticSeverity == Diagnostic.CANCEL) { + } else if (diagnosticSeverity == Diagnostic.ERROR + || diagnosticSeverity == Diagnostic.CANCEL) { return IStatus.ERROR; } return IStatus.INFO; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramAppearancePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramAppearancePreferencePage.java index 8c1b2990d21..e2732253181 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramAppearancePreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramAppearancePreferencePage.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramConnectionsPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramConnectionsPreferencePage.java index fd5d973a117..6e65e56c958 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramConnectionsPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramConnectionsPreferencePage.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramGeneralPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramGeneralPreferencePage.java index a4d0c5a42cf..fb676204a1d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramGeneralPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramGeneralPreferencePage.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramPreferenceInitializer.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramPreferenceInitializer.java index 607afbf2e93..e7939a87595 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramPreferenceInitializer.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramPreferenceInitializer.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014, 2017 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation * Fanch BONNABESSE (ALL4TEC) fanch.bonnabesse@all4tec.net - Bug 512207 @@ -15,6 +15,10 @@ package org.eclipse.papyrus.uml.diagram.clazz.preferences; import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; +import org.eclipse.gmf.runtime.diagram.ui.preferences.AppearancePreferencePage; +import org.eclipse.gmf.runtime.diagram.ui.preferences.ConnectionsPreferencePage; +import org.eclipse.gmf.runtime.diagram.ui.preferences.DiagramsPreferencePage; +import org.eclipse.gmf.runtime.diagram.ui.preferences.PrintingPreferencePage; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin; @@ -26,12 +30,13 @@ public class DiagramPreferenceInitializer extends AbstractPreferenceInitializer /** * @generated */ + @Override public void initializeDefaultPreferences() { IPreferenceStore store = getPreferenceStore(); - DiagramGeneralPreferencePage.initDefaults(store); - DiagramAppearancePreferencePage.initDefaults(store); - DiagramConnectionsPreferencePage.initDefaults(store); - DiagramPrintingPreferencePage.initDefaults(store); + DiagramsPreferencePage.initDefaults(store); + AppearancePreferencePage.initDefaults(store); + ConnectionsPreferencePage.initDefaults(store); + PrintingPreferencePage.initDefaults(store); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramPrintingPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramPrintingPreferencePage.java index 85c580f3799..1898d489b28 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramPrintingPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/preferences/DiagramPrintingPreferencePage.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/ElementInitializers.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/ElementInitializers.java index 21848587fa0..28e8f24c050 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/ElementInitializers.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/ElementInitializers.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -67,7 +67,8 @@ public class ElementInitializers { try { Object value_0 = name_AssociationClass_Shape(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -81,7 +82,8 @@ public class ElementInitializers { try { Object value_0 = name_InstanceSpecification_Shape(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -95,7 +97,8 @@ public class ElementInitializers { try { Object value_0 = name_Component_Shape(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -109,7 +112,8 @@ public class ElementInitializers { try { Object value_0 = name_Signal_Shape(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -123,7 +127,8 @@ public class ElementInitializers { try { Object value_0 = name_Interface_Shape(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -137,7 +142,8 @@ public class ElementInitializers { try { Object value_0 = name_Model_Shape(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -151,7 +157,8 @@ public class ElementInitializers { try { Object value_0 = name_Enumeration_Shape(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -165,7 +172,8 @@ public class ElementInitializers { try { Object value_0 = name_Package_Shape(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -179,7 +187,8 @@ public class ElementInitializers { try { Object value_0 = name_InformationItem_Shape(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -193,7 +202,8 @@ public class ElementInitializers { try { Object value_0 = name_Class_Shape(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -207,7 +217,8 @@ public class ElementInitializers { try { Object value_0 = name_PrimitiveType_Shape(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -221,7 +232,8 @@ public class ElementInitializers { try { Object value_0 = name_DataType_Shape(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -235,11 +247,13 @@ public class ElementInitializers { try { Object value_0 = name_Constraint_PackagedElementShape(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } Object value_1 = specification_Constraint_PackagedElementShape(instance); if (value_1 != null) { - instance.setSpecification((ValueSpecification) value_1); + instance.setSpecification( + (ValueSpecification) value_1); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -253,7 +267,8 @@ public class ElementInitializers { try { Object value_0 = UMLOCLFactory.getExpression(0, UMLPackage.eINSTANCE.getComment(), null).evaluate(instance); if (value_0 != null) { - instance.setBody((String) value_0); + instance.setBody( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -267,7 +282,8 @@ public class ElementInitializers { try { Object value_0 = name_DurationObservation_Shape(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -281,7 +297,8 @@ public class ElementInitializers { try { Object value_0 = name_TimeObservation_Shape(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -295,7 +312,8 @@ public class ElementInitializers { try { Object value_0 = name_Property_ClassAttributeLabel(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -309,7 +327,8 @@ public class ElementInitializers { try { Object value_0 = name_Property_ComponentAttributeLabel(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -323,11 +342,14 @@ public class ElementInitializers { try { Object value_0 = name_Property_SignalAttributeLabel(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } - instance.setLower(0); + instance.setLower( + 0); - instance.setUpper(1); + instance.setUpper( + 1); } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -341,7 +363,8 @@ public class ElementInitializers { try { Object value_0 = name_Property_InterfaceAttributeLabel(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -355,7 +378,8 @@ public class ElementInitializers { try { Object value_0 = name_Property_PrimitiveTypeAttributeLabel(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -369,7 +393,8 @@ public class ElementInitializers { try { Object value_0 = name_Property_DataTypeAttributeLabel(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -383,7 +408,8 @@ public class ElementInitializers { try { Object value_0 = name_Class_ClassNestedClassifierLabel(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -397,7 +423,8 @@ public class ElementInitializers { try { Object value_0 = name_Class_ComponentNestedClassifierLabel(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -411,7 +438,8 @@ public class ElementInitializers { try { Object value_0 = name_Class_InterfaceNestedClassifierLabel(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -425,7 +453,8 @@ public class ElementInitializers { try { Object value_0 = name_Operation_ClassOperationLabel(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -439,7 +468,8 @@ public class ElementInitializers { try { Object value_0 = name_Operation_ComponentOperationLabel(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -453,7 +483,8 @@ public class ElementInitializers { try { Object value_0 = name_Operation_InterfaceOperationLabel(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -467,7 +498,8 @@ public class ElementInitializers { try { Object value_0 = name_Operation_PrimitiveTypeOperationLabel(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -481,7 +513,8 @@ public class ElementInitializers { try { Object value_0 = name_Operation_DataTypeOperationLabel(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -495,7 +528,8 @@ public class ElementInitializers { try { Object value_0 = name_EnumerationLiteral_LiteralLabel(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -509,7 +543,8 @@ public class ElementInitializers { try { Object value_0 = name_Reception_ReceptionLabel(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -523,7 +558,8 @@ public class ElementInitializers { try { Object value_0 = name_Reception_InterfaceReceptionLabel(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -537,7 +573,8 @@ public class ElementInitializers { try { Object value_0 = name_RedefinableTemplateSignature_Shape(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -551,7 +588,8 @@ public class ElementInitializers { try { Object value_0 = name_InstanceSpecification_Shape_CN(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -565,7 +603,8 @@ public class ElementInitializers { try { Object value_0 = name_Component_Shape_CN(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -579,7 +618,8 @@ public class ElementInitializers { try { Object value_0 = name_Signal_Shape_CN(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -593,7 +633,8 @@ public class ElementInitializers { try { Object value_0 = name_Interface_Shape_CN(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -607,7 +648,8 @@ public class ElementInitializers { try { Object value_0 = name_Model_Shape_CN(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -621,7 +663,8 @@ public class ElementInitializers { try { Object value_0 = name_Enumeration_Shape_CN(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -635,7 +678,8 @@ public class ElementInitializers { try { Object value_0 = name_Package_Shape_CN(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -649,7 +693,8 @@ public class ElementInitializers { try { Object value_0 = name_InformationItem_Shape_CN(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -663,7 +708,8 @@ public class ElementInitializers { try { Object value_0 = name_Class_Shape_CN(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -677,7 +723,8 @@ public class ElementInitializers { try { Object value_0 = name_PrimitiveType_Shape_CN(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -691,7 +738,8 @@ public class ElementInitializers { try { Object value_0 = name_DataType_Shape_CN(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -705,7 +753,8 @@ public class ElementInitializers { try { Object value_0 = UMLOCLFactory.getExpression(0, UMLPackage.eINSTANCE.getComment(), null).evaluate(instance); if (value_0 != null) { - instance.setBody((String) value_0); + instance.setBody( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -719,11 +768,13 @@ public class ElementInitializers { try { Object value_0 = name_Constraint_PackagedElementShape_CN(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } Object value_1 = specification_Constraint_PackagedElementShape_CN(instance); if (value_1 != null) { - instance.setSpecification((ValueSpecification) value_1); + instance.setSpecification( + (ValueSpecification) value_1); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -737,7 +788,8 @@ public class ElementInitializers { try { Object value_0 = name_Interface_ClassNestedClassifierLabel(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -751,7 +803,8 @@ public class ElementInitializers { try { Object value_0 = name_Interface_ComponentNestedClassifierLabel(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -765,7 +818,8 @@ public class ElementInitializers { try { Object value_0 = name_Interface_InterfaceNestedClassifierLabel(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -779,7 +833,8 @@ public class ElementInitializers { try { Object value_0 = name_Enumeration_ClassNestedClassifierLabel(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -793,7 +848,8 @@ public class ElementInitializers { try { Object value_0 = name_Enumeration_ComponentNestedClassifierLabel(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -807,7 +863,8 @@ public class ElementInitializers { try { Object value_0 = name_Enumeration_InterfaceNestedClassifierLabel(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -821,7 +878,8 @@ public class ElementInitializers { try { Object value_0 = name_PrimitiveType_ClassNestedClassifierLabel(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -835,7 +893,8 @@ public class ElementInitializers { try { Object value_0 = name_PrimitiveType_ComponentNestedClassifierLabel(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -849,7 +908,8 @@ public class ElementInitializers { try { Object value_0 = name_PrimitiveType_InterfaceNestedClassifierLabel(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -863,7 +923,8 @@ public class ElementInitializers { try { Object value_0 = name_DataType_ClassNestedClassifierLabel(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -877,7 +938,8 @@ public class ElementInitializers { try { Object value_0 = name_DataType_ComponentNestedClassifierLabel(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -891,7 +953,8 @@ public class ElementInitializers { try { Object value_0 = name_DataType_InterfaceNestedClassifierLabel(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -905,7 +968,8 @@ public class ElementInitializers { try { Object value_0 = name_Signal_ClassNestedClassifierLabel(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -919,7 +983,8 @@ public class ElementInitializers { try { Object value_0 = name_Signal_ComponentNestedClassifierLabel(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -933,7 +998,8 @@ public class ElementInitializers { try { Object value_0 = name_Signal_InterfaceNestedClassifierLabel(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -947,7 +1013,8 @@ public class ElementInitializers { try { Object value_0 = name_Component_ClassNestedClassifierLabel(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -961,7 +1028,8 @@ public class ElementInitializers { try { Object value_0 = name_Component_InterfaceNestedClassifierLabel(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -975,7 +1043,8 @@ public class ElementInitializers { try { Object value_0 = name_Component_ComponentNestedClassifierLabel(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -989,7 +1058,8 @@ public class ElementInitializers { try { Object value_0 = name_AssociationClass_Edge(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -1003,7 +1073,8 @@ public class ElementInitializers { try { Object value_0 = name_Association_Edge(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -1017,7 +1088,8 @@ public class ElementInitializers { try { Object value_0 = name_InterfaceRealization_Edge(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -1031,7 +1103,8 @@ public class ElementInitializers { try { Object value_0 = name_Substitution_Edge(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -1045,7 +1118,8 @@ public class ElementInitializers { try { Object value_0 = name_Realization_Edge(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -1059,7 +1133,8 @@ public class ElementInitializers { try { Object value_0 = name_Abstraction_Edge(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -1073,7 +1148,8 @@ public class ElementInitializers { try { Object value_0 = name_Usage_Edge(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -1087,7 +1163,8 @@ public class ElementInitializers { try { Object value_0 = name_Dependency_Edge(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -1101,7 +1178,8 @@ public class ElementInitializers { try { Object value_0 = name_Dependency_BranchEdge(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -1115,7 +1193,8 @@ public class ElementInitializers { try { Object value_0 = alias_ElementImport_Edge(instance); if (value_0 != null) { - instance.setAlias((String) value_0); + instance.setAlias( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ @@ -1129,7 +1208,8 @@ public class ElementInitializers { try { Object value_0 = name_InformationFlow_Edge(instance); if (value_0 != null) { - instance.setName((String) value_0); + instance.setName( + (String) value_0); } } catch (RuntimeException e) { UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLEditPartProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLEditPartProvider.java index bd32a873479..25226968af5 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLEditPartProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLEditPartProvider.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -27,7 +27,9 @@ public class UMLEditPartProvider extends DefaultEditPartProvider { * @generated */ public UMLEditPartProvider() { - super(new UMLEditPartFactory(), UMLVisualIDRegistry.TYPED_INSTANCE, ModelEditPart.MODEL_ID); + super(new UMLEditPartFactory(), + UMLVisualIDRegistry.TYPED_INSTANCE, + ModelEditPart.MODEL_ID); } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLElementTypes.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLElementTypes.java index 4fd4d62790d..52a55c6be84 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLElementTypes.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLElementTypes.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -50,8 +50,7 @@ public class UMLElementTypes { /** * @generated */ - private static DiagramElementTypeImages elementTypeImages = new DiagramElementTypeImages( - UMLDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory()); + private static DiagramElementTypeImages elementTypeImages = new DiagramElementTypeImages(UMLDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory()); /** * @generated @@ -61,33 +60,27 @@ public class UMLElementTypes { /** * @generated */ - public static final IElementType Package_ClassDiagram = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Package_ClassDiagram"); //$NON-NLS-1$ + public static final IElementType Package_ClassDiagram = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Package_ClassDiagram"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Dependency_Shape = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Dependency_Shape"); //$NON-NLS-1$ + public static final IElementType Dependency_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Dependency_Shape"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType AssociationClass_Shape = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.AssociationClass_Shape"); //$NON-NLS-1$ + public static final IElementType AssociationClass_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.AssociationClass_Shape"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Association_Shape = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Association_Shape"); //$NON-NLS-1$ + public static final IElementType Association_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Association_Shape"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType InstanceSpecification_Shape = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.InstanceSpecification_Shape"); //$NON-NLS-1$ + public static final IElementType InstanceSpecification_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.InstanceSpecification_Shape"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Component_Shape = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Component_Shape"); //$NON-NLS-1$ + public static final IElementType Component_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Component_Shape"); //$NON-NLS-1$ /** * @generated */ @@ -95,8 +88,7 @@ public class UMLElementTypes { /** * @generated */ - public static final IElementType Interface_Shape = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Interface_Shape"); //$NON-NLS-1$ + public static final IElementType Interface_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Interface_Shape"); //$NON-NLS-1$ /** * @generated */ @@ -104,18 +96,15 @@ public class UMLElementTypes { /** * @generated */ - public static final IElementType Enumeration_Shape = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Enumeration_Shape"); //$NON-NLS-1$ + public static final IElementType Enumeration_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Enumeration_Shape"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Package_Shape = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Package_Shape"); //$NON-NLS-1$ + public static final IElementType Package_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Package_Shape"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType InformationItem_Shape = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.InformationItem_Shape"); //$NON-NLS-1$ + public static final IElementType InformationItem_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.InformationItem_Shape"); //$NON-NLS-1$ /** * @generated */ @@ -123,363 +112,291 @@ public class UMLElementTypes { /** * @generated */ - public static final IElementType PrimitiveType_Shape = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.PrimitiveType_Shape"); //$NON-NLS-1$ + public static final IElementType PrimitiveType_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.PrimitiveType_Shape"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType DataType_Shape = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.DataType_Shape"); //$NON-NLS-1$ + public static final IElementType DataType_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.DataType_Shape"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Constraint_PackagedElementShape = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Constraint_PackagedElementShape"); //$NON-NLS-1$ + public static final IElementType Constraint_PackagedElementShape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Constraint_PackagedElementShape"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Comment_Shape = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Comment_Shape"); //$NON-NLS-1$ + public static final IElementType Comment_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Comment_Shape"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Diagram_ShortcutShape = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Diagram_ShortcutShape"); //$NON-NLS-1$ + public static final IElementType Diagram_ShortcutShape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Diagram_ShortcutShape"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType DurationObservation_Shape = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.DurationObservation_Shape"); //$NON-NLS-1$ + public static final IElementType DurationObservation_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.DurationObservation_Shape"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType TimeObservation_Shape = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.TimeObservation_Shape"); //$NON-NLS-1$ + public static final IElementType TimeObservation_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.TimeObservation_Shape"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType NamedElement_DefaultShape = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.NamedElement_DefaultShape"); //$NON-NLS-1$ + public static final IElementType NamedElement_DefaultShape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.NamedElement_DefaultShape"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Property_ClassAttributeLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Property_ClassAttributeLabel"); //$NON-NLS-1$ + public static final IElementType Property_ClassAttributeLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Property_ClassAttributeLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Property_ComponentAttributeLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Property_ComponentAttributeLabel"); //$NON-NLS-1$ + public static final IElementType Property_ComponentAttributeLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Property_ComponentAttributeLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Property_SignalAttributeLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Property_SignalAttributeLabel"); //$NON-NLS-1$ + public static final IElementType Property_SignalAttributeLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Property_SignalAttributeLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Property_InterfaceAttributeLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Property_InterfaceAttributeLabel"); //$NON-NLS-1$ + public static final IElementType Property_InterfaceAttributeLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Property_InterfaceAttributeLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Property_PrimitiveTypeAttributeLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Property_PrimitiveTypeAttributeLabel"); //$NON-NLS-1$ + public static final IElementType Property_PrimitiveTypeAttributeLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Property_PrimitiveTypeAttributeLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Property_DataTypeAttributeLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Property_DataTypeAttributeLabel"); //$NON-NLS-1$ + public static final IElementType Property_DataTypeAttributeLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Property_DataTypeAttributeLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Class_ClassNestedClassifierLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Class_ClassNestedClassifierLabel"); //$NON-NLS-1$ + public static final IElementType Class_ClassNestedClassifierLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Class_ClassNestedClassifierLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Class_ComponentNestedClassifierLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Class_ComponentNestedClassifierLabel"); //$NON-NLS-1$ + public static final IElementType Class_ComponentNestedClassifierLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Class_ComponentNestedClassifierLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Class_InterfaceNestedClassifierLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Class_InterfaceNestedClassifierLabel"); //$NON-NLS-1$ + public static final IElementType Class_InterfaceNestedClassifierLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Class_InterfaceNestedClassifierLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Operation_ClassOperationLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Operation_ClassOperationLabel"); //$NON-NLS-1$ + public static final IElementType Operation_ClassOperationLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Operation_ClassOperationLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Operation_ComponentOperationLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Operation_ComponentOperationLabel"); //$NON-NLS-1$ + public static final IElementType Operation_ComponentOperationLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Operation_ComponentOperationLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Operation_InterfaceOperationLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Operation_InterfaceOperationLabel"); //$NON-NLS-1$ + public static final IElementType Operation_InterfaceOperationLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Operation_InterfaceOperationLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Operation_PrimitiveTypeOperationLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Operation_PrimitiveTypeOperationLabel"); //$NON-NLS-1$ + public static final IElementType Operation_PrimitiveTypeOperationLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Operation_PrimitiveTypeOperationLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Operation_DataTypeOperationLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Operation_DataTypeOperationLabel"); //$NON-NLS-1$ + public static final IElementType Operation_DataTypeOperationLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Operation_DataTypeOperationLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType ConnectableElementTemplateParameter_TemplateParameterLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.ConnectableElementTemplateParameter_TemplateParameterLabel"); //$NON-NLS-1$ + public static final IElementType ConnectableElementTemplateParameter_TemplateParameterLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.ConnectableElementTemplateParameter_TemplateParameterLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType OperationTemplateParameter_TemplateParameterLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.OperationTemplateParameter_TemplateParameterLabel"); //$NON-NLS-1$ + public static final IElementType OperationTemplateParameter_TemplateParameterLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.OperationTemplateParameter_TemplateParameterLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType ClassifierTemplateParameter_TemplateParameterLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.ClassifierTemplateParameter_TemplateParameterLabel"); //$NON-NLS-1$ + public static final IElementType ClassifierTemplateParameter_TemplateParameterLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.ClassifierTemplateParameter_TemplateParameterLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType TemplateParameter_TemplateParameterLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.TemplateParameter_TemplateParameterLabel"); //$NON-NLS-1$ + public static final IElementType TemplateParameter_TemplateParameterLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.TemplateParameter_TemplateParameterLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType EnumerationLiteral_LiteralLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.EnumerationLiteral_LiteralLabel"); //$NON-NLS-1$ + public static final IElementType EnumerationLiteral_LiteralLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.EnumerationLiteral_LiteralLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Reception_ReceptionLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Reception_ReceptionLabel"); //$NON-NLS-1$ + public static final IElementType Reception_ReceptionLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Reception_ReceptionLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Reception_InterfaceReceptionLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Reception_InterfaceReceptionLabel"); //$NON-NLS-1$ + public static final IElementType Reception_InterfaceReceptionLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Reception_InterfaceReceptionLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Slot_SlotLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Slot_SlotLabel"); //$NON-NLS-1$ + public static final IElementType Slot_SlotLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Slot_SlotLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType RedefinableTemplateSignature_Shape = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.RedefinableTemplateSignature_Shape"); //$NON-NLS-1$ + public static final IElementType RedefinableTemplateSignature_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.RedefinableTemplateSignature_Shape"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType TemplateSignature_Shape = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.TemplateSignature_Shape"); //$NON-NLS-1$ + public static final IElementType TemplateSignature_Shape = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.TemplateSignature_Shape"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType InstanceSpecification_Shape_CN = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.InstanceSpecification_Shape_CN"); //$NON-NLS-1$ + public static final IElementType InstanceSpecification_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.InstanceSpecification_Shape_CN"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Component_Shape_CN = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Component_Shape_CN"); //$NON-NLS-1$ + public static final IElementType Component_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Component_Shape_CN"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Signal_Shape_CN = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Signal_Shape_CN"); //$NON-NLS-1$ + public static final IElementType Signal_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Signal_Shape_CN"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Interface_Shape_CN = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Interface_Shape_CN"); //$NON-NLS-1$ + public static final IElementType Interface_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Interface_Shape_CN"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Model_Shape_CN = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Model_Shape_CN"); //$NON-NLS-1$ + public static final IElementType Model_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Model_Shape_CN"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Enumeration_Shape_CN = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Enumeration_Shape_CN"); //$NON-NLS-1$ + public static final IElementType Enumeration_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Enumeration_Shape_CN"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Package_Shape_CN = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Package_Shape_CN"); //$NON-NLS-1$ + public static final IElementType Package_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Package_Shape_CN"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType InformationItem_Shape_CN = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.InformationItem_Shape_CN"); //$NON-NLS-1$ + public static final IElementType InformationItem_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.InformationItem_Shape_CN"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Class_Shape_CN = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Class_Shape_CN"); //$NON-NLS-1$ + public static final IElementType Class_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Class_Shape_CN"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType PrimitiveType_Shape_CN = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.PrimitiveType_Shape_CN"); //$NON-NLS-1$ + public static final IElementType PrimitiveType_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.PrimitiveType_Shape_CN"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType DataType_Shape_CN = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.DataType_Shape_CN"); //$NON-NLS-1$ + public static final IElementType DataType_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.DataType_Shape_CN"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Comment_Shape_CN = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Comment_Shape_CN"); //$NON-NLS-1$ + public static final IElementType Comment_Shape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Comment_Shape_CN"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Constraint_PackagedElementShape_CN = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Constraint_PackagedElementShape_CN"); //$NON-NLS-1$ + public static final IElementType Constraint_PackagedElementShape_CN = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Constraint_PackagedElementShape_CN"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Interface_ClassNestedClassifierLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Interface_ClassNestedClassifierLabel"); //$NON-NLS-1$ + public static final IElementType Interface_ClassNestedClassifierLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Interface_ClassNestedClassifierLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Interface_ComponentNestedClassifierLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Interface_ComponentNestedClassifierLabel"); //$NON-NLS-1$ + public static final IElementType Interface_ComponentNestedClassifierLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Interface_ComponentNestedClassifierLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Interface_InterfaceNestedClassifierLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Interface_InterfaceNestedClassifierLabel"); //$NON-NLS-1$ + public static final IElementType Interface_InterfaceNestedClassifierLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Interface_InterfaceNestedClassifierLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Enumeration_ClassNestedClassifierLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Enumeration_ClassNestedClassifierLabel"); //$NON-NLS-1$ + public static final IElementType Enumeration_ClassNestedClassifierLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Enumeration_ClassNestedClassifierLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Enumeration_ComponentNestedClassifierLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Enumeration_ComponentNestedClassifierLabel"); //$NON-NLS-1$ + public static final IElementType Enumeration_ComponentNestedClassifierLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Enumeration_ComponentNestedClassifierLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Enumeration_InterfaceNestedClassifierLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Enumeration_InterfaceNestedClassifierLabel"); //$NON-NLS-1$ + public static final IElementType Enumeration_InterfaceNestedClassifierLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Enumeration_InterfaceNestedClassifierLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType PrimitiveType_ClassNestedClassifierLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.PrimitiveType_ClassNestedClassifierLabel"); //$NON-NLS-1$ + public static final IElementType PrimitiveType_ClassNestedClassifierLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.PrimitiveType_ClassNestedClassifierLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType PrimitiveType_ComponentNestedClassifierLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.PrimitiveType_ComponentNestedClassifierLabel"); //$NON-NLS-1$ + public static final IElementType PrimitiveType_ComponentNestedClassifierLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.PrimitiveType_ComponentNestedClassifierLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType PrimitiveType_InterfaceNestedClassifierLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.PrimitiveType_InterfaceNestedClassifierLabel"); //$NON-NLS-1$ + public static final IElementType PrimitiveType_InterfaceNestedClassifierLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.PrimitiveType_InterfaceNestedClassifierLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType DataType_ClassNestedClassifierLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.DataType_ClassNestedClassifierLabel"); //$NON-NLS-1$ + public static final IElementType DataType_ClassNestedClassifierLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.DataType_ClassNestedClassifierLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType DataType_ComponentNestedClassifierLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.DataType_ComponentNestedClassifierLabel"); //$NON-NLS-1$ + public static final IElementType DataType_ComponentNestedClassifierLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.DataType_ComponentNestedClassifierLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType DataType_InterfaceNestedClassifierLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.DataType_InterfaceNestedClassifierLabel"); //$NON-NLS-1$ + public static final IElementType DataType_InterfaceNestedClassifierLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.DataType_InterfaceNestedClassifierLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Signal_ClassNestedClassifierLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Signal_ClassNestedClassifierLabel"); //$NON-NLS-1$ + public static final IElementType Signal_ClassNestedClassifierLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Signal_ClassNestedClassifierLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Signal_ComponentNestedClassifierLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Signal_ComponentNestedClassifierLabel"); //$NON-NLS-1$ + public static final IElementType Signal_ComponentNestedClassifierLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Signal_ComponentNestedClassifierLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Signal_InterfaceNestedClassifierLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Signal_InterfaceNestedClassifierLabel"); //$NON-NLS-1$ + public static final IElementType Signal_InterfaceNestedClassifierLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Signal_InterfaceNestedClassifierLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Component_ClassNestedClassifierLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Component_ClassNestedClassifierLabel"); //$NON-NLS-1$ + public static final IElementType Component_ClassNestedClassifierLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Component_ClassNestedClassifierLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Component_InterfaceNestedClassifierLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Component_InterfaceNestedClassifierLabel"); //$NON-NLS-1$ + public static final IElementType Component_InterfaceNestedClassifierLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Component_InterfaceNestedClassifierLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Component_ComponentNestedClassifierLabel = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Component_ComponentNestedClassifierLabel"); //$NON-NLS-1$ + public static final IElementType Component_ComponentNestedClassifierLabel = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Component_ComponentNestedClassifierLabel"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType AssociationClass_TetherEdge = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.AssociationClass_TetherEdge"); //$NON-NLS-1$ + public static final IElementType AssociationClass_TetherEdge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.AssociationClass_TetherEdge"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType AssociationClass_Edge = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.AssociationClass_Edge"); //$NON-NLS-1$ + public static final IElementType AssociationClass_Edge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.AssociationClass_Edge"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Association_Edge = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Association_Edge"); //$NON-NLS-1$ + public static final IElementType Association_Edge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Association_Edge"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Association_BranchEdge = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Association_BranchEdge"); //$NON-NLS-1$ + public static final IElementType Association_BranchEdge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Association_BranchEdge"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Generalization_Edge = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Generalization_Edge"); //$NON-NLS-1$ + public static final IElementType Generalization_Edge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Generalization_Edge"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType InterfaceRealization_Edge = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.InterfaceRealization_Edge"); //$NON-NLS-1$ + public static final IElementType InterfaceRealization_Edge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.InterfaceRealization_Edge"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Substitution_Edge = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Substitution_Edge"); //$NON-NLS-1$ + public static final IElementType Substitution_Edge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Substitution_Edge"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Realization_Edge = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Realization_Edge"); //$NON-NLS-1$ + public static final IElementType Realization_Edge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Realization_Edge"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Abstraction_Edge = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Abstraction_Edge"); //$NON-NLS-1$ + public static final IElementType Abstraction_Edge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Abstraction_Edge"); //$NON-NLS-1$ /** * @generated */ @@ -487,83 +404,67 @@ public class UMLElementTypes { /** * @generated */ - public static final IElementType Dependency_Edge = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Dependency_Edge"); //$NON-NLS-1$ + public static final IElementType Dependency_Edge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Dependency_Edge"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Dependency_BranchEdge = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Dependency_BranchEdge"); //$NON-NLS-1$ + public static final IElementType Dependency_BranchEdge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Dependency_BranchEdge"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType ElementImport_Edge = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.ElementImport_Edge"); //$NON-NLS-1$ + public static final IElementType ElementImport_Edge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.ElementImport_Edge"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType PackageImport_Edge = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.PackageImport_Edge"); //$NON-NLS-1$ + public static final IElementType PackageImport_Edge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.PackageImport_Edge"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType PackageMerge_Edge = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.PackageMerge_Edge"); //$NON-NLS-1$ + public static final IElementType PackageMerge_Edge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.PackageMerge_Edge"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType ProfileApplication_Edge = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.ProfileApplication_Edge"); //$NON-NLS-1$ + public static final IElementType ProfileApplication_Edge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.ProfileApplication_Edge"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Comment_AnnotatedElementEdge = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Comment_AnnotatedElementEdge"); //$NON-NLS-1$ + public static final IElementType Comment_AnnotatedElementEdge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Comment_AnnotatedElementEdge"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Constraint_ConstrainedElementEdge = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge"); //$NON-NLS-1$ + public static final IElementType Constraint_ConstrainedElementEdge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType TemplateBinding_Edge = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.TemplateBinding_Edge"); //$NON-NLS-1$ + public static final IElementType TemplateBinding_Edge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.TemplateBinding_Edge"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType GeneralizationSet_Edge = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.GeneralizationSet_Edge"); //$NON-NLS-1$ + public static final IElementType GeneralizationSet_Edge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.GeneralizationSet_Edge"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType InstanceSpecification_Edge = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.InstanceSpecification_Edge"); //$NON-NLS-1$ + public static final IElementType InstanceSpecification_Edge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.InstanceSpecification_Edge"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Element_ContainmentEdge = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Element_ContainmentEdge"); //$NON-NLS-1$ + public static final IElementType Element_ContainmentEdge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Element_ContainmentEdge"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType TimeObservation_EventEdge = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.TimeObservation_EventEdge"); //$NON-NLS-1$ + public static final IElementType TimeObservation_EventEdge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.TimeObservation_EventEdge"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType DurationObservation_EventEdge = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.DurationObservation_EventEdge"); //$NON-NLS-1$ + public static final IElementType DurationObservation_EventEdge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.DurationObservation_EventEdge"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType InformationFlow_Edge = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.InformationFlow_Edge"); //$NON-NLS-1$ + public static final IElementType InformationFlow_Edge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.InformationFlow_Edge"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType Constraint_ContextEdge = getElementTypeByUniqueId( - "org.eclipse.papyrus.umldi.Constraint_ContextEdge"); //$NON-NLS-1$ + public static final IElementType Constraint_ContextEdge = getElementTypeByUniqueId("org.eclipse.papyrus.umldi.Constraint_ContextEdge"); //$NON-NLS-1$ /** * @generated @@ -595,213 +496,304 @@ public class UMLElementTypes { /** * Returns 'type' of the ecore object associated with the hint. - * + * * @generated */ public static synchronized ENamedElement getElement(IAdaptable hint) { Object type = hint.getAdapter(IElementType.class); if (elements == null) { - elements = new IdentityHashMap<IElementType, ENamedElement>(); + elements = new IdentityHashMap<>(); elements.put(Package_ClassDiagram, UMLPackage.eINSTANCE.getPackage()); + elements.put(Dependency_Shape, UMLPackage.eINSTANCE.getDependency()); + elements.put(AssociationClass_Shape, UMLPackage.eINSTANCE.getAssociationClass()); + elements.put(Association_Shape, UMLPackage.eINSTANCE.getAssociation()); + elements.put(InstanceSpecification_Shape, UMLPackage.eINSTANCE.getInstanceSpecification()); + elements.put(Component_Shape, UMLPackage.eINSTANCE.getComponent()); + elements.put(Signal_Shape, UMLPackage.eINSTANCE.getSignal()); + elements.put(Interface_Shape, UMLPackage.eINSTANCE.getInterface()); + elements.put(Model_Shape, UMLPackage.eINSTANCE.getModel()); + elements.put(Enumeration_Shape, UMLPackage.eINSTANCE.getEnumeration()); + elements.put(Package_Shape, UMLPackage.eINSTANCE.getPackage()); + elements.put(InformationItem_Shape, UMLPackage.eINSTANCE.getInformationItem()); + elements.put(Class_Shape, UMLPackage.eINSTANCE.getClass_()); + elements.put(PrimitiveType_Shape, UMLPackage.eINSTANCE.getPrimitiveType()); + elements.put(DataType_Shape, UMLPackage.eINSTANCE.getDataType()); + elements.put(Constraint_PackagedElementShape, UMLPackage.eINSTANCE.getConstraint()); + elements.put(Comment_Shape, UMLPackage.eINSTANCE.getComment()); + elements.put(Diagram_ShortcutShape, NotationPackage.eINSTANCE.getDiagram()); + elements.put(DurationObservation_Shape, UMLPackage.eINSTANCE.getDurationObservation()); + elements.put(TimeObservation_Shape, UMLPackage.eINSTANCE.getTimeObservation()); + elements.put(NamedElement_DefaultShape, UMLPackage.eINSTANCE.getNamedElement()); + elements.put(Property_ClassAttributeLabel, UMLPackage.eINSTANCE.getProperty()); + elements.put(Property_ComponentAttributeLabel, UMLPackage.eINSTANCE.getProperty()); + elements.put(Property_SignalAttributeLabel, UMLPackage.eINSTANCE.getProperty()); + elements.put(Property_InterfaceAttributeLabel, UMLPackage.eINSTANCE.getProperty()); + elements.put(Property_PrimitiveTypeAttributeLabel, UMLPackage.eINSTANCE.getProperty()); + elements.put(Property_DataTypeAttributeLabel, UMLPackage.eINSTANCE.getProperty()); + elements.put(Class_ClassNestedClassifierLabel, UMLPackage.eINSTANCE.getClass_()); + elements.put(Class_ComponentNestedClassifierLabel, UMLPackage.eINSTANCE.getClass_()); + elements.put(Class_InterfaceNestedClassifierLabel, UMLPackage.eINSTANCE.getClass_()); + elements.put(Operation_ClassOperationLabel, UMLPackage.eINSTANCE.getOperation()); + elements.put(Operation_ComponentOperationLabel, UMLPackage.eINSTANCE.getOperation()); + elements.put(Operation_InterfaceOperationLabel, UMLPackage.eINSTANCE.getOperation()); + elements.put(Operation_PrimitiveTypeOperationLabel, UMLPackage.eINSTANCE.getOperation()); + elements.put(Operation_DataTypeOperationLabel, UMLPackage.eINSTANCE.getOperation()); - elements.put(ConnectableElementTemplateParameter_TemplateParameterLabel, - UMLPackage.eINSTANCE.getConnectableElementTemplateParameter()); - elements.put(OperationTemplateParameter_TemplateParameterLabel, - UMLPackage.eINSTANCE.getOperationTemplateParameter()); + elements.put(ConnectableElementTemplateParameter_TemplateParameterLabel, UMLPackage.eINSTANCE.getConnectableElementTemplateParameter()); + + + elements.put(OperationTemplateParameter_TemplateParameterLabel, UMLPackage.eINSTANCE.getOperationTemplateParameter()); + + + elements.put(ClassifierTemplateParameter_TemplateParameterLabel, UMLPackage.eINSTANCE.getClassifierTemplateParameter()); - elements.put(ClassifierTemplateParameter_TemplateParameterLabel, - UMLPackage.eINSTANCE.getClassifierTemplateParameter()); elements.put(TemplateParameter_TemplateParameterLabel, UMLPackage.eINSTANCE.getTemplateParameter()); + elements.put(EnumerationLiteral_LiteralLabel, UMLPackage.eINSTANCE.getEnumerationLiteral()); + elements.put(Reception_ReceptionLabel, UMLPackage.eINSTANCE.getReception()); + elements.put(Reception_InterfaceReceptionLabel, UMLPackage.eINSTANCE.getReception()); + elements.put(Slot_SlotLabel, UMLPackage.eINSTANCE.getSlot()); + elements.put(RedefinableTemplateSignature_Shape, UMLPackage.eINSTANCE.getRedefinableTemplateSignature()); + elements.put(TemplateSignature_Shape, UMLPackage.eINSTANCE.getTemplateSignature()); + elements.put(InstanceSpecification_Shape_CN, UMLPackage.eINSTANCE.getInstanceSpecification()); + elements.put(Component_Shape_CN, UMLPackage.eINSTANCE.getComponent()); + elements.put(Signal_Shape_CN, UMLPackage.eINSTANCE.getSignal()); + elements.put(Interface_Shape_CN, UMLPackage.eINSTANCE.getInterface()); + elements.put(Model_Shape_CN, UMLPackage.eINSTANCE.getModel()); + elements.put(Enumeration_Shape_CN, UMLPackage.eINSTANCE.getEnumeration()); + elements.put(Package_Shape_CN, UMLPackage.eINSTANCE.getPackage()); + elements.put(InformationItem_Shape_CN, UMLPackage.eINSTANCE.getInformationItem()); + elements.put(Class_Shape_CN, UMLPackage.eINSTANCE.getClass_()); + elements.put(PrimitiveType_Shape_CN, UMLPackage.eINSTANCE.getPrimitiveType()); + elements.put(DataType_Shape_CN, UMLPackage.eINSTANCE.getDataType()); + elements.put(Comment_Shape_CN, UMLPackage.eINSTANCE.getComment()); + elements.put(Constraint_PackagedElementShape_CN, UMLPackage.eINSTANCE.getConstraint()); + elements.put(Interface_ClassNestedClassifierLabel, UMLPackage.eINSTANCE.getInterface()); + elements.put(Interface_ComponentNestedClassifierLabel, UMLPackage.eINSTANCE.getInterface()); + elements.put(Interface_InterfaceNestedClassifierLabel, UMLPackage.eINSTANCE.getInterface()); + elements.put(Enumeration_ClassNestedClassifierLabel, UMLPackage.eINSTANCE.getEnumeration()); + elements.put(Enumeration_ComponentNestedClassifierLabel, UMLPackage.eINSTANCE.getEnumeration()); + elements.put(Enumeration_InterfaceNestedClassifierLabel, UMLPackage.eINSTANCE.getEnumeration()); + elements.put(PrimitiveType_ClassNestedClassifierLabel, UMLPackage.eINSTANCE.getPrimitiveType()); + elements.put(PrimitiveType_ComponentNestedClassifierLabel, UMLPackage.eINSTANCE.getPrimitiveType()); + elements.put(PrimitiveType_InterfaceNestedClassifierLabel, UMLPackage.eINSTANCE.getPrimitiveType()); + elements.put(DataType_ClassNestedClassifierLabel, UMLPackage.eINSTANCE.getDataType()); + elements.put(DataType_ComponentNestedClassifierLabel, UMLPackage.eINSTANCE.getDataType()); + elements.put(DataType_InterfaceNestedClassifierLabel, UMLPackage.eINSTANCE.getDataType()); + elements.put(Signal_ClassNestedClassifierLabel, UMLPackage.eINSTANCE.getSignal()); + elements.put(Signal_ComponentNestedClassifierLabel, UMLPackage.eINSTANCE.getSignal()); + elements.put(Signal_InterfaceNestedClassifierLabel, UMLPackage.eINSTANCE.getSignal()); + elements.put(Component_ClassNestedClassifierLabel, UMLPackage.eINSTANCE.getComponent()); + elements.put(Component_InterfaceNestedClassifierLabel, UMLPackage.eINSTANCE.getComponent()); + elements.put(Component_ComponentNestedClassifierLabel, UMLPackage.eINSTANCE.getComponent()); + elements.put(AssociationClass_Edge, UMLPackage.eINSTANCE.getAssociationClass()); + elements.put(Association_Edge, UMLPackage.eINSTANCE.getAssociation()); + elements.put(Association_BranchEdge, UMLPackage.eINSTANCE.getAssociation()); + elements.put(Generalization_Edge, UMLPackage.eINSTANCE.getGeneralization()); + elements.put(InterfaceRealization_Edge, UMLPackage.eINSTANCE.getInterfaceRealization()); + elements.put(Substitution_Edge, UMLPackage.eINSTANCE.getSubstitution()); + elements.put(Realization_Edge, UMLPackage.eINSTANCE.getRealization()); + elements.put(Abstraction_Edge, UMLPackage.eINSTANCE.getAbstraction()); + elements.put(Usage_Edge, UMLPackage.eINSTANCE.getUsage()); + elements.put(Dependency_Edge, UMLPackage.eINSTANCE.getDependency()); + elements.put(Dependency_BranchEdge, UMLPackage.eINSTANCE.getDependency()); + elements.put(ElementImport_Edge, UMLPackage.eINSTANCE.getElementImport()); + elements.put(PackageImport_Edge, UMLPackage.eINSTANCE.getPackageImport()); + elements.put(PackageMerge_Edge, UMLPackage.eINSTANCE.getPackageMerge()); + elements.put(ProfileApplication_Edge, UMLPackage.eINSTANCE.getProfileApplication()); elements.put(Comment_AnnotatedElementEdge, UMLPackage.eINSTANCE.getComment_AnnotatedElement()); elements.put(Constraint_ConstrainedElementEdge, UMLPackage.eINSTANCE.getConstraint_ConstrainedElement()); + elements.put(TemplateBinding_Edge, UMLPackage.eINSTANCE.getTemplateBinding()); + elements.put(GeneralizationSet_Edge, UMLPackage.eINSTANCE.getGeneralizationSet()); + elements.put(InstanceSpecification_Edge, UMLPackage.eINSTANCE.getInstanceSpecification()); elements.put(TimeObservation_EventEdge, UMLPackage.eINSTANCE.getTimeObservation_Event()); elements.put(DurationObservation_EventEdge, UMLPackage.eINSTANCE.getDurationObservation_Event()); + elements.put(InformationFlow_Edge, UMLPackage.eINSTANCE.getInformationFlow()); elements.put(Constraint_ContextEdge, UMLPackage.eINSTANCE.getConstraint_Context()); @@ -821,7 +813,7 @@ public class UMLElementTypes { */ public static synchronized boolean isKnownElementType(IElementType elementType) { if (KNOWN_ELEMENT_TYPES == null) { - KNOWN_ELEMENT_TYPES = new HashSet<IElementType>(); + KNOWN_ELEMENT_TYPES = new HashSet<>(); KNOWN_ELEMENT_TYPES.add(Package_ClassDiagram); KNOWN_ELEMENT_TYPES.add(Dependency_Shape); KNOWN_ELEMENT_TYPES.add(AssociationClass_Shape); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLIconProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLIconProvider.java index 9783fa666db..2b948a0136d 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLIconProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLIconProvider.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLMarkerNavigationProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLMarkerNavigationProvider.java index 59902a6f5bb..b3ecdb01164 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLMarkerNavigationProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLMarkerNavigationProvider.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -41,6 +41,7 @@ public class UMLMarkerNavigationProvider extends AbstractModelMarkerNavigationPr /** * @generated */ + @Override protected void doGotoMarker(IMarker marker) { String elementId = marker.getAttribute(org.eclipse.gmf.runtime.common.core.resources.IMarker.ELEMENT_ID, null); if (elementId == null || !(getEditor() instanceof DiagramEditor)) { @@ -54,7 +55,8 @@ public class UMLMarkerNavigationProvider extends AbstractModelMarkerNavigationPr } EditPart targetEditPart = (EditPart) editPartRegistry.get(targetView); if (targetEditPart != null) { - UMLDiagramEditorUtil.selectElementsInDiagram(editor, Arrays.asList(new EditPart[] { targetEditPart })); + UMLDiagramEditorUtil.selectElementsInDiagram( + editor, Arrays.asList(new EditPart[] { targetEditPart })); } } @@ -65,7 +67,8 @@ public class UMLMarkerNavigationProvider extends AbstractModelMarkerNavigationPr try { resource.deleteMarkers(MARKER_TYPE, true, IResource.DEPTH_ZERO); } catch (CoreException e) { - UMLDiagramEditorPlugin.getInstance().logError("Failed to delete validation markers", e); //$NON-NLS-1$ + UMLDiagramEditorPlugin.getInstance().logError( + "Failed to delete validation markers", e); //$NON-NLS-1$ } } @@ -82,12 +85,14 @@ public class UMLMarkerNavigationProvider extends AbstractModelMarkerNavigationPr int markerSeverity = IMarker.SEVERITY_INFO; if (statusSeverity == IStatus.WARNING) { markerSeverity = IMarker.SEVERITY_WARNING; - } else if (statusSeverity == IStatus.ERROR || statusSeverity == IStatus.CANCEL) { + } else if (statusSeverity == IStatus.ERROR || + statusSeverity == IStatus.CANCEL) { markerSeverity = IMarker.SEVERITY_ERROR; } marker.setAttribute(IMarker.SEVERITY, markerSeverity); } catch (CoreException e) { - UMLDiagramEditorPlugin.getInstance().logError("Failed to create validation marker", e); //$NON-NLS-1$ + UMLDiagramEditorPlugin.getInstance().logError( + "Failed to create validation marker", e); //$NON-NLS-1$ } return marker; } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLParserProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLParserProvider.java index 70f2b5aec0c..623ce3fe27f 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLParserProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLParserProvider.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -55,7 +55,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getDependency_MultiNameLabel_Parser() { if (dependency_MultiNameLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); dependency_MultiNameLabel_Parser = parser; } @@ -72,7 +74,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getDependency_FloatingNameLabel_Parser() { if (dependency_FloatingNameLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); dependency_FloatingNameLabel_Parser = parser; } @@ -89,7 +93,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getAssociationClass_NameLabel_Parser() { if (associationClass_NameLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); associationClass_NameLabel_Parser = parser; } @@ -106,7 +112,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getAssociationClass_FloatingNameLabel_Parser() { if (associationClass_FloatingNameLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); associationClass_FloatingNameLabel_Parser = parser; } @@ -123,7 +131,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getAssociation_FloatingNameLabel_Parser() { if (association_FloatingNameLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); association_FloatingNameLabel_Parser = parser; } @@ -140,7 +150,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getInstanceSpecification_NameLabel_Parser() { if (instanceSpecification_NameLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); instanceSpecification_NameLabel_Parser = parser; } @@ -157,7 +169,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getInstanceSpecification_FloatingNameLabel_Parser() { if (instanceSpecification_FloatingNameLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); instanceSpecification_FloatingNameLabel_Parser = parser; } @@ -174,7 +188,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getComponent_NameLabel_Parser() { if (component_NameLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); component_NameLabel_Parser = parser; } @@ -191,7 +207,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getComponent_FloatingNameLabel_Parser() { if (component_FloatingNameLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); component_FloatingNameLabel_Parser = parser; } @@ -208,7 +226,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getSignal_NameLabel_Parser() { if (signal_NameLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); signal_NameLabel_Parser = parser; } @@ -225,7 +245,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getSignal_FloatingNameLabel_Parser() { if (signal_FloatingNameLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); signal_FloatingNameLabel_Parser = parser; } @@ -242,7 +264,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getInterface_NameLabel_Parser() { if (interface_NameLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); interface_NameLabel_Parser = parser; } @@ -259,7 +283,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getInterface_FloatingNameLabel_Parser() { if (interface_FloatingNameLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); interface_FloatingNameLabel_Parser = parser; } @@ -276,7 +302,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getModel_NameLabel_Parser() { if (model_NameLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); model_NameLabel_Parser = parser; } @@ -293,7 +321,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getEnumeration_NameLabel_Parser() { if (enumeration_NameLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); enumeration_NameLabel_Parser = parser; } @@ -310,7 +340,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getEnumeration_FloatingNameLabel_Parser() { if (enumeration_FloatingNameLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); enumeration_FloatingNameLabel_Parser = parser; } @@ -327,7 +359,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getPackage_NameLabel_Parser() { if (package_NameLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); package_NameLabel_Parser = parser; } @@ -344,7 +378,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getInformationItem_NameLabel_Parser() { if (informationItem_NameLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); informationItem_NameLabel_Parser = parser; } @@ -361,7 +397,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getInformationItem_FloatingNameLabel_Parser() { if (informationItem_FloatingNameLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); informationItem_FloatingNameLabel_Parser = parser; } @@ -378,7 +416,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getClass_NameLabel_Parser() { if (class_NameLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); class_NameLabel_Parser = parser; } @@ -395,7 +435,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getClass_FloatingNameLabel_Parser() { if (class_FloatingNameLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); class_FloatingNameLabel_Parser = parser; } @@ -412,7 +454,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getPrimitiveType_NameLabel_Parser() { if (primitiveType_NameLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); primitiveType_NameLabel_Parser = parser; } @@ -429,7 +473,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getPrimitiveType_FloatingNameLabel_Parser() { if (primitiveType_FloatingNameLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); primitiveType_FloatingNameLabel_Parser = parser; } @@ -446,7 +492,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getDataType_NameLabel_Parser() { if (dataType_NameLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); dataType_NameLabel_Parser = parser; } @@ -463,7 +511,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getDataType_FloatingNameLabel_Parser() { if (dataType_FloatingNameLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); dataType_FloatingNameLabel_Parser = parser; } @@ -480,7 +530,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getConstraint_NameLabel_Parser() { if (constraint_NameLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); constraint_NameLabel_Parser = parser; } @@ -542,7 +594,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getDurationObservation_FloatingNameLabel_Parser() { if (durationObservation_FloatingNameLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); durationObservation_FloatingNameLabel_Parser = parser; } @@ -574,7 +628,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getTimeObservation_FloatingNameLabel_Parser() { if (timeObservation_FloatingNameLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); timeObservation_FloatingNameLabel_Parser = parser; } @@ -606,7 +662,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getNamedElement_NameLabel_Parser() { if (namedElement_NameLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); namedElement_NameLabel_Parser = parser; } @@ -623,7 +681,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getProperty_ComponentAttributeLabel_Parser() { if (property_ComponentAttributeLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); property_ComponentAttributeLabel_Parser = parser; } @@ -640,7 +700,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getProperty_SignalAttributeLabel_Parser() { if (property_SignalAttributeLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); property_SignalAttributeLabel_Parser = parser; } @@ -657,7 +719,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getProperty_InterfaceAttributeLabel_Parser() { if (property_InterfaceAttributeLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); property_InterfaceAttributeLabel_Parser = parser; } @@ -674,7 +738,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getProperty_PrimitiveTypeAttributeLabel_Parser() { if (property_PrimitiveTypeAttributeLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); property_PrimitiveTypeAttributeLabel_Parser = parser; } @@ -691,7 +757,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getProperty_DataTypeAttributeLabel_Parser() { if (property_DataTypeAttributeLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); property_DataTypeAttributeLabel_Parser = parser; } @@ -708,7 +776,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getClass_ClassNestedClassifierLabel_Parser() { if (class_ClassNestedClassifierLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); class_ClassNestedClassifierLabel_Parser = parser; } @@ -725,7 +795,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getClass_ComponentNestedClassifierLabel_Parser() { if (class_ComponentNestedClassifierLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); class_ComponentNestedClassifierLabel_Parser = parser; } @@ -742,7 +814,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getClass_InterfaceNestedClassifierLabel_Parser() { if (class_InterfaceNestedClassifierLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); class_InterfaceNestedClassifierLabel_Parser = parser; } @@ -759,7 +833,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getOperation_ComponentOperationLabel_Parser() { if (operation_ComponentOperationLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); operation_ComponentOperationLabel_Parser = parser; } @@ -776,7 +852,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getOperation_InterfaceOperationLabel_Parser() { if (operation_InterfaceOperationLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); operation_InterfaceOperationLabel_Parser = parser; } @@ -793,7 +871,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getOperation_PrimitiveTypeOperationLabel_Parser() { if (operation_PrimitiveTypeOperationLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); operation_PrimitiveTypeOperationLabel_Parser = parser; } @@ -810,7 +890,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getOperation_DataTypeOperationLabel_Parser() { if (operation_DataTypeOperationLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); operation_DataTypeOperationLabel_Parser = parser; } @@ -887,7 +969,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getEnumerationLiteral_LiteralLabel_Parser() { if (enumerationLiteral_LiteralLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); enumerationLiteral_LiteralLabel_Parser = parser; } @@ -904,7 +988,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getReception_ReceptionLabel_Parser() { if (reception_ReceptionLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); parser.setViewPattern("\u00ABSignal\u00BB {0}"); //$NON-NLS-1$ parser.setEditorPattern("{0}"); //$NON-NLS-1$ @@ -924,7 +1010,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getReception_InterfaceReceptionLabel_Parser() { if (reception_InterfaceReceptionLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); parser.setViewPattern("\u00ABSignal\u00BB {0}"); //$NON-NLS-1$ parser.setEditorPattern("{0}"); //$NON-NLS-1$ @@ -959,7 +1047,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getInstanceSpecification_NameLabel_CN_Parser() { if (instanceSpecification_NameLabel_CN_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); instanceSpecification_NameLabel_CN_Parser = parser; } @@ -976,7 +1066,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getInstanceSpecification_FloatingNameLabel_CN_Parser() { if (instanceSpecification_FloatingNameLabel_CN_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); instanceSpecification_FloatingNameLabel_CN_Parser = parser; } @@ -993,7 +1085,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getComponent_NameLabel_CN_Parser() { if (component_NameLabel_CN_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); component_NameLabel_CN_Parser = parser; } @@ -1010,7 +1104,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getComponent_FloatingNameLabel_CN_Parser() { if (component_FloatingNameLabel_CN_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); component_FloatingNameLabel_CN_Parser = parser; } @@ -1027,7 +1123,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getSignal_NameLabel_CN_Parser() { if (signal_NameLabel_CN_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); signal_NameLabel_CN_Parser = parser; } @@ -1044,7 +1142,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getSignal_FloatingNameLabel_CN_Parser() { if (signal_FloatingNameLabel_CN_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); signal_FloatingNameLabel_CN_Parser = parser; } @@ -1061,7 +1161,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getInterface_NameLabel_CN_Parser() { if (interface_NameLabel_CN_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); interface_NameLabel_CN_Parser = parser; } @@ -1078,7 +1180,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getInterface_FloatingNameLabel_CN_Parser() { if (interface_FloatingNameLabel_CN_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); interface_FloatingNameLabel_CN_Parser = parser; } @@ -1095,7 +1199,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getModel_NameLabel_CN_Parser() { if (model_NameLabel_CN_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); model_NameLabel_CN_Parser = parser; } @@ -1112,7 +1218,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getEnumeration_NameLabel_CN_Parser() { if (enumeration_NameLabel_CN_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); enumeration_NameLabel_CN_Parser = parser; } @@ -1129,7 +1237,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getEnumeration_FloatingNameLabel_CN_Parser() { if (enumeration_FloatingNameLabel_CN_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); enumeration_FloatingNameLabel_CN_Parser = parser; } @@ -1146,7 +1256,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getPackage_NameLabel_CN_Parser() { if (package_NameLabel_CN_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); package_NameLabel_CN_Parser = parser; } @@ -1163,7 +1275,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getInformationItem_NameLabel_CN_Parser() { if (informationItem_NameLabel_CN_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); informationItem_NameLabel_CN_Parser = parser; } @@ -1180,7 +1294,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getInformationItem_FloatingNameLabel_CN_Parser() { if (informationItem_FloatingNameLabel_CN_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); informationItem_FloatingNameLabel_CN_Parser = parser; } @@ -1197,7 +1313,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getClass_NameLabel_CN_Parser() { if (class_NameLabel_CN_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); class_NameLabel_CN_Parser = parser; } @@ -1214,7 +1332,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getClass_FloatingNameLabel_CN_Parser() { if (class_FloatingNameLabel_CN_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); class_FloatingNameLabel_CN_Parser = parser; } @@ -1231,7 +1351,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getPrimitiveType_NameLabel_CN_Parser() { if (primitiveType_NameLabel_CN_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); primitiveType_NameLabel_CN_Parser = parser; } @@ -1248,7 +1370,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getPrimitiveType_FloatingNameLabel_CN_Parser() { if (primitiveType_FloatingNameLabel_CN_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); primitiveType_FloatingNameLabel_CN_Parser = parser; } @@ -1265,7 +1389,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getDataType_NameLabel_CN_Parser() { if (dataType_NameLabel_CN_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); dataType_NameLabel_CN_Parser = parser; } @@ -1282,7 +1408,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getDataType_FloatingNameLabel_CN_Parser() { if (dataType_FloatingNameLabel_CN_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); dataType_FloatingNameLabel_CN_Parser = parser; } @@ -1314,7 +1442,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getConstraint_NameLabel_CN_Parser() { if (constraint_NameLabel_CN_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); constraint_NameLabel_CN_Parser = parser; } @@ -1346,7 +1476,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getInterface_ClassNestedClassifierLabel_Parser() { if (interface_ClassNestedClassifierLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); interface_ClassNestedClassifierLabel_Parser = parser; } @@ -1363,7 +1495,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getInterface_ComponentNestedClassifierLabel_Parser() { if (interface_ComponentNestedClassifierLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); interface_ComponentNestedClassifierLabel_Parser = parser; } @@ -1380,7 +1514,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getInterface_InterfaceNestedClassifierLabel_Parser() { if (interface_InterfaceNestedClassifierLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); interface_InterfaceNestedClassifierLabel_Parser = parser; } @@ -1397,7 +1533,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getEnumeration_ClassNestedClassifierLabel_Parser() { if (enumeration_ClassNestedClassifierLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); enumeration_ClassNestedClassifierLabel_Parser = parser; } @@ -1414,7 +1552,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getEnumeration_ComponentNestedClassifierLabel_Parser() { if (enumeration_ComponentNestedClassifierLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); enumeration_ComponentNestedClassifierLabel_Parser = parser; } @@ -1431,7 +1571,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getEnumeration_InterfaceNestedClassifierLabel_Parser() { if (enumeration_InterfaceNestedClassifierLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); enumeration_InterfaceNestedClassifierLabel_Parser = parser; } @@ -1448,7 +1590,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getPrimitiveType_ClassNestedClassifierLabel_Parser() { if (primitiveType_ClassNestedClassifierLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); primitiveType_ClassNestedClassifierLabel_Parser = parser; } @@ -1465,7 +1609,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getPrimitiveType_ComponentNestedClassifierLabel_Parser() { if (primitiveType_ComponentNestedClassifierLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); primitiveType_ComponentNestedClassifierLabel_Parser = parser; } @@ -1482,7 +1628,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getPrimitiveType_InterfaceNestedClassifierLabel_Parser() { if (primitiveType_InterfaceNestedClassifierLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); primitiveType_InterfaceNestedClassifierLabel_Parser = parser; } @@ -1499,7 +1647,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getDataType_ClassNestedClassifierLabel_Parser() { if (dataType_ClassNestedClassifierLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); dataType_ClassNestedClassifierLabel_Parser = parser; } @@ -1516,7 +1666,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getDataType_ComponentNestedClassifierLabel_Parser() { if (dataType_ComponentNestedClassifierLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); dataType_ComponentNestedClassifierLabel_Parser = parser; } @@ -1533,7 +1685,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getDataType_InterfaceNestedClassifierLabel_Parser() { if (dataType_InterfaceNestedClassifierLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); dataType_InterfaceNestedClassifierLabel_Parser = parser; } @@ -1550,7 +1704,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getSignal_ClassNestedClassifierLabel_Parser() { if (signal_ClassNestedClassifierLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); signal_ClassNestedClassifierLabel_Parser = parser; } @@ -1567,7 +1723,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getSignal_ComponentNestedClassifierLabel_Parser() { if (signal_ComponentNestedClassifierLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); signal_ComponentNestedClassifierLabel_Parser = parser; } @@ -1584,7 +1742,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getSignal_InterfaceNestedClassifierLabel_Parser() { if (signal_InterfaceNestedClassifierLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); signal_InterfaceNestedClassifierLabel_Parser = parser; } @@ -1601,7 +1761,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getComponent_ClassNestedClassifierLabel_Parser() { if (component_ClassNestedClassifierLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); component_ClassNestedClassifierLabel_Parser = parser; } @@ -1618,7 +1780,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getComponent_InterfaceNestedClassifierLabel_Parser() { if (component_InterfaceNestedClassifierLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); component_InterfaceNestedClassifierLabel_Parser = parser; } @@ -1635,7 +1799,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getComponent_ComponentNestedClassifierLabel_Parser() { if (component_ComponentNestedClassifierLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); component_ComponentNestedClassifierLabel_Parser = parser; } @@ -1652,7 +1818,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getAssociationClass_SourceRoleLabel_Parser() { if (associationClass_SourceRoleLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); parser.setViewPattern("srcRole{0}"); //$NON-NLS-1$ parser.setEditorPattern("srcRole{0}"); //$NON-NLS-1$ @@ -1672,7 +1840,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getAssociationClass_TargetRoleLabel_Parser() { if (associationClass_TargetRoleLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); parser.setViewPattern("targetRole{0}"); //$NON-NLS-1$ parser.setEditorPattern("targetRole{0}"); //$NON-NLS-1$ @@ -1707,7 +1877,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getAssociation_NameLabel_Parser() { if (association_NameLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); association_NameLabel_Parser = parser; } @@ -1724,7 +1896,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getAssociation_TargetRoleLabel_Parser() { if (association_TargetRoleLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); parser.setViewPattern("srcRole{0}"); //$NON-NLS-1$ parser.setEditorPattern("srcRole{0}"); //$NON-NLS-1$ @@ -1744,7 +1918,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getAssociation_SourceRoleLabel_Parser() { if (association_SourceRoleLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); parser.setViewPattern("targMul{0}"); //$NON-NLS-1$ parser.setEditorPattern("targMul{0}"); //$NON-NLS-1$ @@ -1764,7 +1940,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getAssociation_SourceMultiplicityLabel_Parser() { if (association_SourceMultiplicityLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); parser.setViewPattern("srcMul{0}"); //$NON-NLS-1$ parser.setEditorPattern("srcMul{0}"); //$NON-NLS-1$ @@ -1784,7 +1962,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getAssociation_TargetMultiplicityLabel_Parser() { if (association_TargetMultiplicityLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); parser.setViewPattern("srcMul{0}"); //$NON-NLS-1$ parser.setEditorPattern("srcMul{0}"); //$NON-NLS-1$ @@ -1804,7 +1984,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getAssociation_BranchMultiplicityLabel_Parser() { if (association_BranchMultiplicityLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); parser.setViewPattern("srcRole{0}"); //$NON-NLS-1$ parser.setEditorPattern("srcRole{0}"); //$NON-NLS-1$ @@ -1824,7 +2006,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getGeneralization_StereotypeLabel_Parser() { if (generalization_StereotypeLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getGeneralization_IsSubstitutable() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getGeneralization_IsSubstitutable() + }; MessageFormatParser parser = new MessageFormatParser(features); parser.setViewPattern("<<{0}>>"); //$NON-NLS-1$ parser.setEditorPattern("<<{0}>>"); //$NON-NLS-1$ @@ -1859,7 +2043,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getInterfaceRealization_NameLabel_Parser() { if (interfaceRealization_NameLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); interfaceRealization_NameLabel_Parser = parser; } @@ -1891,7 +2077,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getSubstitution_NameLabel_Parser() { if (substitution_NameLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); substitution_NameLabel_Parser = parser; } @@ -1923,7 +2111,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getRealization_NameLabel_Parser() { if (realization_NameLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); realization_NameLabel_Parser = parser; } @@ -1940,7 +2130,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getAbstraction_NameLabel_Parser() { if (abstraction_NameLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); abstraction_NameLabel_Parser = parser; } @@ -1972,7 +2164,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getUsage_NameLabel_Parser() { if (usage_NameLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); usage_NameLabel_Parser = parser; } @@ -2004,7 +2198,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getDependency_NameLabel_Parser() { if (dependency_NameLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); dependency_NameLabel_Parser = parser; } @@ -2036,7 +2232,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getElementImport_AliasLabel_Parser() { if (elementImport_AliasLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getElementImport_Alias() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getElementImport_Alias() + }; MessageFormatParser parser = new MessageFormatParser(features); elementImport_AliasLabel_Parser = parser; } @@ -2203,7 +2401,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid */ private IParser getInformationFlow_NameLabel_Parser() { if (informationFlow_NameLabel_Parser == null) { - EAttribute[] features = new EAttribute[] { UMLPackage.eINSTANCE.getNamedElement_Name() }; + EAttribute[] features = new EAttribute[] { + UMLPackage.eINSTANCE.getNamedElement_Name() + }; MessageFormatParser parser = new MessageFormatParser(features); informationFlow_NameLabel_Parser = parser; } @@ -2345,6 +2545,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid case SlotEditPart.VISUAL_ID: return getSlot_SlotLabel_Parser(); + case InstanceSpecificationNameEditPartCN.VISUAL_ID: return getInstanceSpecification_NameLabel_CN_Parser(); case InstanceSpecificationFloatingNameEditPartCN.VISUAL_ID: @@ -2495,6 +2696,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid case AppliedStereotypeDependencyEditPart.VISUAL_ID: return getDependency_StereotypeLabel_Parser(); + case ElementImportAliasEditPart.VISUAL_ID: return getElementImport_AliasLabel_Parser(); case AppliedStereotypeElementImportEditPart.VISUAL_ID: @@ -2506,6 +2708,9 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid case AppliedStereotypePackageMergeEditPart.VISUAL_ID: return getPackageMerge_StereotypeLabel_Parser(); + + + case BindingSubstitutionEditPart.VISUAL_ID: return getTemplateBinding_SubstitutionLabel_Parser(); case AppliedStereotypeTemplateBindingEditPart.VISUAL_ID: @@ -2521,11 +2726,15 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid case TargetISLinkLabelEditPart.VISUAL_ID: return getInstanceSpecification_TargetRoleLabel_Parser(); + + + case InformationFlowAppliedStereotypeEditPart.VISUAL_ID: return getInformationFlow_StereotypeLabel_Parser(); case InformationFlowNameEditPart.VISUAL_ID: return getInformationFlow_NameLabel_Parser(); + } } return null; @@ -2533,6 +2742,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid /** * Utility method that consults ParserService + * * @generated */ public static IParser getParser(IElementType type, EObject object, String parserHint) { @@ -2542,12 +2752,13 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid /** * @generated */ + @Override public IParser getParser(IAdaptable hint) { - String vid = (String) hint.getAdapter(String.class); + String vid = hint.getAdapter(String.class); if (vid != null) { return getParser(UMLVisualIDRegistry.getVisualID(vid)); } - View view = (View) hint.getAdapter(View.class); + View view = hint.getAdapter(View.class); if (view != null) { return getParser(UMLVisualIDRegistry.getVisualID(view)); } @@ -2557,6 +2768,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid /** * @generated */ + @Override public boolean provides(IOperation operation) { if (operation instanceof GetParserOperation) { IAdaptable hint = ((GetParserOperation) operation).getHint(); @@ -2590,6 +2802,7 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid /** * @generated */ + @Override public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) { if (IElementType.class.equals(adapter)) { return elementType; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLValidationDecoratorProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLValidationDecoratorProvider.java index ae8947b5b65..62132bcb309 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLValidationDecoratorProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLValidationDecoratorProvider.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -37,9 +37,11 @@ public class UMLValidationDecoratorProvider extends ValidationDecoratorProvider /** * @generated */ + @Override public void createDecorators(IDecoratorTarget decoratorTarget) { - EditPart editPart = (EditPart) decoratorTarget.getAdapter(EditPart.class); - if (editPart instanceof GraphicalEditPart || editPart instanceof AbstractConnectionEditPart) { + EditPart editPart = decoratorTarget.getAdapter(EditPart.class); + if (editPart instanceof GraphicalEditPart || + editPart instanceof AbstractConnectionEditPart) { Object model = editPart.getModel(); if ((model instanceof View)) { View view = (View) model; @@ -60,12 +62,14 @@ public class UMLValidationDecoratorProvider extends ValidationDecoratorProvider /** * @generated */ + @Override public boolean provides(IOperation operation) { if (!(operation instanceof CreateDecoratorsOperation)) { return false; } IDecoratorTarget decoratorTarget = ((CreateDecoratorsOperation) operation).getDecoratorTarget(); - View view = (View) decoratorTarget.getAdapter(View.class); + View view = decoratorTarget.getAdapter( + View.class); return view != null && ModelEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(view)); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLValidationProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLValidationProvider.java index 3abd032da73..da100226762 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLValidationProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLValidationProvider.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLViewProvider.java index 1071c9a2963..89246502b18 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLViewProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLViewProvider.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -64,13 +64,14 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.FontData; /** - * @generated - */ + * @generated + */ public class UMLViewProvider extends AbstractProvider implements IViewProvider { /** * @generated */ + @Override public final boolean provides(IOperation operation) { if (operation instanceof CreateViewForKindOperation) { return provides((CreateViewForKindOperation) operation); @@ -101,11 +102,11 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { */ protected boolean provides(CreateViewForKindOperation op) { /* - if (op.getViewKind() == Node.class) - return getNodeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null; - if (op.getViewKind() == Edge.class) - return getEdgeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null; - */ + * if (op.getViewKind() == Node.class) + * return getNodeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null; + * if (op.getViewKind() == Edge.class) + * return getEdgeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null; + */ // check Diagram Type should be the class diagram String modelID = UMLVisualIDRegistry.getModelID(op.getContainerView()); @@ -126,13 +127,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { */ protected String getDiagramProvidedId() { /* - * Indicates for which diagram this provider works for. - * <p> - * This method can be overloaded when diagram editor inherits from another one, but should never be <code>null</code> - * </p> - * - * @return the unique identifier of the diagram for which views are provided. - */ + * Indicates for which diagram this provider works for. + * <p> + * This method can be overloaded when diagram editor inherits from another one, but should never be <code>null</code> + * </p> + * + * @return the unique identifier of the diagram for which views are provided. + */ return ModelEditPart.MODEL_ID; } @@ -140,9 +141,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { * @generated */ protected boolean provides(CreateDiagramViewOperation op) { - return ModelEditPart.MODEL_ID.equals(op.getSemanticHint()) - && UMLVisualIDRegistry.getDiagramVisualID(getSemanticElement(op.getSemanticAdapter())) != null - && !UMLVisualIDRegistry.getDiagramVisualID(getSemanticElement(op.getSemanticAdapter())).isEmpty(); + return ModelEditPart.MODEL_ID.equals(op.getSemanticHint()) && UMLVisualIDRegistry.getDiagramVisualID(getSemanticElement(op.getSemanticAdapter())) != null && !UMLVisualIDRegistry.getDiagramVisualID(getSemanticElement(op.getSemanticAdapter())).isEmpty(); } /** @@ -175,9 +174,9 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { if (!op.getSemanticHint().equals(elementTypeHint)) { return false; // if semantic hint is specified it should be the same as in element type } - //if (domainElement != null && !visualID.equals(org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement))) { - // return false; // visual id for node EClass should match visual id from element type - //} + // if (domainElement != null && !visualID.equals(org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement))) { + // return false; // visual id for node EClass should match visual id from element type + // } } else { if (!ModelEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(op.getContainerView()))) { return false; // foreign diagram @@ -259,8 +258,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { case NestedComponentForClassEditPart.VISUAL_ID: case NestedComponentForInterfaceEditPart.VISUAL_ID: case NestedComponentForComponentEditPart.VISUAL_ID: - if (domainElement == null || !visualID - .equals(UMLVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement))) { + if (domainElement == null || !visualID.equals(UMLVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement))) { return false; // visual id in semantic hint should match visual id for domain element } break; @@ -285,21 +283,21 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { } String elementTypeHint = ((IHintedType) elementType).getSemanticHint(); - if (elementTypeHint == null - || (op.getSemanticHint() != null && !elementTypeHint.equals(op.getSemanticHint()))) { + if (elementTypeHint == null || (op.getSemanticHint() != null && !elementTypeHint.equals(op.getSemanticHint()))) { return false; // our hint is visual id and must be specified, and it should be the same as in element type } - //String visualID = org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry.getVisualID(elementTypeHint); - //org.eclipse.emf.ecore.EObject domainElement = getSemanticElement(op.getSemanticAdapter()); - //if (domainElement != null && !visualID.equals(org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry.getLinkWithClassVisualID(domainElement))) { - // return false; // visual id for link EClass should match visual id from element type - //} + // String visualID = org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry.getVisualID(elementTypeHint); + // org.eclipse.emf.ecore.EObject domainElement = getSemanticElement(op.getSemanticAdapter()); + // if (domainElement != null && !visualID.equals(org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry.getLinkWithClassVisualID(domainElement))) { + // return false; // visual id for link EClass should match visual id from element type + // } return true; } /** * @generated */ + @Override @SuppressWarnings("unchecked") public Diagram createDiagram(IAdaptable semanticAdapter, String diagramKind, PreferencesHint preferencesHint) { Diagram diagram = NotationFactory.eINSTANCE.createDiagram(); @@ -314,6 +312,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { /** * @generated */ + @Override public Node createNode(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) { final EObject domainElement = getSemanticElement(semanticAdapter); @@ -332,8 +331,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { case AssociationNodeEditPart.VISUAL_ID: return createAssociation_Shape(domainElement, containerView, index, persisted, preferencesHint); case InstanceSpecificationEditPart.VISUAL_ID: - return createInstanceSpecification_Shape(domainElement, containerView, index, persisted, - preferencesHint); + return createInstanceSpecification_Shape(domainElement, containerView, index, persisted, preferencesHint); case ComponentEditPart.VISUAL_ID: return createComponent_Shape(domainElement, containerView, index, persisted, preferencesHint); case SignalEditPart.VISUAL_ID: @@ -355,8 +353,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { case DataTypeEditPart.VISUAL_ID: return createDataType_Shape(domainElement, containerView, index, persisted, preferencesHint); case ConstraintEditPart.VISUAL_ID: - return createConstraint_PackagedElementShape(domainElement, containerView, index, persisted, - preferencesHint); + return createConstraint_PackagedElementShape(domainElement, containerView, index, persisted, preferencesHint); case CommentEditPart.VISUAL_ID: return createComment_Shape(domainElement, containerView, index, persisted, preferencesHint); case ShortCutDiagramEditPart.VISUAL_ID: @@ -368,77 +365,55 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { case DefaultNamedElementEditPart.VISUAL_ID: return createNamedElement_DefaultShape(domainElement, containerView, index, persisted, preferencesHint); case PropertyForClassEditPart.VISUAL_ID: - return createProperty_ClassAttributeLabel(domainElement, containerView, index, persisted, - preferencesHint); + return createProperty_ClassAttributeLabel(domainElement, containerView, index, persisted, preferencesHint); case PropertyForComponentEditPart.VISUAL_ID: - return createProperty_ComponentAttributeLabel(domainElement, containerView, index, persisted, - preferencesHint); + return createProperty_ComponentAttributeLabel(domainElement, containerView, index, persisted, preferencesHint); case PropertyForSignalEditPart.VISUAL_ID: - return createProperty_SignalAttributeLabel(domainElement, containerView, index, persisted, - preferencesHint); + return createProperty_SignalAttributeLabel(domainElement, containerView, index, persisted, preferencesHint); case PropertyForInterfaceEditPart.VISUAL_ID: - return createProperty_InterfaceAttributeLabel(domainElement, containerView, index, persisted, - preferencesHint); + return createProperty_InterfaceAttributeLabel(domainElement, containerView, index, persisted, preferencesHint); case PropertyforPrimitiveTypeEditPart.VISUAL_ID: - return createProperty_PrimitiveTypeAttributeLabel(domainElement, containerView, index, persisted, - preferencesHint); + return createProperty_PrimitiveTypeAttributeLabel(domainElement, containerView, index, persisted, preferencesHint); case PropertyforDataTypeEditPart.VISUAL_ID: - return createProperty_DataTypeAttributeLabel(domainElement, containerView, index, persisted, - preferencesHint); + return createProperty_DataTypeAttributeLabel(domainElement, containerView, index, persisted, preferencesHint); case NestedClassForClassEditPart.VISUAL_ID: - return createClass_ClassNestedClassifierLabel(domainElement, containerView, index, persisted, - preferencesHint); + return createClass_ClassNestedClassifierLabel(domainElement, containerView, index, persisted, preferencesHint); case NestedClassForComponentEditPart.VISUAL_ID: - return createClass_ComponentNestedClassifierLabel(domainElement, containerView, index, persisted, - preferencesHint); + return createClass_ComponentNestedClassifierLabel(domainElement, containerView, index, persisted, preferencesHint); case NestedClassForInterfaceEditPart.VISUAL_ID: - return createClass_InterfaceNestedClassifierLabel(domainElement, containerView, index, persisted, - preferencesHint); + return createClass_InterfaceNestedClassifierLabel(domainElement, containerView, index, persisted, preferencesHint); case OperationForClassEditPart.VISUAL_ID: - return createOperation_ClassOperationLabel(domainElement, containerView, index, persisted, - preferencesHint); + return createOperation_ClassOperationLabel(domainElement, containerView, index, persisted, preferencesHint); case OperationForComponentEditPart.VISUAL_ID: - return createOperation_ComponentOperationLabel(domainElement, containerView, index, persisted, - preferencesHint); + return createOperation_ComponentOperationLabel(domainElement, containerView, index, persisted, preferencesHint); case OperationForInterfaceEditpart.VISUAL_ID: - return createOperation_InterfaceOperationLabel(domainElement, containerView, index, persisted, - preferencesHint); + return createOperation_InterfaceOperationLabel(domainElement, containerView, index, persisted, preferencesHint); case OperationForPrimitiveTypeEditPart.VISUAL_ID: - return createOperation_PrimitiveTypeOperationLabel(domainElement, containerView, index, persisted, - preferencesHint); + return createOperation_PrimitiveTypeOperationLabel(domainElement, containerView, index, persisted, preferencesHint); case OperationForDataTypeEditPart.VISUAL_ID: - return createOperation_DataTypeOperationLabel(domainElement, containerView, index, persisted, - preferencesHint); + return createOperation_DataTypeOperationLabel(domainElement, containerView, index, persisted, preferencesHint); case ConnectableElementTemplateParameterEditPart.VISUAL_ID: - return createConnectableElementTemplateParameter_TemplateParameterLabel(domainElement, containerView, - index, persisted, preferencesHint); + return createConnectableElementTemplateParameter_TemplateParameterLabel(domainElement, containerView, index, persisted, preferencesHint); case OperationTemplateParameterEditPart.VISUAL_ID: - return createOperationTemplateParameter_TemplateParameterLabel(domainElement, containerView, index, - persisted, preferencesHint); + return createOperationTemplateParameter_TemplateParameterLabel(domainElement, containerView, index, persisted, preferencesHint); case ClassifierTemplateParameterEditPart.VISUAL_ID: - return createClassifierTemplateParameter_TemplateParameterLabel(domainElement, containerView, index, - persisted, preferencesHint); + return createClassifierTemplateParameter_TemplateParameterLabel(domainElement, containerView, index, persisted, preferencesHint); case TemplateParameterEditPart.VISUAL_ID: - return createTemplateParameter_TemplateParameterLabel(domainElement, containerView, index, persisted, - preferencesHint); + return createTemplateParameter_TemplateParameterLabel(domainElement, containerView, index, persisted, preferencesHint); case EnumerationLiteralEditPart.VISUAL_ID: - return createEnumerationLiteral_LiteralLabel(domainElement, containerView, index, persisted, - preferencesHint); + return createEnumerationLiteral_LiteralLabel(domainElement, containerView, index, persisted, preferencesHint); case ReceptionEditPart.VISUAL_ID: return createReception_ReceptionLabel(domainElement, containerView, index, persisted, preferencesHint); case ReceptionInInterfaceEditPart.VISUAL_ID: - return createReception_InterfaceReceptionLabel(domainElement, containerView, index, persisted, - preferencesHint); + return createReception_InterfaceReceptionLabel(domainElement, containerView, index, persisted, preferencesHint); case SlotEditPart.VISUAL_ID: return createSlot_SlotLabel(domainElement, containerView, index, persisted, preferencesHint); case RedefinableTemplateSignatureEditPart.VISUAL_ID: - return createRedefinableTemplateSignature_Shape(domainElement, containerView, index, persisted, - preferencesHint); + return createRedefinableTemplateSignature_Shape(domainElement, containerView, index, persisted, preferencesHint); case TemplateSignatureEditPart.VISUAL_ID: return createTemplateSignature_Shape(domainElement, containerView, index, persisted, preferencesHint); case InstanceSpecificationEditPartCN.VISUAL_ID: - return createInstanceSpecification_Shape_CN(domainElement, containerView, index, persisted, - preferencesHint); + return createInstanceSpecification_Shape_CN(domainElement, containerView, index, persisted, preferencesHint); case ComponentEditPartCN.VISUAL_ID: return createComponent_Shape_CN(domainElement, containerView, index, persisted, preferencesHint); case SignalEditPartCN.VISUAL_ID: @@ -462,62 +437,43 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { case CommentEditPartCN.VISUAL_ID: return createComment_Shape_CN(domainElement, containerView, index, persisted, preferencesHint); case ConstraintEditPartCN.VISUAL_ID: - return createConstraint_PackagedElementShape_CN(domainElement, containerView, index, persisted, - preferencesHint); + return createConstraint_PackagedElementShape_CN(domainElement, containerView, index, persisted, preferencesHint); case NestedInterfaceForClassEditPart.VISUAL_ID: - return createInterface_ClassNestedClassifierLabel(domainElement, containerView, index, persisted, - preferencesHint); + return createInterface_ClassNestedClassifierLabel(domainElement, containerView, index, persisted, preferencesHint); case NestedInterfaceForComponentEditPart.VISUAL_ID: - return createInterface_ComponentNestedClassifierLabel(domainElement, containerView, index, persisted, - preferencesHint); + return createInterface_ComponentNestedClassifierLabel(domainElement, containerView, index, persisted, preferencesHint); case NestedInterfaceForInterfaceEditPart.VISUAL_ID: - return createInterface_InterfaceNestedClassifierLabel(domainElement, containerView, index, persisted, - preferencesHint); + return createInterface_InterfaceNestedClassifierLabel(domainElement, containerView, index, persisted, preferencesHint); case NestedEnumerationForClassEditPart.VISUAL_ID: - return createEnumeration_ClassNestedClassifierLabel(domainElement, containerView, index, persisted, - preferencesHint); + return createEnumeration_ClassNestedClassifierLabel(domainElement, containerView, index, persisted, preferencesHint); case NestedEnumerationForComponentEditPart.VISUAL_ID: - return createEnumeration_ComponentNestedClassifierLabel(domainElement, containerView, index, persisted, - preferencesHint); + return createEnumeration_ComponentNestedClassifierLabel(domainElement, containerView, index, persisted, preferencesHint); case NestedEnumerationForInterfaceEditPart.VISUAL_ID: - return createEnumeration_InterfaceNestedClassifierLabel(domainElement, containerView, index, persisted, - preferencesHint); + return createEnumeration_InterfaceNestedClassifierLabel(domainElement, containerView, index, persisted, preferencesHint); case NestedPrimitiveTypeForClassEditPart.VISUAL_ID: - return createPrimitiveType_ClassNestedClassifierLabel(domainElement, containerView, index, persisted, - preferencesHint); + return createPrimitiveType_ClassNestedClassifierLabel(domainElement, containerView, index, persisted, preferencesHint); case NestedPrimitiveTypeForComponentEditPart.VISUAL_ID: - return createPrimitiveType_ComponentNestedClassifierLabel(domainElement, containerView, index, - persisted, preferencesHint); + return createPrimitiveType_ComponentNestedClassifierLabel(domainElement, containerView, index, persisted, preferencesHint); case NestedPrimitiveTypeForInterfaceEditPart.VISUAL_ID: - return createPrimitiveType_InterfaceNestedClassifierLabel(domainElement, containerView, index, - persisted, preferencesHint); + return createPrimitiveType_InterfaceNestedClassifierLabel(domainElement, containerView, index, persisted, preferencesHint); case NestedDataTypeForClassEditPart.VISUAL_ID: - return createDataType_ClassNestedClassifierLabel(domainElement, containerView, index, persisted, - preferencesHint); + return createDataType_ClassNestedClassifierLabel(domainElement, containerView, index, persisted, preferencesHint); case NestedDataTypeForComponentEditPart.VISUAL_ID: - return createDataType_ComponentNestedClassifierLabel(domainElement, containerView, index, persisted, - preferencesHint); + return createDataType_ComponentNestedClassifierLabel(domainElement, containerView, index, persisted, preferencesHint); case NestedDataTypeForInterfaceEditPart.VISUAL_ID: - return createDataType_InterfaceNestedClassifierLabel(domainElement, containerView, index, persisted, - preferencesHint); + return createDataType_InterfaceNestedClassifierLabel(domainElement, containerView, index, persisted, preferencesHint); case NestedSignalForClassEditPart.VISUAL_ID: - return createSignal_ClassNestedClassifierLabel(domainElement, containerView, index, persisted, - preferencesHint); + return createSignal_ClassNestedClassifierLabel(domainElement, containerView, index, persisted, preferencesHint); case NestedSignalForComponentEditPart.VISUAL_ID: - return createSignal_ComponentNestedClassifierLabel(domainElement, containerView, index, persisted, - preferencesHint); + return createSignal_ComponentNestedClassifierLabel(domainElement, containerView, index, persisted, preferencesHint); case NestedSignalForInterfaceEditPart.VISUAL_ID: - return createSignal_InterfaceNestedClassifierLabel(domainElement, containerView, index, persisted, - preferencesHint); + return createSignal_InterfaceNestedClassifierLabel(domainElement, containerView, index, persisted, preferencesHint); case NestedComponentForClassEditPart.VISUAL_ID: - return createComponent_ClassNestedClassifierLabel(domainElement, containerView, index, persisted, - preferencesHint); + return createComponent_ClassNestedClassifierLabel(domainElement, containerView, index, persisted, preferencesHint); case NestedComponentForInterfaceEditPart.VISUAL_ID: - return createComponent_InterfaceNestedClassifierLabel(domainElement, containerView, index, persisted, - preferencesHint); + return createComponent_InterfaceNestedClassifierLabel(domainElement, containerView, index, persisted, preferencesHint); case NestedComponentForComponentEditPart.VISUAL_ID: - return createComponent_ComponentNestedClassifierLabel(domainElement, containerView, index, persisted, - preferencesHint); + return createComponent_ComponentNestedClassifierLabel(domainElement, containerView, index, persisted, preferencesHint); } } // can't happen, provided #provides(CreateNodeViewOperation) is correct @@ -527,6 +483,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { /** * @generated */ + @Override public Edge createEdge(IAdaptable semanticAdapter, View containerView, String semanticHint, int index, boolean persisted, PreferencesHint preferencesHint) { IElementType elementType = getSemanticElementType(semanticAdapter); @@ -537,63 +494,45 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { case AssociationClassDashedLinkEditPart.VISUAL_ID: return createAssociationClass_TetherEdge(containerView, index, persisted, preferencesHint); case AssociationClassLinkEditPart.VISUAL_ID: - return createAssociationClass_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, - preferencesHint); + return createAssociationClass_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint); case AssociationEditPart.VISUAL_ID: - return createAssociation_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, - preferencesHint); + return createAssociation_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint); case AssociationBranchEditPart.VISUAL_ID: - return createAssociation_BranchEdge(getSemanticElement(semanticAdapter), containerView, index, - persisted, preferencesHint); + return createAssociation_BranchEdge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint); case GeneralizationEditPart.VISUAL_ID: - return createGeneralization_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, - preferencesHint); + return createGeneralization_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint); case InterfaceRealizationEditPart.VISUAL_ID: - return createInterfaceRealization_Edge(getSemanticElement(semanticAdapter), containerView, index, - persisted, preferencesHint); + return createInterfaceRealization_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint); case SubstitutionEditPart.VISUAL_ID: - return createSubstitution_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, - preferencesHint); + return createSubstitution_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint); case RealizationEditPart.VISUAL_ID: - return createRealization_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, - preferencesHint); + return createRealization_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint); case AbstractionEditPart.VISUAL_ID: - return createAbstraction_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, - preferencesHint); + return createAbstraction_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint); case UsageEditPart.VISUAL_ID: - return createUsage_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, - preferencesHint); + return createUsage_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint); case DependencyEditPart.VISUAL_ID: - return createDependency_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, - preferencesHint); + return createDependency_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint); case DependencyBranchEditPart.VISUAL_ID: - return createDependency_BranchEdge(getSemanticElement(semanticAdapter), containerView, index, persisted, - preferencesHint); + return createDependency_BranchEdge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint); case ElementImportEditPart.VISUAL_ID: - return createElementImport_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, - preferencesHint); + return createElementImport_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint); case PackageImportEditPart.VISUAL_ID: - return createPackageImport_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, - preferencesHint); + return createPackageImport_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint); case PackageMergeEditPart.VISUAL_ID: - return createPackageMerge_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, - preferencesHint); + return createPackageMerge_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint); case ProfileApplicationEditPart.VISUAL_ID: - return createProfileApplication_Edge(getSemanticElement(semanticAdapter), containerView, index, - persisted, preferencesHint); + return createProfileApplication_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint); case CommentAnnotatedElementEditPart.VISUAL_ID: return createComment_AnnotatedElementEdge(containerView, index, persisted, preferencesHint); case ConstraintConstrainedElementEditPart.VISUAL_ID: return createConstraint_ConstrainedElementEdge(containerView, index, persisted, preferencesHint); case TemplateBindingEditPart.VISUAL_ID: - return createTemplateBinding_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, - preferencesHint); + return createTemplateBinding_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint); case GeneralizationSetEditPart.VISUAL_ID: - return createGeneralizationSet_Edge(getSemanticElement(semanticAdapter), containerView, index, - persisted, preferencesHint); + return createGeneralizationSet_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint); case InstanceSpecificationLinkEditPart.VISUAL_ID: - return createInstanceSpecification_Edge(getSemanticElement(semanticAdapter), containerView, index, - persisted, preferencesHint); + return createInstanceSpecification_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint); case ContainmentLinkEditPart.VISUAL_ID: return createElement_ContainmentEdge(containerView, index, persisted, preferencesHint); case ConnectorTimeObservationEditPart.VISUAL_ID: @@ -601,8 +540,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { case ConnectorDurationObservationEditPart.VISUAL_ID: return createDurationObservation_EventEdge(containerView, index, persisted, preferencesHint); case InformationFlowEditPart.VISUAL_ID: - return createInformationFlow_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, - preferencesHint); + return createInformationFlow_Edge(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint); case ContextLinkEditPart.VISUAL_ID: return createConstraint_ContextEdge(containerView, index, persisted, preferencesHint); } @@ -622,18 +560,16 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); stampShortcut(containerView, node); - // initializeFromPreferences + // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DependencyNode"); - Node dependency_MultiNameLabel = createLabel(node, - UMLVisualIDRegistry.getType(MultiDependencyLabelEditPart.VISUAL_ID)); + Node dependency_MultiNameLabel = createLabel(node, UMLVisualIDRegistry.getType(MultiDependencyLabelEditPart.VISUAL_ID)); dependency_MultiNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); Location dependency_MultiNameLabel_Location = (Location) dependency_MultiNameLabel.getLayoutConstraint(); dependency_MultiNameLabel_Location.setX(0); dependency_MultiNameLabel_Location.setY(15); - Node dependency_FloatingNameLabel = createLabel(node, - UMLVisualIDRegistry.getType(DependencyFloatingNameEditPart.VISUAL_ID)); + Node dependency_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(DependencyFloatingNameEditPart.VISUAL_ID)); dependency_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); Location dependency_FloatingNameLabel_Location = (Location) dependency_FloatingNameLabel.getLayoutConstraint(); dependency_FloatingNameLabel_Location.setX(0); @@ -652,26 +588,19 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); stampShortcut(containerView, node); - // initializeFromPreferences + // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "AssociationClass"); - Node associationClass_NameLabel = createLabel(node, - UMLVisualIDRegistry.getType(AssociationClassNameEditPart.VISUAL_ID)); - Node associationClass_FloatingNameLabel = createLabel(node, - UMLVisualIDRegistry.getType(AssociationClassFloatingNameEditPart.VISUAL_ID)); + Node associationClass_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(AssociationClassNameEditPart.VISUAL_ID)); + Node associationClass_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(AssociationClassFloatingNameEditPart.VISUAL_ID)); associationClass_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location associationClass_FloatingNameLabel_Location = (Location) associationClass_FloatingNameLabel - .getLayoutConstraint(); + Location associationClass_FloatingNameLabel_Location = (Location) associationClass_FloatingNameLabel.getLayoutConstraint(); associationClass_FloatingNameLabel_Location.setX(0); associationClass_FloatingNameLabel_Location.setY(15); - createCompartment(node, UMLVisualIDRegistry.getType(AssociationClassAttributeCompartmentEditPart.VISUAL_ID), - true, true, true, true); - createCompartment(node, UMLVisualIDRegistry.getType(AssociationClassOperationCompartmentEditPart.VISUAL_ID), - true, true, true, true); - createCompartment(node, - UMLVisualIDRegistry.getType(AssociationClassNestedClassifierCompartmentEditPart.VISUAL_ID), true, true, - true, true); + createCompartment(node, UMLVisualIDRegistry.getType(AssociationClassAttributeCompartmentEditPart.VISUAL_ID), true, true, true, true); + createCompartment(node, UMLVisualIDRegistry.getType(AssociationClassOperationCompartmentEditPart.VISUAL_ID), true, true, true, true); + createCompartment(node, UMLVisualIDRegistry.getType(AssociationClassNestedClassifierCompartmentEditPart.VISUAL_ID), true, true, true, true); PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "AssociationClass"); return node; } @@ -687,15 +616,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); stampShortcut(containerView, node); - // initializeFromPreferences + // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "AssociationNode"); - Node association_FloatingNameLabel = createLabel(node, - UMLVisualIDRegistry.getType(AssociationFloatingNameEditPart.VISUAL_ID)); + Node association_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(AssociationFloatingNameEditPart.VISUAL_ID)); association_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location association_FloatingNameLabel_Location = (Location) association_FloatingNameLabel - .getLayoutConstraint(); + Location association_FloatingNameLabel_Location = (Location) association_FloatingNameLabel.getLayoutConstraint(); association_FloatingNameLabel_Location.setX(0); association_FloatingNameLabel_Location.setY(15); return node; @@ -712,21 +639,17 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); stampShortcut(containerView, node); - // initializeFromPreferences + // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "InstanceSpecification"); - Node instanceSpecification_NameLabel = createLabel(node, - UMLVisualIDRegistry.getType(InstanceSpecificationNameEditPart.VISUAL_ID)); - Node instanceSpecification_FloatingNameLabel = createLabel(node, - UMLVisualIDRegistry.getType(InstanceSpecificationFloatingNameEditPart.VISUAL_ID)); + Node instanceSpecification_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(InstanceSpecificationNameEditPart.VISUAL_ID)); + Node instanceSpecification_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(InstanceSpecificationFloatingNameEditPart.VISUAL_ID)); instanceSpecification_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location instanceSpecification_FloatingNameLabel_Location = (Location) instanceSpecification_FloatingNameLabel - .getLayoutConstraint(); + Location instanceSpecification_FloatingNameLabel_Location = (Location) instanceSpecification_FloatingNameLabel.getLayoutConstraint(); instanceSpecification_FloatingNameLabel_Location.setX(0); instanceSpecification_FloatingNameLabel_Location.setY(15); - createCompartment(node, UMLVisualIDRegistry.getType(InstanceSpecificationSlotCompartmentEditPart.VISUAL_ID), - true, true, true, true); + createCompartment(node, UMLVisualIDRegistry.getType(InstanceSpecificationSlotCompartmentEditPart.VISUAL_ID), true, true, true, true); PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "InstanceSpecification"); return node; } @@ -742,23 +665,19 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); stampShortcut(containerView, node); - // initializeFromPreferences + // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Component"); Node component_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(ComponentNameEditPart.VISUAL_ID)); - Node component_FloatingNameLabel = createLabel(node, - UMLVisualIDRegistry.getType(ComponentFloatingNameEditPart.VISUAL_ID)); + Node component_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(ComponentFloatingNameEditPart.VISUAL_ID)); component_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); Location component_FloatingNameLabel_Location = (Location) component_FloatingNameLabel.getLayoutConstraint(); component_FloatingNameLabel_Location.setX(0); component_FloatingNameLabel_Location.setY(15); - createCompartment(node, UMLVisualIDRegistry.getType(ComponentAttributeCompartmentEditPart.VISUAL_ID), true, - true, true, true); - createCompartment(node, UMLVisualIDRegistry.getType(ComponentOperationCompartmentEditPart.VISUAL_ID), true, - true, true, true); - createCompartment(node, UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPart.VISUAL_ID), - true, true, true, true); + createCompartment(node, UMLVisualIDRegistry.getType(ComponentAttributeCompartmentEditPart.VISUAL_ID), true, true, true, true); + createCompartment(node, UMLVisualIDRegistry.getType(ComponentOperationCompartmentEditPart.VISUAL_ID), true, true, true, true); + createCompartment(node, UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPart.VISUAL_ID), true, true, true, true); PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Component"); return node; } @@ -774,19 +693,17 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); stampShortcut(containerView, node); - // initializeFromPreferences + // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Signal"); Node signal_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(SignalNameEditPart.VISUAL_ID)); - Node signal_FloatingNameLabel = createLabel(node, - UMLVisualIDRegistry.getType(SignalFloatingNameEditPart.VISUAL_ID)); + Node signal_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(SignalFloatingNameEditPart.VISUAL_ID)); signal_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); Location signal_FloatingNameLabel_Location = (Location) signal_FloatingNameLabel.getLayoutConstraint(); signal_FloatingNameLabel_Location.setX(0); signal_FloatingNameLabel_Location.setY(15); - createCompartment(node, UMLVisualIDRegistry.getType(SignalAttributeCompartmentEditPart.VISUAL_ID), true, true, - true, true); + createCompartment(node, UMLVisualIDRegistry.getType(SignalAttributeCompartmentEditPart.VISUAL_ID), true, true, true, true); PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Signal"); return node; } @@ -802,23 +719,19 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); stampShortcut(containerView, node); - // initializeFromPreferences + // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Interface"); Node interface_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(InterfaceNameEditPart.VISUAL_ID)); - Node interface_FloatingNameLabel = createLabel(node, - UMLVisualIDRegistry.getType(InterfaceFloatingNameEditPart.VISUAL_ID)); + Node interface_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(InterfaceFloatingNameEditPart.VISUAL_ID)); interface_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); Location interface_FloatingNameLabel_Location = (Location) interface_FloatingNameLabel.getLayoutConstraint(); interface_FloatingNameLabel_Location.setX(0); interface_FloatingNameLabel_Location.setY(15); - createCompartment(node, UMLVisualIDRegistry.getType(InterfaceAttributeCompartmentEditPart.VISUAL_ID), true, - true, true, true); - createCompartment(node, UMLVisualIDRegistry.getType(InterfaceOperationCompartmentEditPart.VISUAL_ID), true, - true, true, true); - createCompartment(node, UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID), - true, true, true, true); + createCompartment(node, UMLVisualIDRegistry.getType(InterfaceAttributeCompartmentEditPart.VISUAL_ID), true, true, true, true); + createCompartment(node, UMLVisualIDRegistry.getType(InterfaceOperationCompartmentEditPart.VISUAL_ID), true, true, true, true); + createCompartment(node, UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID), true, true, true, true); PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Interface"); return node; } @@ -834,13 +747,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); stampShortcut(containerView, node); - // initializeFromPreferences + // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Model"); Node model_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(ModelNameEditPartTN.VISUAL_ID)); - createCompartment(node, UMLVisualIDRegistry.getType(ModelPackageableElementCompartmentEditPartTN.VISUAL_ID), - true, true, false, false); + createCompartment(node, UMLVisualIDRegistry.getType(ModelPackageableElementCompartmentEditPartTN.VISUAL_ID), true, true, false, false); PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Model"); return node; } @@ -856,20 +768,17 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); stampShortcut(containerView, node); - // initializeFromPreferences + // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Enumeration"); Node enumeration_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(EnumerationNameEditPart.VISUAL_ID)); - Node enumeration_FloatingNameLabel = createLabel(node, - UMLVisualIDRegistry.getType(EnumerationFloatingNameEditPart.VISUAL_ID)); + Node enumeration_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(EnumerationFloatingNameEditPart.VISUAL_ID)); enumeration_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location enumeration_FloatingNameLabel_Location = (Location) enumeration_FloatingNameLabel - .getLayoutConstraint(); + Location enumeration_FloatingNameLabel_Location = (Location) enumeration_FloatingNameLabel.getLayoutConstraint(); enumeration_FloatingNameLabel_Location.setX(0); enumeration_FloatingNameLabel_Location.setY(15); - createCompartment(node, UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID), - true, true, true, true); + createCompartment(node, UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID), true, true, true, true); PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Enumeration"); return node; } @@ -885,13 +794,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); stampShortcut(containerView, node); - // initializeFromPreferences + // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Package"); Node package_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(PackageNameEditPart.VISUAL_ID)); - createCompartment(node, UMLVisualIDRegistry.getType(PackagePackageableElementCompartmentEditPart.VISUAL_ID), - true, true, false, false); + createCompartment(node, UMLVisualIDRegistry.getType(PackagePackageableElementCompartmentEditPart.VISUAL_ID), true, true, false, false); PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Package"); return node; } @@ -907,17 +815,14 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); stampShortcut(containerView, node); - // initializeFromPreferences + // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "InformationItem"); - Node informationItem_NameLabel = createLabel(node, - UMLVisualIDRegistry.getType(InformationItemNameEditPart.VISUAL_ID)); - Node informationItem_FloatingNameLabel = createLabel(node, - UMLVisualIDRegistry.getType(InformationItemFloatingNameEditPart.VISUAL_ID)); + Node informationItem_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(InformationItemNameEditPart.VISUAL_ID)); + Node informationItem_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(InformationItemFloatingNameEditPart.VISUAL_ID)); informationItem_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location informationItem_FloatingNameLabel_Location = (Location) informationItem_FloatingNameLabel - .getLayoutConstraint(); + Location informationItem_FloatingNameLabel_Location = (Location) informationItem_FloatingNameLabel.getLayoutConstraint(); informationItem_FloatingNameLabel_Location.setX(0); informationItem_FloatingNameLabel_Location.setY(15); return node; @@ -934,23 +839,19 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); stampShortcut(containerView, node); - // initializeFromPreferences + // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Class"); Node class_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(ClassNameEditPart.VISUAL_ID)); - Node class_FloatingNameLabel = createLabel(node, - UMLVisualIDRegistry.getType(ClassFloatingNameEditPart.VISUAL_ID)); + Node class_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(ClassFloatingNameEditPart.VISUAL_ID)); class_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); Location class_FloatingNameLabel_Location = (Location) class_FloatingNameLabel.getLayoutConstraint(); class_FloatingNameLabel_Location.setX(0); class_FloatingNameLabel_Location.setY(15); - createCompartment(node, UMLVisualIDRegistry.getType(ClassAttributeCompartmentEditPart.VISUAL_ID), true, true, - true, true); - createCompartment(node, UMLVisualIDRegistry.getType(ClassOperationCompartmentEditPart.VISUAL_ID), true, true, - true, true); - createCompartment(node, UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPart.VISUAL_ID), true, - true, true, true); + createCompartment(node, UMLVisualIDRegistry.getType(ClassAttributeCompartmentEditPart.VISUAL_ID), true, true, true, true); + createCompartment(node, UMLVisualIDRegistry.getType(ClassOperationCompartmentEditPart.VISUAL_ID), true, true, true, true); + createCompartment(node, UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPart.VISUAL_ID), true, true, true, true); PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Class"); return node; } @@ -966,23 +867,18 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); stampShortcut(containerView, node); - // initializeFromPreferences + // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "PrimitiveType"); - Node primitiveType_NameLabel = createLabel(node, - UMLVisualIDRegistry.getType(PrimitiveTypeNameEditPart.VISUAL_ID)); - Node primitiveType_FloatingNameLabel = createLabel(node, - UMLVisualIDRegistry.getType(PrimitiveTypeFloatingNameEditPart.VISUAL_ID)); + Node primitiveType_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(PrimitiveTypeNameEditPart.VISUAL_ID)); + Node primitiveType_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(PrimitiveTypeFloatingNameEditPart.VISUAL_ID)); primitiveType_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location primitiveType_FloatingNameLabel_Location = (Location) primitiveType_FloatingNameLabel - .getLayoutConstraint(); + Location primitiveType_FloatingNameLabel_Location = (Location) primitiveType_FloatingNameLabel.getLayoutConstraint(); primitiveType_FloatingNameLabel_Location.setX(0); primitiveType_FloatingNameLabel_Location.setY(15); - createCompartment(node, UMLVisualIDRegistry.getType(PrimitiveTypeAttributeCompartmentEditPart.VISUAL_ID), true, - true, true, true); - createCompartment(node, UMLVisualIDRegistry.getType(PrimitiveTypeOperationCompartmentEditPart.VISUAL_ID), true, - true, true, true); + createCompartment(node, UMLVisualIDRegistry.getType(PrimitiveTypeAttributeCompartmentEditPart.VISUAL_ID), true, true, true, true); + createCompartment(node, UMLVisualIDRegistry.getType(PrimitiveTypeOperationCompartmentEditPart.VISUAL_ID), true, true, true, true); PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "PrimitiveType"); return node; } @@ -998,21 +894,18 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); stampShortcut(containerView, node); - // initializeFromPreferences + // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DataType"); Node dataType_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(DataTypeNameEditPart.VISUAL_ID)); - Node dataType_FloatingNameLabel = createLabel(node, - UMLVisualIDRegistry.getType(DataTypeFloatingNameEditPart.VISUAL_ID)); + Node dataType_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(DataTypeFloatingNameEditPart.VISUAL_ID)); dataType_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); Location dataType_FloatingNameLabel_Location = (Location) dataType_FloatingNameLabel.getLayoutConstraint(); dataType_FloatingNameLabel_Location.setX(0); dataType_FloatingNameLabel_Location.setY(15); - createCompartment(node, UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPart.VISUAL_ID), true, true, - true, true); - createCompartment(node, UMLVisualIDRegistry.getType(DataTypeOperationCompartmentEditPart.VISUAL_ID), true, true, - true, true); + createCompartment(node, UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPart.VISUAL_ID), true, true, true, true); + createCompartment(node, UMLVisualIDRegistry.getType(DataTypeOperationCompartmentEditPart.VISUAL_ID), true, true, true, true); PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "DataType"); return node; } @@ -1028,7 +921,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); stampShortcut(containerView, node); - // initializeFromPreferences + // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Constraint"); @@ -1048,7 +941,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); stampShortcut(containerView, node); - // initializeFromPreferences + // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Comment"); @@ -1067,7 +960,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); stampShortcut(containerView, node); - // initializeFromPreferences + // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "ShortCutDiagram"); @@ -1090,22 +983,18 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); stampShortcut(containerView, node); - // initializeFromPreferences + // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DurationObservation"); - Node durationObservation_FloatingNameLabel = createLabel(node, - UMLVisualIDRegistry.getType(DurationObservationFloatingNameEditPart.VISUAL_ID)); + Node durationObservation_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(DurationObservationFloatingNameEditPart.VISUAL_ID)); durationObservation_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location durationObservation_FloatingNameLabel_Location = (Location) durationObservation_FloatingNameLabel - .getLayoutConstraint(); + Location durationObservation_FloatingNameLabel_Location = (Location) durationObservation_FloatingNameLabel.getLayoutConstraint(); durationObservation_FloatingNameLabel_Location.setX(25); durationObservation_FloatingNameLabel_Location.setY(3); - Node durationObservation_StereotypeLabel = createLabel(node, - UMLVisualIDRegistry.getType(DurationObservationStereotypeLabelEditPart.VISUAL_ID)); + Node durationObservation_StereotypeLabel = createLabel(node, UMLVisualIDRegistry.getType(DurationObservationStereotypeLabelEditPart.VISUAL_ID)); durationObservation_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location durationObservation_StereotypeLabel_Location = (Location) durationObservation_StereotypeLabel - .getLayoutConstraint(); + Location durationObservation_StereotypeLabel_Location = (Location) durationObservation_StereotypeLabel.getLayoutConstraint(); durationObservation_StereotypeLabel_Location.setX(25); durationObservation_StereotypeLabel_Location.setY(-10); PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(node, prefStore, "DurationObservation"); @@ -1123,22 +1012,18 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); stampShortcut(containerView, node); - // initializeFromPreferences + // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "TimeObservation"); - Node timeObservation_FloatingNameLabel = createLabel(node, - UMLVisualIDRegistry.getType(TimeObservationFloatingNameEditPart.VISUAL_ID)); + Node timeObservation_FloatingNameLabel = createLabel(node, UMLVisualIDRegistry.getType(TimeObservationFloatingNameEditPart.VISUAL_ID)); timeObservation_FloatingNameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location timeObservation_FloatingNameLabel_Location = (Location) timeObservation_FloatingNameLabel - .getLayoutConstraint(); + Location timeObservation_FloatingNameLabel_Location = (Location) timeObservation_FloatingNameLabel.getLayoutConstraint(); timeObservation_FloatingNameLabel_Location.setX(25); timeObservation_FloatingNameLabel_Location.setY(3); - Node timeObservation_StereotypeLabel = createLabel(node, - UMLVisualIDRegistry.getType(TimeObservationStereotypeLabelEditPart.VISUAL_ID)); + Node timeObservation_StereotypeLabel = createLabel(node, UMLVisualIDRegistry.getType(TimeObservationStereotypeLabelEditPart.VISUAL_ID)); timeObservation_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location timeObservation_StereotypeLabel_Location = (Location) timeObservation_StereotypeLabel - .getLayoutConstraint(); + Location timeObservation_StereotypeLabel_Location = (Location) timeObservation_StereotypeLabel.getLayoutConstraint(); timeObservation_StereotypeLabel_Location.setX(25); timeObservation_StereotypeLabel_Location.setY(-10); PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(node, prefStore, "TimeObservation"); @@ -1156,12 +1041,11 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); stampShortcut(containerView, node); - // initializeFromPreferences + // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DefaultNamedElement"); - Node namedElement_NameLabel = createLabel(node, - UMLVisualIDRegistry.getType(DefaultNamedElementNameEditPart.VISUAL_ID)); + Node namedElement_NameLabel = createLabel(node, UMLVisualIDRegistry.getType(DefaultNamedElementNameEditPart.VISUAL_ID)); return node; } @@ -1401,8 +1285,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { node.setElement(domainElement); final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); - PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, - "ConnectableElementTemplateParameter"); + PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "ConnectableElementTemplateParameter"); return node; } @@ -1528,15 +1411,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { node.setType(UMLVisualIDRegistry.getType(RedefinableTemplateSignatureEditPart.VISUAL_ID)); ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); - // initializeFromPreferences + // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "RedefinableTemplateSignature"); - createCompartment(node, - UMLVisualIDRegistry.getType(RedefinableTemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID), - false, true, true, true); - PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, - "RedefinableTemplateSignature"); + createCompartment(node, UMLVisualIDRegistry.getType(RedefinableTemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID), false, true, true, true); + PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "RedefinableTemplateSignature"); return node; } @@ -1550,13 +1430,11 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { node.setType(UMLVisualIDRegistry.getType(TemplateSignatureEditPart.VISUAL_ID)); ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); - // initializeFromPreferences + // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "TemplateSignature"); - createCompartment(node, - UMLVisualIDRegistry.getType(TemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID), false, - true, true, true); + createCompartment(node, UMLVisualIDRegistry.getType(TemplateSignatureTemplateParameterCompartmentEditPart.VISUAL_ID), false, true, true, true); PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "TemplateSignature"); return node; } @@ -1571,21 +1449,17 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { node.setType(UMLVisualIDRegistry.getType(InstanceSpecificationEditPartCN.VISUAL_ID)); ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); - // initializeFromPreferences + // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "InstanceSpecification"); - Node instanceSpecification_NameLabel_CN = createLabel(node, - UMLVisualIDRegistry.getType(InstanceSpecificationNameEditPartCN.VISUAL_ID)); - Node instanceSpecification_FloatingNameLabel_CN = createLabel(node, - UMLVisualIDRegistry.getType(InstanceSpecificationFloatingNameEditPartCN.VISUAL_ID)); + Node instanceSpecification_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(InstanceSpecificationNameEditPartCN.VISUAL_ID)); + Node instanceSpecification_FloatingNameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(InstanceSpecificationFloatingNameEditPartCN.VISUAL_ID)); instanceSpecification_FloatingNameLabel_CN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location instanceSpecification_FloatingNameLabel_CN_Location = (Location) instanceSpecification_FloatingNameLabel_CN - .getLayoutConstraint(); + Location instanceSpecification_FloatingNameLabel_CN_Location = (Location) instanceSpecification_FloatingNameLabel_CN.getLayoutConstraint(); instanceSpecification_FloatingNameLabel_CN_Location.setX(0); instanceSpecification_FloatingNameLabel_CN_Location.setY(15); - createCompartment(node, UMLVisualIDRegistry.getType(InstanceSpecificationSlotCompartmentEditPartCN.VISUAL_ID), - true, true, true, true); + createCompartment(node, UMLVisualIDRegistry.getType(InstanceSpecificationSlotCompartmentEditPartCN.VISUAL_ID), true, true, true, true); PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "InstanceSpecification"); return node; } @@ -1600,24 +1474,19 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { node.setType(UMLVisualIDRegistry.getType(ComponentEditPartCN.VISUAL_ID)); ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); - // initializeFromPreferences + // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Component"); Node component_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(ComponentNameEditPartCN.VISUAL_ID)); - Node component_FloatingNameLabel_CN = createLabel(node, - UMLVisualIDRegistry.getType(ComponentFloatingNameEditPartCN.VISUAL_ID)); + Node component_FloatingNameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(ComponentFloatingNameEditPartCN.VISUAL_ID)); component_FloatingNameLabel_CN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location component_FloatingNameLabel_CN_Location = (Location) component_FloatingNameLabel_CN - .getLayoutConstraint(); + Location component_FloatingNameLabel_CN_Location = (Location) component_FloatingNameLabel_CN.getLayoutConstraint(); component_FloatingNameLabel_CN_Location.setX(0); component_FloatingNameLabel_CN_Location.setY(15); - createCompartment(node, UMLVisualIDRegistry.getType(ComponentAttributeCompartmentEditPartCN.VISUAL_ID), true, - true, true, true); - createCompartment(node, UMLVisualIDRegistry.getType(ComponentOperationCompartmentEditPartCN.VISUAL_ID), true, - true, true, true); - createCompartment(node, UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID), - true, true, true, true); + createCompartment(node, UMLVisualIDRegistry.getType(ComponentAttributeCompartmentEditPartCN.VISUAL_ID), true, true, true, true); + createCompartment(node, UMLVisualIDRegistry.getType(ComponentOperationCompartmentEditPartCN.VISUAL_ID), true, true, true, true); + createCompartment(node, UMLVisualIDRegistry.getType(ComponentNestedClassifierCompartmentEditPartCN.VISUAL_ID), true, true, true, true); PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Component"); return node; } @@ -1632,19 +1501,17 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { node.setType(UMLVisualIDRegistry.getType(SignalEditPartCN.VISUAL_ID)); ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); - // initializeFromPreferences + // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Signal"); Node signal_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(SignalNameEditPartCN.VISUAL_ID)); - Node signal_FloatingNameLabel_CN = createLabel(node, - UMLVisualIDRegistry.getType(SignalFloatingNameEditPartCN.VISUAL_ID)); + Node signal_FloatingNameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(SignalFloatingNameEditPartCN.VISUAL_ID)); signal_FloatingNameLabel_CN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); Location signal_FloatingNameLabel_CN_Location = (Location) signal_FloatingNameLabel_CN.getLayoutConstraint(); signal_FloatingNameLabel_CN_Location.setX(0); signal_FloatingNameLabel_CN_Location.setY(15); - createCompartment(node, UMLVisualIDRegistry.getType(SignalAttributeCompartmentEditPartCN.VISUAL_ID), true, true, - true, true); + createCompartment(node, UMLVisualIDRegistry.getType(SignalAttributeCompartmentEditPartCN.VISUAL_ID), true, true, true, true); PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Signal"); return node; } @@ -1659,24 +1526,19 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { node.setType(UMLVisualIDRegistry.getType(InterfaceEditPartCN.VISUAL_ID)); ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); - // initializeFromPreferences + // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Interface"); Node interface_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(InterfaceNameEditPartCN.VISUAL_ID)); - Node interface_FloatingNameLabel_CN = createLabel(node, - UMLVisualIDRegistry.getType(InterfaceFloatingNameEditPartCN.VISUAL_ID)); + Node interface_FloatingNameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(InterfaceFloatingNameEditPartCN.VISUAL_ID)); interface_FloatingNameLabel_CN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location interface_FloatingNameLabel_CN_Location = (Location) interface_FloatingNameLabel_CN - .getLayoutConstraint(); + Location interface_FloatingNameLabel_CN_Location = (Location) interface_FloatingNameLabel_CN.getLayoutConstraint(); interface_FloatingNameLabel_CN_Location.setX(0); interface_FloatingNameLabel_CN_Location.setY(15); - createCompartment(node, UMLVisualIDRegistry.getType(InterfaceAttributeCompartmentEditPartCN.VISUAL_ID), true, - true, true, true); - createCompartment(node, UMLVisualIDRegistry.getType(InterfaceOperationCompartmentEditPartCN.VISUAL_ID), true, - true, true, true); - createCompartment(node, UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID), - true, true, true, true); + createCompartment(node, UMLVisualIDRegistry.getType(InterfaceAttributeCompartmentEditPartCN.VISUAL_ID), true, true, true, true); + createCompartment(node, UMLVisualIDRegistry.getType(InterfaceOperationCompartmentEditPartCN.VISUAL_ID), true, true, true, true); + createCompartment(node, UMLVisualIDRegistry.getType(InterfaceNestedClassifierCompartmentEditPartCN.VISUAL_ID), true, true, true, true); PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Interface"); return node; } @@ -1691,13 +1553,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { node.setType(UMLVisualIDRegistry.getType(ModelEditPartCN.VISUAL_ID)); ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); - // initializeFromPreferences + // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Model"); Node model_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(ModelNameEditPartCN.VISUAL_ID)); - createCompartment(node, UMLVisualIDRegistry.getType(ModelPackageableElementCompartmentEditPartCN.VISUAL_ID), - true, true, false, false); + createCompartment(node, UMLVisualIDRegistry.getType(ModelPackageableElementCompartmentEditPartCN.VISUAL_ID), true, true, false, false); PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Model"); return node; } @@ -1712,22 +1573,17 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { node.setType(UMLVisualIDRegistry.getType(EnumerationEditPartCN.VISUAL_ID)); ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); - // initializeFromPreferences + // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Enumeration"); - Node enumeration_NameLabel_CN = createLabel(node, - UMLVisualIDRegistry.getType(EnumerationNameEditPartCN.VISUAL_ID)); - Node enumeration_FloatingNameLabel_CN = createLabel(node, - UMLVisualIDRegistry.getType(EnumerationFloatingNameEditPartCN.VISUAL_ID)); + Node enumeration_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(EnumerationNameEditPartCN.VISUAL_ID)); + Node enumeration_FloatingNameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(EnumerationFloatingNameEditPartCN.VISUAL_ID)); enumeration_FloatingNameLabel_CN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location enumeration_FloatingNameLabel_CN_Location = (Location) enumeration_FloatingNameLabel_CN - .getLayoutConstraint(); + Location enumeration_FloatingNameLabel_CN_Location = (Location) enumeration_FloatingNameLabel_CN.getLayoutConstraint(); enumeration_FloatingNameLabel_CN_Location.setX(0); enumeration_FloatingNameLabel_CN_Location.setY(15); - createCompartment(node, - UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID), true, true, - true, true); + createCompartment(node, UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID), true, true, true, true); PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Enumeration"); return node; } @@ -1742,13 +1598,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { node.setType(UMLVisualIDRegistry.getType(PackageEditPartCN.VISUAL_ID)); ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); - // initializeFromPreferences + // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Package"); Node package_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(PackageNameEditPartCN.VISUAL_ID)); - createCompartment(node, UMLVisualIDRegistry.getType(PackagePackageableElementCompartmentEditPartCN.VISUAL_ID), - true, true, false, false); + createCompartment(node, UMLVisualIDRegistry.getType(PackagePackageableElementCompartmentEditPartCN.VISUAL_ID), true, true, false, false); PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Package"); return node; } @@ -1763,17 +1618,14 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { node.setType(UMLVisualIDRegistry.getType(InformationItemEditPartCN.VISUAL_ID)); ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); - // initializeFromPreferences + // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "InformationItem"); - Node informationItem_NameLabel_CN = createLabel(node, - UMLVisualIDRegistry.getType(InformationItemNameEditPartCN.VISUAL_ID)); - Node informationItem_FloatingNameLabel_CN = createLabel(node, - UMLVisualIDRegistry.getType(InformationItemFloatingNameEditPartCN.VISUAL_ID)); + Node informationItem_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(InformationItemNameEditPartCN.VISUAL_ID)); + Node informationItem_FloatingNameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(InformationItemFloatingNameEditPartCN.VISUAL_ID)); informationItem_FloatingNameLabel_CN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location informationItem_FloatingNameLabel_CN_Location = (Location) informationItem_FloatingNameLabel_CN - .getLayoutConstraint(); + Location informationItem_FloatingNameLabel_CN_Location = (Location) informationItem_FloatingNameLabel_CN.getLayoutConstraint(); informationItem_FloatingNameLabel_CN_Location.setX(0); informationItem_FloatingNameLabel_CN_Location.setY(15); return node; @@ -1789,23 +1641,19 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { node.setType(UMLVisualIDRegistry.getType(ClassEditPartCN.VISUAL_ID)); ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); - // initializeFromPreferences + // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Class"); Node class_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(ClassNameEditPartCN.VISUAL_ID)); - Node class_FloatingNameLabel_CN = createLabel(node, - UMLVisualIDRegistry.getType(ClassFloatingNameEditPartCN.VISUAL_ID)); + Node class_FloatingNameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(ClassFloatingNameEditPartCN.VISUAL_ID)); class_FloatingNameLabel_CN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); Location class_FloatingNameLabel_CN_Location = (Location) class_FloatingNameLabel_CN.getLayoutConstraint(); class_FloatingNameLabel_CN_Location.setX(0); class_FloatingNameLabel_CN_Location.setY(15); - createCompartment(node, UMLVisualIDRegistry.getType(ClassAttributeCompartmentEditPartCN.VISUAL_ID), true, true, - true, true); - createCompartment(node, UMLVisualIDRegistry.getType(ClassOperationCompartmentEditPartCN.VISUAL_ID), true, true, - true, true); - createCompartment(node, UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID), true, - true, true, true); + createCompartment(node, UMLVisualIDRegistry.getType(ClassAttributeCompartmentEditPartCN.VISUAL_ID), true, true, true, true); + createCompartment(node, UMLVisualIDRegistry.getType(ClassOperationCompartmentEditPartCN.VISUAL_ID), true, true, true, true); + createCompartment(node, UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPartCN.VISUAL_ID), true, true, true, true); PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Class"); return node; } @@ -1820,23 +1668,18 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { node.setType(UMLVisualIDRegistry.getType(PrimitiveTypeEditPartCN.VISUAL_ID)); ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); - // initializeFromPreferences + // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "PrimitiveType"); - Node primitiveType_NameLabel_CN = createLabel(node, - UMLVisualIDRegistry.getType(PrimitiveTypeNameEditPartCN.VISUAL_ID)); - Node primitiveType_FloatingNameLabel_CN = createLabel(node, - UMLVisualIDRegistry.getType(PrimitiveTypeFloatingNameEditPartCN.VISUAL_ID)); + Node primitiveType_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(PrimitiveTypeNameEditPartCN.VISUAL_ID)); + Node primitiveType_FloatingNameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(PrimitiveTypeFloatingNameEditPartCN.VISUAL_ID)); primitiveType_FloatingNameLabel_CN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location primitiveType_FloatingNameLabel_CN_Location = (Location) primitiveType_FloatingNameLabel_CN - .getLayoutConstraint(); + Location primitiveType_FloatingNameLabel_CN_Location = (Location) primitiveType_FloatingNameLabel_CN.getLayoutConstraint(); primitiveType_FloatingNameLabel_CN_Location.setX(0); primitiveType_FloatingNameLabel_CN_Location.setY(15); - createCompartment(node, UMLVisualIDRegistry.getType(PrimitiveTypeAttributeCompartmentEditPartCN.VISUAL_ID), - true, true, true, true); - createCompartment(node, UMLVisualIDRegistry.getType(PrimitiveTypeOperationCompartmentEditPartCN.VISUAL_ID), - true, true, true, true); + createCompartment(node, UMLVisualIDRegistry.getType(PrimitiveTypeAttributeCompartmentEditPartCN.VISUAL_ID), true, true, true, true); + createCompartment(node, UMLVisualIDRegistry.getType(PrimitiveTypeOperationCompartmentEditPartCN.VISUAL_ID), true, true, true, true); PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "PrimitiveType"); return node; } @@ -1851,22 +1694,18 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { node.setType(UMLVisualIDRegistry.getType(DataTypeEditPartCN.VISUAL_ID)); ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); - // initializeFromPreferences + // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DataType"); Node dataType_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(DataTypeNameEditPartCN.VISUAL_ID)); - Node dataType_FloatingNameLabel_CN = createLabel(node, - UMLVisualIDRegistry.getType(DataTypeFloatingNameEditPartCN.VISUAL_ID)); + Node dataType_FloatingNameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(DataTypeFloatingNameEditPartCN.VISUAL_ID)); dataType_FloatingNameLabel_CN.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location dataType_FloatingNameLabel_CN_Location = (Location) dataType_FloatingNameLabel_CN - .getLayoutConstraint(); + Location dataType_FloatingNameLabel_CN_Location = (Location) dataType_FloatingNameLabel_CN.getLayoutConstraint(); dataType_FloatingNameLabel_CN_Location.setX(0); dataType_FloatingNameLabel_CN_Location.setY(15); - createCompartment(node, UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPartCN.VISUAL_ID), true, - true, true, true); - createCompartment(node, UMLVisualIDRegistry.getType(DataTypeOperationCompartmentEditPartCN.VISUAL_ID), true, - true, true, true); + createCompartment(node, UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPartCN.VISUAL_ID), true, true, true, true); + createCompartment(node, UMLVisualIDRegistry.getType(DataTypeOperationCompartmentEditPartCN.VISUAL_ID), true, true, true, true); PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "DataType"); return node; } @@ -1881,7 +1720,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { node.setType(UMLVisualIDRegistry.getType(CommentEditPartCN.VISUAL_ID)); ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); - // initializeFromPreferences + // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Comment"); @@ -1899,14 +1738,12 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { node.setType(UMLVisualIDRegistry.getType(ConstraintEditPartCN.VISUAL_ID)); ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); - // initializeFromPreferences + // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Constraint"); - Node constraint_NameLabel_CN = createLabel(node, - UMLVisualIDRegistry.getType(ConstraintNameEditPartCN.VISUAL_ID)); - Node constraint_FloatingNameLabel_CN = createLabel(node, - UMLVisualIDRegistry.getType(ConstraintBodyEditPartCN.VISUAL_ID)); + Node constraint_NameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(ConstraintNameEditPartCN.VISUAL_ID)); + Node constraint_FloatingNameLabel_CN = createLabel(node, UMLVisualIDRegistry.getType(ConstraintBodyEditPartCN.VISUAL_ID)); return node; } @@ -2206,7 +2043,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); - List<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2); + List<RelativeBendpoint> points = new ArrayList<>(2); points.add(new RelativeBendpoint()); points.add(new RelativeBendpoint()); bendpoints.setPoints(points); @@ -2218,10 +2055,10 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "AssociationClassDashedLink"); - //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); - //if (routing != null) { - // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); - //} + // org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); + // if (routing != null) { + // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); + // } return edge; } @@ -2234,7 +2071,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); - List<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2); + List<RelativeBendpoint> points = new ArrayList<>(2); points.add(new RelativeBendpoint()); points.add(new RelativeBendpoint()); bendpoints.setPoints(points); @@ -2246,22 +2083,18 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "AssociationClassLink"); - //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); - //if (routing != null) { - // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); - //} - Node associationClass_SourceRoleLabel = createLabel(edge, - UMLVisualIDRegistry.getType(AssociationClassRoleSourceEditPart.VISUAL_ID)); + // org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); + // if (routing != null) { + // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); + // } + Node associationClass_SourceRoleLabel = createLabel(edge, UMLVisualIDRegistry.getType(AssociationClassRoleSourceEditPart.VISUAL_ID)); associationClass_SourceRoleLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location associationClass_SourceRoleLabel_Location = (Location) associationClass_SourceRoleLabel - .getLayoutConstraint(); + Location associationClass_SourceRoleLabel_Location = (Location) associationClass_SourceRoleLabel.getLayoutConstraint(); associationClass_SourceRoleLabel_Location.setX(0); associationClass_SourceRoleLabel_Location.setY(-20); - Node associationClass_TargetRoleLabel = createLabel(edge, - UMLVisualIDRegistry.getType(AssociationClassRoleTargetEditPart.VISUAL_ID)); + Node associationClass_TargetRoleLabel = createLabel(edge, UMLVisualIDRegistry.getType(AssociationClassRoleTargetEditPart.VISUAL_ID)); associationClass_TargetRoleLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location associationClass_TargetRoleLabel_Location = (Location) associationClass_TargetRoleLabel - .getLayoutConstraint(); + Location associationClass_TargetRoleLabel_Location = (Location) associationClass_TargetRoleLabel.getLayoutConstraint(); associationClass_TargetRoleLabel_Location.setX(0); associationClass_TargetRoleLabel_Location.setY(20); @@ -2277,7 +2110,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); - List<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2); + List<RelativeBendpoint> points = new ArrayList<>(2); points.add(new RelativeBendpoint()); points.add(new RelativeBendpoint()); bendpoints.setPoints(points); @@ -2289,12 +2122,11 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "AssociationLink"); - //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); - //if (routing != null) { - // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); - //} - Node association_StereotypeLabel = createLabel(edge, - UMLVisualIDRegistry.getType(AppliedStereotypeAssociationEditPart.VISUAL_ID)); + // org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); + // if (routing != null) { + // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); + // } + Node association_StereotypeLabel = createLabel(edge, UMLVisualIDRegistry.getType(AppliedStereotypeAssociationEditPart.VISUAL_ID)); association_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); Location association_StereotypeLabel_Location = (Location) association_StereotypeLabel.getLayoutConstraint(); association_StereotypeLabel_Location.setX(0); @@ -2304,30 +2136,24 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { Location association_NameLabel_Location = (Location) association_NameLabel.getLayoutConstraint(); association_NameLabel_Location.setX(0); association_NameLabel_Location.setY(20); - Node association_TargetRoleLabel = createLabel(edge, - UMLVisualIDRegistry.getType(AssociationTargetNameEditPart.VISUAL_ID)); + Node association_TargetRoleLabel = createLabel(edge, UMLVisualIDRegistry.getType(AssociationTargetNameEditPart.VISUAL_ID)); association_TargetRoleLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); Location association_TargetRoleLabel_Location = (Location) association_TargetRoleLabel.getLayoutConstraint(); association_TargetRoleLabel_Location.setX(0); association_TargetRoleLabel_Location.setY(-20); - Node association_SourceRoleLabel = createLabel(edge, - UMLVisualIDRegistry.getType(AssociationSourceNameEditPart.VISUAL_ID)); + Node association_SourceRoleLabel = createLabel(edge, UMLVisualIDRegistry.getType(AssociationSourceNameEditPart.VISUAL_ID)); association_SourceRoleLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); Location association_SourceRoleLabel_Location = (Location) association_SourceRoleLabel.getLayoutConstraint(); association_SourceRoleLabel_Location.setX(0); association_SourceRoleLabel_Location.setY(20); - Node association_SourceMultiplicityLabel = createLabel(edge, - UMLVisualIDRegistry.getType(AssociationMultiplicitySourceEditPart.VISUAL_ID)); + Node association_SourceMultiplicityLabel = createLabel(edge, UMLVisualIDRegistry.getType(AssociationMultiplicitySourceEditPart.VISUAL_ID)); association_SourceMultiplicityLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location association_SourceMultiplicityLabel_Location = (Location) association_SourceMultiplicityLabel - .getLayoutConstraint(); + Location association_SourceMultiplicityLabel_Location = (Location) association_SourceMultiplicityLabel.getLayoutConstraint(); association_SourceMultiplicityLabel_Location.setX(0); association_SourceMultiplicityLabel_Location.setY(20); - Node association_TargetMultiplicityLabel = createLabel(edge, - UMLVisualIDRegistry.getType(AssociationMultiplicityTargetEditPart.VISUAL_ID)); + Node association_TargetMultiplicityLabel = createLabel(edge, UMLVisualIDRegistry.getType(AssociationMultiplicityTargetEditPart.VISUAL_ID)); association_TargetMultiplicityLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location association_TargetMultiplicityLabel_Location = (Location) association_TargetMultiplicityLabel - .getLayoutConstraint(); + Location association_TargetMultiplicityLabel_Location = (Location) association_TargetMultiplicityLabel.getLayoutConstraint(); association_TargetMultiplicityLabel_Location.setX(0); association_TargetMultiplicityLabel_Location.setY(-20); @@ -2343,7 +2169,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); - List<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2); + List<RelativeBendpoint> points = new ArrayList<>(2); points.add(new RelativeBendpoint()); points.add(new RelativeBendpoint()); bendpoints.setPoints(points); @@ -2355,21 +2181,18 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "AssociationBranchLink"); - //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); - //if (routing != null) { - // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); - //} - Node association_BranchRoleLabel = createLabel(edge, - UMLVisualIDRegistry.getType(AssociationBranchRoleEditPart.VISUAL_ID)); + // org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); + // if (routing != null) { + // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); + // } + Node association_BranchRoleLabel = createLabel(edge, UMLVisualIDRegistry.getType(AssociationBranchRoleEditPart.VISUAL_ID)); association_BranchRoleLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); Location association_BranchRoleLabel_Location = (Location) association_BranchRoleLabel.getLayoutConstraint(); association_BranchRoleLabel_Location.setX(0); association_BranchRoleLabel_Location.setY(-20); - Node association_BranchMultiplicityLabel = createLabel(edge, - UMLVisualIDRegistry.getType(AssociationBranchMutliplicityEditPart.VISUAL_ID)); + Node association_BranchMultiplicityLabel = createLabel(edge, UMLVisualIDRegistry.getType(AssociationBranchMutliplicityEditPart.VISUAL_ID)); association_BranchMultiplicityLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location association_BranchMultiplicityLabel_Location = (Location) association_BranchMultiplicityLabel - .getLayoutConstraint(); + Location association_BranchMultiplicityLabel_Location = (Location) association_BranchMultiplicityLabel.getLayoutConstraint(); association_BranchMultiplicityLabel_Location.setX(0); association_BranchMultiplicityLabel_Location.setY(20); @@ -2385,7 +2208,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); - List<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2); + List<RelativeBendpoint> points = new ArrayList<>(2); points.add(new RelativeBendpoint()); points.add(new RelativeBendpoint()); bendpoints.setPoints(points); @@ -2397,15 +2220,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Generalization"); - //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); - //if (routing != null) { - // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); - //} - Node generalization_StereotypeLabel = createLabel(edge, - UMLVisualIDRegistry.getType(AppliedStereotyperGeneralizationEditPart.VISUAL_ID)); + // org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); + // if (routing != null) { + // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); + // } + Node generalization_StereotypeLabel = createLabel(edge, UMLVisualIDRegistry.getType(AppliedStereotyperGeneralizationEditPart.VISUAL_ID)); generalization_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location generalization_StereotypeLabel_Location = (Location) generalization_StereotypeLabel - .getLayoutConstraint(); + Location generalization_StereotypeLabel_Location = (Location) generalization_StereotypeLabel.getLayoutConstraint(); generalization_StereotypeLabel_Location.setX(0); generalization_StereotypeLabel_Location.setY(40); @@ -2421,7 +2242,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); - List<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2); + List<RelativeBendpoint> points = new ArrayList<>(2); points.add(new RelativeBendpoint()); points.add(new RelativeBendpoint()); bendpoints.setPoints(points); @@ -2433,22 +2254,18 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "InterfaceRealization"); - //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); - //if (routing != null) { - // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); - //} - Node interfaceRealization_StereotypeLabel = createLabel(edge, - UMLVisualIDRegistry.getType(AppliedStereotypeInterfaceRealizationEditPart.VISUAL_ID)); + // org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); + // if (routing != null) { + // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); + // } + Node interfaceRealization_StereotypeLabel = createLabel(edge, UMLVisualIDRegistry.getType(AppliedStereotypeInterfaceRealizationEditPart.VISUAL_ID)); interfaceRealization_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location interfaceRealization_StereotypeLabel_Location = (Location) interfaceRealization_StereotypeLabel - .getLayoutConstraint(); + Location interfaceRealization_StereotypeLabel_Location = (Location) interfaceRealization_StereotypeLabel.getLayoutConstraint(); interfaceRealization_StereotypeLabel_Location.setX(0); interfaceRealization_StereotypeLabel_Location.setY(40); - Node interfaceRealization_NameLabel = createLabel(edge, - UMLVisualIDRegistry.getType(InterfaceRealizationNameEditPart.VISUAL_ID)); + Node interfaceRealization_NameLabel = createLabel(edge, UMLVisualIDRegistry.getType(InterfaceRealizationNameEditPart.VISUAL_ID)); interfaceRealization_NameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location interfaceRealization_NameLabel_Location = (Location) interfaceRealization_NameLabel - .getLayoutConstraint(); + Location interfaceRealization_NameLabel_Location = (Location) interfaceRealization_NameLabel.getLayoutConstraint(); interfaceRealization_NameLabel_Location.setX(0); interfaceRealization_NameLabel_Location.setY(60); @@ -2464,7 +2281,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); - List<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2); + List<RelativeBendpoint> points = new ArrayList<>(2); points.add(new RelativeBendpoint()); points.add(new RelativeBendpoint()); bendpoints.setPoints(points); @@ -2476,18 +2293,16 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Substitution"); - //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); - //if (routing != null) { - // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); - //} - Node substitution_StereotypeLabel = createLabel(edge, - UMLVisualIDRegistry.getType(AppliedStereotypeSubstitutionEditPart.VISUAL_ID)); + // org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); + // if (routing != null) { + // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); + // } + Node substitution_StereotypeLabel = createLabel(edge, UMLVisualIDRegistry.getType(AppliedStereotypeSubstitutionEditPart.VISUAL_ID)); substitution_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); Location substitution_StereotypeLabel_Location = (Location) substitution_StereotypeLabel.getLayoutConstraint(); substitution_StereotypeLabel_Location.setX(0); substitution_StereotypeLabel_Location.setY(40); - Node substitution_NameLabel = createLabel(edge, - UMLVisualIDRegistry.getType(SubstitutionNameEditPart.VISUAL_ID)); + Node substitution_NameLabel = createLabel(edge, UMLVisualIDRegistry.getType(SubstitutionNameEditPart.VISUAL_ID)); substitution_NameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); Location substitution_NameLabel_Location = (Location) substitution_NameLabel.getLayoutConstraint(); substitution_NameLabel_Location.setX(0); @@ -2505,7 +2320,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); - List<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2); + List<RelativeBendpoint> points = new ArrayList<>(2); points.add(new RelativeBendpoint()); points.add(new RelativeBendpoint()); bendpoints.setPoints(points); @@ -2517,12 +2332,11 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Realization"); - //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); - //if (routing != null) { - // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); - //} - Node realization_StereotypeLabel = createLabel(edge, - UMLVisualIDRegistry.getType(AppliedStereotypeRealizationEditPart.VISUAL_ID)); + // org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); + // if (routing != null) { + // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); + // } + Node realization_StereotypeLabel = createLabel(edge, UMLVisualIDRegistry.getType(AppliedStereotypeRealizationEditPart.VISUAL_ID)); realization_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); Location realization_StereotypeLabel_Location = (Location) realization_StereotypeLabel.getLayoutConstraint(); realization_StereotypeLabel_Location.setX(0); @@ -2545,7 +2359,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); - List<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2); + List<RelativeBendpoint> points = new ArrayList<>(2); points.add(new RelativeBendpoint()); points.add(new RelativeBendpoint()); bendpoints.setPoints(points); @@ -2557,17 +2371,16 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Abstraction"); - //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); - //if (routing != null) { - // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); - //} + // org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); + // if (routing != null) { + // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); + // } Node abstraction_NameLabel = createLabel(edge, UMLVisualIDRegistry.getType(AbstractionNameEditPart.VISUAL_ID)); abstraction_NameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); Location abstraction_NameLabel_Location = (Location) abstraction_NameLabel.getLayoutConstraint(); abstraction_NameLabel_Location.setX(0); abstraction_NameLabel_Location.setY(40); - Node abstraction_StereotypeLabel = createLabel(edge, - UMLVisualIDRegistry.getType(AppliedStereotypeAbstractionEditPart.VISUAL_ID)); + Node abstraction_StereotypeLabel = createLabel(edge, UMLVisualIDRegistry.getType(AppliedStereotypeAbstractionEditPart.VISUAL_ID)); abstraction_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); Location abstraction_StereotypeLabel_Location = (Location) abstraction_StereotypeLabel.getLayoutConstraint(); abstraction_StereotypeLabel_Location.setX(0); @@ -2585,7 +2398,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); - List<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2); + List<RelativeBendpoint> points = new ArrayList<>(2); points.add(new RelativeBendpoint()); points.add(new RelativeBendpoint()); bendpoints.setPoints(points); @@ -2597,17 +2410,16 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Usage"); - //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); - //if (routing != null) { - // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); - //} + // org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); + // if (routing != null) { + // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); + // } Node usage_NameLabel = createLabel(edge, UMLVisualIDRegistry.getType(UsageNameEditPart.VISUAL_ID)); usage_NameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); Location usage_NameLabel_Location = (Location) usage_NameLabel.getLayoutConstraint(); usage_NameLabel_Location.setX(0); usage_NameLabel_Location.setY(40); - Node usage_StereotypeLabel = createLabel(edge, - UMLVisualIDRegistry.getType(AppliedStereotypeUsageEditPart.VISUAL_ID)); + Node usage_StereotypeLabel = createLabel(edge, UMLVisualIDRegistry.getType(AppliedStereotypeUsageEditPart.VISUAL_ID)); usage_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); Location usage_StereotypeLabel_Location = (Location) usage_StereotypeLabel.getLayoutConstraint(); usage_StereotypeLabel_Location.setX(0); @@ -2625,7 +2437,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); - List<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2); + List<RelativeBendpoint> points = new ArrayList<>(2); points.add(new RelativeBendpoint()); points.add(new RelativeBendpoint()); bendpoints.setPoints(points); @@ -2637,17 +2449,16 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "DependencyLink"); - //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); - //if (routing != null) { - // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); - //} + // org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); + // if (routing != null) { + // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); + // } Node dependency_NameLabel = createLabel(edge, UMLVisualIDRegistry.getType(DependencyNameEditPart.VISUAL_ID)); dependency_NameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); Location dependency_NameLabel_Location = (Location) dependency_NameLabel.getLayoutConstraint(); dependency_NameLabel_Location.setX(0); dependency_NameLabel_Location.setY(40); - Node dependency_StereotypeLabel = createLabel(edge, - UMLVisualIDRegistry.getType(AppliedStereotypeDependencyEditPart.VISUAL_ID)); + Node dependency_StereotypeLabel = createLabel(edge, UMLVisualIDRegistry.getType(AppliedStereotypeDependencyEditPart.VISUAL_ID)); dependency_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); Location dependency_StereotypeLabel_Location = (Location) dependency_StereotypeLabel.getLayoutConstraint(); dependency_StereotypeLabel_Location.setX(0); @@ -2665,7 +2476,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); - List<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2); + List<RelativeBendpoint> points = new ArrayList<>(2); points.add(new RelativeBendpoint()); points.add(new RelativeBendpoint()); bendpoints.setPoints(points); @@ -2677,10 +2488,10 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "DependencyBranchLink"); - //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); - //if (routing != null) { - // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); - //} + // org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); + // if (routing != null) { + // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); + // } return edge; } @@ -2693,7 +2504,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); - List<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2); + List<RelativeBendpoint> points = new ArrayList<>(2); points.add(new RelativeBendpoint()); points.add(new RelativeBendpoint()); bendpoints.setPoints(points); @@ -2705,21 +2516,18 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "ElementImport"); - //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); - //if (routing != null) { - // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); - //} - Node elementImport_AliasLabel = createLabel(edge, - UMLVisualIDRegistry.getType(ElementImportAliasEditPart.VISUAL_ID)); + // org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); + // if (routing != null) { + // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); + // } + Node elementImport_AliasLabel = createLabel(edge, UMLVisualIDRegistry.getType(ElementImportAliasEditPart.VISUAL_ID)); elementImport_AliasLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); Location elementImport_AliasLabel_Location = (Location) elementImport_AliasLabel.getLayoutConstraint(); elementImport_AliasLabel_Location.setX(0); elementImport_AliasLabel_Location.setY(40); - Node elementImport_StereotypeLabel = createLabel(edge, - UMLVisualIDRegistry.getType(AppliedStereotypeElementImportEditPart.VISUAL_ID)); + Node elementImport_StereotypeLabel = createLabel(edge, UMLVisualIDRegistry.getType(AppliedStereotypeElementImportEditPart.VISUAL_ID)); elementImport_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location elementImport_StereotypeLabel_Location = (Location) elementImport_StereotypeLabel - .getLayoutConstraint(); + Location elementImport_StereotypeLabel_Location = (Location) elementImport_StereotypeLabel.getLayoutConstraint(); elementImport_StereotypeLabel_Location.setX(0); elementImport_StereotypeLabel_Location.setY(60); @@ -2735,7 +2543,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); - List<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2); + List<RelativeBendpoint> points = new ArrayList<>(2); points.add(new RelativeBendpoint()); points.add(new RelativeBendpoint()); bendpoints.setPoints(points); @@ -2747,15 +2555,13 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "PackageImport"); - //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); - //if (routing != null) { - // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); - //} - Node packageImport_StereotypeLabel = createLabel(edge, - UMLVisualIDRegistry.getType(AppliedStereotypePackageImportEditPart.VISUAL_ID)); + // org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); + // if (routing != null) { + // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); + // } + Node packageImport_StereotypeLabel = createLabel(edge, UMLVisualIDRegistry.getType(AppliedStereotypePackageImportEditPart.VISUAL_ID)); packageImport_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location packageImport_StereotypeLabel_Location = (Location) packageImport_StereotypeLabel - .getLayoutConstraint(); + Location packageImport_StereotypeLabel_Location = (Location) packageImport_StereotypeLabel.getLayoutConstraint(); packageImport_StereotypeLabel_Location.setX(0); packageImport_StereotypeLabel_Location.setY(40); @@ -2771,7 +2577,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); - List<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2); + List<RelativeBendpoint> points = new ArrayList<>(2); points.add(new RelativeBendpoint()); points.add(new RelativeBendpoint()); bendpoints.setPoints(points); @@ -2783,12 +2589,11 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "PackageMerge"); - //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); - //if (routing != null) { - // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); - //} - Node packageMerge_StereotypeLabel = createLabel(edge, - UMLVisualIDRegistry.getType(AppliedStereotypePackageMergeEditPart.VISUAL_ID)); + // org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); + // if (routing != null) { + // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); + // } + Node packageMerge_StereotypeLabel = createLabel(edge, UMLVisualIDRegistry.getType(AppliedStereotypePackageMergeEditPart.VISUAL_ID)); packageMerge_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); Location packageMerge_StereotypeLabel_Location = (Location) packageMerge_StereotypeLabel.getLayoutConstraint(); packageMerge_StereotypeLabel_Location.setX(0); @@ -2806,7 +2611,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); - List<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2); + List<RelativeBendpoint> points = new ArrayList<>(2); points.add(new RelativeBendpoint()); points.add(new RelativeBendpoint()); bendpoints.setPoints(points); @@ -2818,10 +2623,10 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "ProfileApplication"); - //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); - //if (routing != null) { - // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); - //} + // org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); + // if (routing != null) { + // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); + // } return edge; } @@ -2834,7 +2639,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); - List<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2); + List<RelativeBendpoint> points = new ArrayList<>(2); points.add(new RelativeBendpoint()); points.add(new RelativeBendpoint()); bendpoints.setPoints(points); @@ -2845,10 +2650,10 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { // initializePreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); - //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); - //if (routing != null) { - // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); - //} + // org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); + // if (routing != null) { + // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); + // } return edge; } @@ -2861,7 +2666,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); - List<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2); + List<RelativeBendpoint> points = new ArrayList<>(2); points.add(new RelativeBendpoint()); points.add(new RelativeBendpoint()); bendpoints.setPoints(points); @@ -2872,10 +2677,10 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { // initializePreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); - //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); - //if (routing != null) { - // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); - //} + // org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); + // if (routing != null) { + // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); + // } return edge; } @@ -2888,7 +2693,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); - List<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2); + List<RelativeBendpoint> points = new ArrayList<>(2); points.add(new RelativeBendpoint()); points.add(new RelativeBendpoint()); bendpoints.setPoints(points); @@ -2900,22 +2705,18 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "TemplateBinding"); - //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); - //if (routing != null) { - // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); - //} - Node templateBinding_SubstitutionLabel = createLabel(edge, - UMLVisualIDRegistry.getType(BindingSubstitutionEditPart.VISUAL_ID)); + // org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); + // if (routing != null) { + // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); + // } + Node templateBinding_SubstitutionLabel = createLabel(edge, UMLVisualIDRegistry.getType(BindingSubstitutionEditPart.VISUAL_ID)); templateBinding_SubstitutionLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location templateBinding_SubstitutionLabel_Location = (Location) templateBinding_SubstitutionLabel - .getLayoutConstraint(); + Location templateBinding_SubstitutionLabel_Location = (Location) templateBinding_SubstitutionLabel.getLayoutConstraint(); templateBinding_SubstitutionLabel_Location.setX(0); templateBinding_SubstitutionLabel_Location.setY(40); - Node templateBinding_StereotypeLabel = createLabel(edge, - UMLVisualIDRegistry.getType(AppliedStereotypeTemplateBindingEditPart.VISUAL_ID)); + Node templateBinding_StereotypeLabel = createLabel(edge, UMLVisualIDRegistry.getType(AppliedStereotypeTemplateBindingEditPart.VISUAL_ID)); templateBinding_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location templateBinding_StereotypeLabel_Location = (Location) templateBinding_StereotypeLabel - .getLayoutConstraint(); + Location templateBinding_StereotypeLabel_Location = (Location) templateBinding_StereotypeLabel.getLayoutConstraint(); templateBinding_StereotypeLabel_Location.setX(0); templateBinding_StereotypeLabel_Location.setY(20); @@ -2931,7 +2732,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); - List<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2); + List<RelativeBendpoint> points = new ArrayList<>(2); points.add(new RelativeBendpoint()); points.add(new RelativeBendpoint()); bendpoints.setPoints(points); @@ -2943,22 +2744,18 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "GeneralizationSet"); - //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); - //if (routing != null) { - // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); - //} - Node generalizationSet_ConstraintLabel = createLabel(edge, - UMLVisualIDRegistry.getType(ConstraintLabelEditPart.VISUAL_ID)); + // org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); + // if (routing != null) { + // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); + // } + Node generalizationSet_ConstraintLabel = createLabel(edge, UMLVisualIDRegistry.getType(ConstraintLabelEditPart.VISUAL_ID)); generalizationSet_ConstraintLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location generalizationSet_ConstraintLabel_Location = (Location) generalizationSet_ConstraintLabel - .getLayoutConstraint(); + Location generalizationSet_ConstraintLabel_Location = (Location) generalizationSet_ConstraintLabel.getLayoutConstraint(); generalizationSet_ConstraintLabel_Location.setX(0); generalizationSet_ConstraintLabel_Location.setY(20); - Node generalizationSet_StereotypeLabel = createLabel(edge, - UMLVisualIDRegistry.getType(AppliedStereotypeGeneralizationSetLabelEditPart.VISUAL_ID)); + Node generalizationSet_StereotypeLabel = createLabel(edge, UMLVisualIDRegistry.getType(AppliedStereotypeGeneralizationSetLabelEditPart.VISUAL_ID)); generalizationSet_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location generalizationSet_StereotypeLabel_Location = (Location) generalizationSet_StereotypeLabel - .getLayoutConstraint(); + Location generalizationSet_StereotypeLabel_Location = (Location) generalizationSet_StereotypeLabel.getLayoutConstraint(); generalizationSet_StereotypeLabel_Location.setX(0); generalizationSet_StereotypeLabel_Location.setY(40); @@ -2974,7 +2771,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); - List<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2); + List<RelativeBendpoint> points = new ArrayList<>(2); points.add(new RelativeBendpoint()); points.add(new RelativeBendpoint()); bendpoints.setPoints(points); @@ -2986,27 +2783,22 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "InstanceSpecificationLink"); - //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); - //if (routing != null) { - // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); - //} - Node instanceSpecification_SourceRoleLabel = createLabel(edge, - UMLVisualIDRegistry.getType(SourceISLinkLabelEditPart.VISUAL_ID)); + // org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); + // if (routing != null) { + // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); + // } + Node instanceSpecification_SourceRoleLabel = createLabel(edge, UMLVisualIDRegistry.getType(SourceISLinkLabelEditPart.VISUAL_ID)); instanceSpecification_SourceRoleLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location instanceSpecification_SourceRoleLabel_Location = (Location) instanceSpecification_SourceRoleLabel - .getLayoutConstraint(); + Location instanceSpecification_SourceRoleLabel_Location = (Location) instanceSpecification_SourceRoleLabel.getLayoutConstraint(); instanceSpecification_SourceRoleLabel_Location.setX(0); instanceSpecification_SourceRoleLabel_Location.setY(20); - Node instanceSpecification_TargetRoleLabel = createLabel(edge, - UMLVisualIDRegistry.getType(TargetISLinkLabelEditPart.VISUAL_ID)); + Node instanceSpecification_TargetRoleLabel = createLabel(edge, UMLVisualIDRegistry.getType(TargetISLinkLabelEditPart.VISUAL_ID)); instanceSpecification_TargetRoleLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location instanceSpecification_TargetRoleLabel_Location = (Location) instanceSpecification_TargetRoleLabel - .getLayoutConstraint(); + Location instanceSpecification_TargetRoleLabel_Location = (Location) instanceSpecification_TargetRoleLabel.getLayoutConstraint(); instanceSpecification_TargetRoleLabel_Location.setX(0); instanceSpecification_TargetRoleLabel_Location.setY(20); - PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(edge, prefStore, - "InstanceSpecificationLink"); + PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(edge, prefStore, "InstanceSpecificationLink"); return edge; } @@ -3018,7 +2810,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); - List<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2); + List<RelativeBendpoint> points = new ArrayList<>(2); points.add(new RelativeBendpoint()); points.add(new RelativeBendpoint()); bendpoints.setPoints(points); @@ -3030,10 +2822,10 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "ContainmentLink"); - //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); - //if (routing != null) { - // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); - //} + // org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); + // if (routing != null) { + // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); + // } return edge; } @@ -3046,7 +2838,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); - List<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2); + List<RelativeBendpoint> points = new ArrayList<>(2); points.add(new RelativeBendpoint()); points.add(new RelativeBendpoint()); bendpoints.setPoints(points); @@ -3057,10 +2849,10 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { // initializePreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); - //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); - //if (routing != null) { - // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); - //} + // org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); + // if (routing != null) { + // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); + // } return edge; } @@ -3073,7 +2865,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); - List<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2); + List<RelativeBendpoint> points = new ArrayList<>(2); points.add(new RelativeBendpoint()); points.add(new RelativeBendpoint()); bendpoints.setPoints(points); @@ -3084,10 +2876,10 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { // initializePreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); - //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); - //if (routing != null) { - // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); - //} + // org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); + // if (routing != null) { + // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); + // } return edge; } @@ -3100,7 +2892,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); - List<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2); + List<RelativeBendpoint> points = new ArrayList<>(2); points.add(new RelativeBendpoint()); points.add(new RelativeBendpoint()); bendpoints.setPoints(points); @@ -3112,26 +2904,21 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "InformationFlow"); - //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); - //if (routing != null) { - // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); - //} - Node informationFlow_ConveyedLabel = createLabel(edge, - UMLVisualIDRegistry.getType(InformationFlowConveyedLabelEditPart.VISUAL_ID)); + // org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); + // if (routing != null) { + // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); + // } + Node informationFlow_ConveyedLabel = createLabel(edge, UMLVisualIDRegistry.getType(InformationFlowConveyedLabelEditPart.VISUAL_ID)); informationFlow_ConveyedLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location informationFlow_ConveyedLabel_Location = (Location) informationFlow_ConveyedLabel - .getLayoutConstraint(); + Location informationFlow_ConveyedLabel_Location = (Location) informationFlow_ConveyedLabel.getLayoutConstraint(); informationFlow_ConveyedLabel_Location.setX(0); informationFlow_ConveyedLabel_Location.setY(30); - Node informationFlow_StereotypeLabel = createLabel(edge, - UMLVisualIDRegistry.getType(InformationFlowAppliedStereotypeEditPart.VISUAL_ID)); + Node informationFlow_StereotypeLabel = createLabel(edge, UMLVisualIDRegistry.getType(InformationFlowAppliedStereotypeEditPart.VISUAL_ID)); informationFlow_StereotypeLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); - Location informationFlow_StereotypeLabel_Location = (Location) informationFlow_StereotypeLabel - .getLayoutConstraint(); + Location informationFlow_StereotypeLabel_Location = (Location) informationFlow_StereotypeLabel.getLayoutConstraint(); informationFlow_StereotypeLabel_Location.setX(0); informationFlow_StereotypeLabel_Location.setY(15); - Node informationFlow_NameLabel = createLabel(edge, - UMLVisualIDRegistry.getType(InformationFlowNameEditPart.VISUAL_ID)); + Node informationFlow_NameLabel = createLabel(edge, UMLVisualIDRegistry.getType(InformationFlowNameEditPart.VISUAL_ID)); informationFlow_NameLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); Location informationFlow_NameLabel_Location = (Location) informationFlow_NameLabel.getLayoutConstraint(); informationFlow_NameLabel_Location.setX(0); @@ -3149,7 +2936,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { Connector edge = NotationFactory.eINSTANCE.createConnector(); edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle()); RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints(); - List<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2); + List<RelativeBendpoint> points = new ArrayList<>(2); points.add(new RelativeBendpoint()); points.add(new RelativeBendpoint()); bendpoints.setPoints(points); @@ -3160,12 +2947,11 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { // initializePreferences final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore(); - //org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); - //if (routing != null) { - // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); - //} - Node constraint_KeywordLabel = createLabel(edge, - UMLVisualIDRegistry.getType(ContextLinkAppliedStereotypeEditPart.VISUAL_ID)); + // org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE)); + // if (routing != null) { + // org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing); + // } + Node constraint_KeywordLabel = createLabel(edge, UMLVisualIDRegistry.getType(ContextLinkAppliedStereotypeEditPart.VISUAL_ID)); constraint_KeywordLabel.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation()); Location constraint_KeywordLabel_Location = (Location) constraint_KeywordLabel.getLayoutConstraint(); constraint_KeywordLabel_Location.setX(0); @@ -3202,9 +2988,9 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { */ protected Node createCompartment(View owner, String hint, boolean canCollapse, boolean hasTitle, boolean canSort, boolean canFilter) { - //SemanticListCompartment rv = NotationFactory.eINSTANCE.createSemanticListCompartment(); - //rv.setShowTitle(showTitle); - //rv.setCollapsed(isCollapsed); + // SemanticListCompartment rv = NotationFactory.eINSTANCE.createSemanticListCompartment(); + // rv.setShowTitle(showTitle); + // rv.setCollapsed(isCollapsed); Node rv = NotationFactory.eINSTANCE.createBasicCompartment(); rv.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds()); @@ -3231,7 +3017,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { if (semanticAdapter == null) { return null; } - EObject eObject = (EObject) semanticAdapter.getAdapter(EObject.class); + EObject eObject = semanticAdapter.getAdapter(EObject.class); if (eObject != null) { return EMFCoreUtil.resolve(TransactionUtil.getEditingDomain(eObject), eObject); } @@ -3245,17 +3031,15 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { if (semanticAdapter == null) { return null; } - return (IElementType) semanticAdapter.getAdapter(IElementType.class); + return semanticAdapter.getAdapter(IElementType.class); } /** * @generated */ private void initFontStyleFromPrefs(View view, final IPreferenceStore store, String elementName) { - String fontConstant = PreferencesConstantsHelper.getElementConstant(elementName, - PreferencesConstantsHelper.FONT); - String fontColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, - PreferencesConstantsHelper.COLOR_FONT); + String fontConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.FONT); + String fontColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FONT); FontStyle viewFontStyle = (FontStyle) view.getStyle(NotationPackage.Literals.FONT_STYLE); if (viewFontStyle != null) { @@ -3274,37 +3058,36 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { * @generated */ private void initForegroundFromPrefs(View view, final IPreferenceStore store, String elementName) { - String lineColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, - PreferencesConstantsHelper.COLOR_LINE); + String lineColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_LINE); org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(store, lineColorConstant); - ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getLineStyle_LineColor(), - FigureUtilities.RGBToInteger(lineRGB)); + ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getLineStyle_LineColor(), FigureUtilities.RGBToInteger(lineRGB)); } /** * @generated */ private void initBackgroundFromPrefs(View view, final IPreferenceStore store, String elementName) { - String fillColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, - PreferencesConstantsHelper.COLOR_FILL); - String gradientColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, - PreferencesConstantsHelper.COLOR_GRADIENT); - String gradientPolicyConstant = PreferencesConstantsHelper.getElementConstant(elementName, - PreferencesConstantsHelper.GRADIENT_POLICY); + String fillColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FILL); + String gradientColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_GRADIENT); + String gradientPolicyConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.GRADIENT_POLICY); + org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(store, fillColorConstant); - ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getFillStyle_FillColor(), - FigureUtilities.RGBToInteger(fillRGB)); + ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getFillStyle_FillColor(), FigureUtilities.RGBToInteger(fillRGB)); + - FillStyle fillStyle = (FillStyle) view.getStyle(NotationPackage.Literals.FILL_STYLE); - fillStyle.setFillColor(FigureUtilities.RGBToInteger(fillRGB).intValue()); + FillStyle fillStyle = (FillStyle) view + .getStyle(NotationPackage.Literals.FILL_STYLE); + fillStyle + .setFillColor(FigureUtilities.RGBToInteger(fillRGB).intValue()); ; if (store.getBoolean(gradientPolicyConstant)) { GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter( store.getString(gradientColorConstant)); fillStyle.setGradient(gradientPreferenceConverter.getGradientData()); - fillStyle.setTransparency(gradientPreferenceConverter.getTransparency()); + fillStyle + .setTransparency(gradientPreferenceConverter.getTransparency()); } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLVisualTypeProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLVisualTypeProvider.java index e2bb0707c85..09f27b5a94c 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLVisualTypeProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLVisualTypeProvider.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/sheet/UMLPropertySection.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/sheet/UMLPropertySection.java index 278559016af..c6b324c5f13 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/sheet/UMLPropertySection.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/sheet/UMLPropertySection.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -23,11 +23,12 @@ public class UMLPropertySection extends DefaultPropertySection implements IPrope /** * Modify/unwrap selection. + * * @generated */ @Override protected Object transformSelection(Object selected) { - selected = /*super.*/transformSelectionToDomain(selected); + selected = /* super. */transformSelectionToDomain(selected); return selected; } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/sheet/UMLSheetLabelProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/sheet/UMLSheetLabelProvider.java index e49e904187b..231e49be889 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/sheet/UMLSheetLabelProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src-gen/org/eclipse/papyrus/uml/diagram/clazz/sheet/UMLSheetLabelProvider.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * CEA LIST - Initial API and implementation */ @@ -32,6 +32,7 @@ public class UMLSheetLabelProvider extends BaseLabelProvider implements ILabelPr /** * @generated */ + @Override public String getText(Object element) { element = unwrap(element); if (element instanceof UMLNavigatorGroup) { @@ -44,6 +45,7 @@ public class UMLSheetLabelProvider extends BaseLabelProvider implements ILabelPr /** * @generated */ + @Override public Image getImage(Object element) { IElementType etype = getElementType(getView(unwrap(element))); return etype == null ? null : UMLElementTypes.getImage(etype); @@ -67,7 +69,7 @@ public class UMLSheetLabelProvider extends BaseLabelProvider implements ILabelPr return (View) element; } if (element instanceof IAdaptable) { - return (View) ((IAdaptable) element).getAdapter(View.class); + return ((IAdaptable) element).getAdapter(View.class); } return null; } |