From 6424abf6e7e922c90a56eec84fd3f9b2de9dfae5 Mon Sep 17 00:00:00 2001 From: cletavernie Date: Fri, 23 Nov 2012 10:52:23 +0000 Subject: 391945: [Refactoring] Part 2: Refactoring on Kepler (0.10) https://bugs.eclipse.org/bugs/show_bug.cgi?id=391945 --- .../META-INF/MANIFEST.MF | 3 +- .../HTMLCommentEditorDialogConfiguration.java | 3 +- .../CommentedElementPropertySection.java | 34 ++++++++++++++++++---- .../propertysection/FocusAwareCommentRichText.java | 13 +++++++-- 4 files changed, 44 insertions(+), 9 deletions(-) (limited to 'plugins/uml/properties/org.eclipse.papyrus.uml.properties.tabbedproperties.comments') diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.tabbedproperties.comments/META-INF/MANIFEST.MF b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.tabbedproperties.comments/META-INF/MANIFEST.MF index b4e8e1e9427..0816cfb5ce8 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.tabbedproperties.comments/META-INF/MANIFEST.MF +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.tabbedproperties.comments/META-INF/MANIFEST.MF @@ -13,7 +13,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.extensionpoints.editors;bundle-version="0.10.0", org.eclipse.gef;bundle-version="3.7.1", org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0", - org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.10.0" + org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.10.0", + org.eclipse.papyrus.infra.emf;bundle-version="0.10.0" Export-Package: org.eclipse.papyrus.uml.properties.tabbedproperties.comments, org.eclipse.papyrus.uml.properties.tabbedproperties.comments.propertysection Bundle-Vendor: %providerName diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.tabbedproperties.comments/src/org/eclipse/papyrus/uml/properties/tabbedproperties/comments/directeditor/HTMLCommentEditorDialogConfiguration.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.tabbedproperties.comments/src/org/eclipse/papyrus/uml/properties/tabbedproperties/comments/directeditor/HTMLCommentEditorDialogConfiguration.java index ba1fc31c8db..c7248c68e8e 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.tabbedproperties.comments/src/org/eclipse/papyrus/uml/properties/tabbedproperties/comments/directeditor/HTMLCommentEditorDialogConfiguration.java +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.tabbedproperties.comments/src/org/eclipse/papyrus/uml/properties/tabbedproperties/comments/directeditor/HTMLCommentEditorDialogConfiguration.java @@ -103,6 +103,7 @@ public class HTMLCommentEditorDialogConfiguration extends DefaultDirectEditorCon /** * @{inheritDoc */ + @Override protected void createButtonsForButtonBar(Composite parent) { // create OK and Cancel buttons by default // remove the OK button as default button, so Carriage Return key pressed does not close the dialog @@ -123,7 +124,7 @@ public class HTMLCommentEditorDialogConfiguration extends DefaultDirectEditorCon /** * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) * - *@param parent + * @param parent * the parent composite to contain the dialog area * @return the dialog area control */ diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.tabbedproperties.comments/src/org/eclipse/papyrus/uml/properties/tabbedproperties/comments/propertysection/CommentedElementPropertySection.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.tabbedproperties.comments/src/org/eclipse/papyrus/uml/properties/tabbedproperties/comments/propertysection/CommentedElementPropertySection.java index 3ddfaae6cb3..cfa166b103c 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.tabbedproperties.comments/src/org/eclipse/papyrus/uml/properties/tabbedproperties/comments/propertysection/CommentedElementPropertySection.java +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.tabbedproperties.comments/src/org/eclipse/papyrus/uml/properties/tabbedproperties/comments/propertysection/CommentedElementPropertySection.java @@ -63,7 +63,9 @@ import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.Viewer; import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper; +import org.eclipse.papyrus.infra.core.services.ServiceException; import org.eclipse.papyrus.infra.core.utils.EditorUtils; +import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject; import org.eclipse.papyrus.uml.diagram.common.commands.CommonDeferredCreateConnectionViewCommand; import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter; import org.eclipse.papyrus.uml.diagram.common.parser.HTMLCleaner; @@ -185,7 +187,7 @@ public class CommentedElementPropertySection extends AbstractPropertySection imp // creates the rich text editor content richText = CommentRichTextFormToolkit.createFocusAwareRichTextEditor(getWidgetFactory(), mainComposite, "", comment, //$NON-NLS-1$ - SWT.NONE, EditorUtils.getMultiDiagramEditor().getEditorSite()); + SWT.NONE, EditorUtils.getMultiDiagramEditor().getEditorSite()); data = new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1); data.heightHint = 240; richText.setLayoutData(data); @@ -350,7 +352,7 @@ public class CommentedElementPropertySection extends AbstractPropertySection imp // this is the real element, not a ghost one. display it in the list if(!isProxy) { - if(comment.getAnnotatedElements().contains((Element)inputElement)) { + if(comment.getAnnotatedElements().contains(inputElement)) { annotatedElements.add(comment); } } @@ -394,6 +396,7 @@ public class CommentedElementPropertySection extends AbstractPropertySection imp /** * {@inheritDoc} */ + @Override public String getText(Object element) { if(element instanceof Comment) { String body = ((Comment)element).getBody(); @@ -476,7 +479,14 @@ public class CommentedElementPropertySection extends AbstractPropertySection imp final Element element = getElement(); // add a comment to this element - TransactionalEditingDomain domain = EditorUtils.getTransactionalEditingDomain(); + TransactionalEditingDomain domain; + try { + domain = ServiceUtilsForEObject.getInstance().getTransactionalEditingDomain(element); + } catch (ServiceException ex) { + Activator.log.error(ex); + return; + } + // open transaction to save the comment body // retrieve editing domain if(domain != null) { @@ -542,7 +552,13 @@ public class CommentedElementPropertySection extends AbstractPropertySection imp } // add a comment to this element - TransactionalEditingDomain domain = EditorUtils.getTransactionalEditingDomain(); + TransactionalEditingDomain domain; + try { + domain = ServiceUtilsForEObject.getInstance().getTransactionalEditingDomain(element); + } catch (ServiceException ex) { + Activator.log.error(ex); + return; + } // open transaction to save the comment body // retrieve editing domain if(domain != null) { @@ -680,7 +696,15 @@ public class CommentedElementPropertySection extends AbstractPropertySection imp IAdaptable sourceAdapter = (IAdaptable)((List)request.getNewObject()).get(0); IAdaptable targetAdapter = new SemanticAdapter(null, selectionEditPart.getModel()); - CreateCommentLinkTransactionnalCommand linkVisualIDCommand = new CreateCommentLinkTransactionnalCommand(EditorUtils.getTransactionalEditingDomain(), selectionEditPart.getViewer(), sourceAdapter, targetAdapter); + TransactionalEditingDomain domain; + try { + domain = ServiceUtilsForEObject.getInstance().getTransactionalEditingDomain(element); + } catch (ServiceException ex) { + Activator.log.error(ex); + return; + } + + CreateCommentLinkTransactionnalCommand linkVisualIDCommand = new CreateCommentLinkTransactionnalCommand(domain, selectionEditPart.getViewer(), sourceAdapter, targetAdapter); CompositeCommand compoundCommand = new CompositeCommand("Display Comment with link"); compoundCommand.compose(new CommandProxy(createCommand)); compoundCommand.compose(linkVisualIDCommand); diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.tabbedproperties.comments/src/org/eclipse/papyrus/uml/properties/tabbedproperties/comments/propertysection/FocusAwareCommentRichText.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.tabbedproperties.comments/src/org/eclipse/papyrus/uml/properties/tabbedproperties/comments/propertysection/FocusAwareCommentRichText.java index 21ec160cd60..2f2cc57e139 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.tabbedproperties.comments/src/org/eclipse/papyrus/uml/properties/tabbedproperties/comments/propertysection/FocusAwareCommentRichText.java +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.tabbedproperties.comments/src/org/eclipse/papyrus/uml/properties/tabbedproperties/comments/propertysection/FocusAwareCommentRichText.java @@ -13,7 +13,8 @@ package org.eclipse.papyrus.uml.properties.tabbedproperties.comments.propertysec import org.eclipse.emf.transaction.RecordingCommand; import org.eclipse.emf.transaction.TransactionalEditingDomain; -import org.eclipse.papyrus.infra.core.utils.EditorUtils; +import org.eclipse.papyrus.infra.core.services.ServiceException; +import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject; import org.eclipse.papyrus.uml.properties.tabbedproperties.comments.Activator; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; @@ -40,6 +41,7 @@ public class FocusAwareCommentRichText extends CommentRichText { /** * Adds listeners to manage the activation and focus events. */ + @Override protected void addListeners() { editorControl = getControlSite(editor); @@ -80,7 +82,14 @@ public class FocusAwareCommentRichText extends CommentRichText { return; } - TransactionalEditingDomain domain = EditorUtils.getTransactionalEditingDomain(); + TransactionalEditingDomain domain; + try { + domain = ServiceUtilsForEObject.getInstance().getTransactionalEditingDomain(getComment()); + } catch (ServiceException ex) { + Activator.log.error(ex); + return; + } + // open transaction to save the comment body // retrieve editing domain if(domain != null) { -- cgit v1.2.3