diff options
| author | Esteban Dugueperoux | 2015-06-10 13:37:04 +0000 |
|---|---|---|
| committer | Esteban DUGUEPEROUX | 2015-06-11 12:29:41 +0000 |
| commit | e43e59793d845d47ad0bc8015fabf13202b1d618 (patch) | |
| tree | 0db696e0c2fe116dbcce00fa841d24ce7fbdfb6f | |
| parent | 03029a0136fc0ff290f16db5f124a480631fc81a (diff) | |
| download | org.eclipse.sirius-e43e59793d845d47ad0bc8015fabf13202b1d618.tar.gz org.eclipse.sirius-e43e59793d845d47ad0bc8015fabf13202b1d618.tar.xz org.eclipse.sirius-e43e59793d845d47ad0bc8015fabf13202b1d618.zip | |
[461991] Remove useless code
- Since direct edit enablement with layouting mode is checked in
DirectEditCommandBuilder
AbstractDiagramNameEditPart.isInLayoutingModeDiagram() is no more
usefull.
- Cast in DSemanticDecorator is useless in DirectEditCommandBuilder.
Bug: 461991
Change-Id: I733ddc0c85d7cd58b092acca2225753eedf82bfa
Signed-off-by: Esteban Dugueperoux <esteban.dugueperoux@obeo.fr>
2 files changed, 12 insertions, 81 deletions
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDiagramNameEditPart.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDiagramNameEditPart.java index 6f297a503f..644fb3dc1c 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDiagramNameEditPart.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDiagramNameEditPart.java @@ -107,20 +107,12 @@ public abstract class AbstractDiagramNameEditPart extends LabelEditPart implemen protected void refreshFontColor() { } - /** - * {@inheritDoc} - * - * @see org.eclipse.sirius.diagram.edit.api.part.IDiagramElementEditPart#getLabelIcon() - */ + @Override public Image getLabelIcon() { return DiagramNameEditPartOperation.getLabelIcon(this); } - /** - * {@inheritDoc} - * - * @see org.eclipse.sirius.diagram.edit.api.part.IDiagramElementEditPart#getStyleEditPart() - */ + @Override public IStyleEditPart getStyleEditPart() { if (this.getParent() instanceof IDiagramElementEditPart) { return DiagramElementEditPartOperation.getStyleEditPart((IDiagramElementEditPart) this.getParent()); @@ -128,54 +120,32 @@ public abstract class AbstractDiagramNameEditPart extends LabelEditPart implemen return null; } - /** - * {@inheritDoc} - * - * @see org.eclipse.sirius.diagram.edit.api.part.IDiagramElementEditPart#getEAdapterDiagramElement() - */ + @Override public NotificationListener getEAdapterDiagramElement() { return null; } - /** - * {@inheritDoc} - */ + @Override public NotificationListener getEditModeListener() { return null; } - /** - * {@inheritDoc} - * - * @see org.eclipse.sirius.diagram.edit.api.part.IDiagramElementEditPart#resolveDiagramElement() - */ + @Override public DDiagramElement resolveDiagramElement() { return DiagramElementEditPartOperation.resolveDiagramElement(this); } - /** - * {@inheritDoc} - * - * @see org.eclipse.sirius.diagram.edit.api.part.IDiagramElementEditPart#resolveAllSemanticElements() - */ + @Override public List<EObject> resolveAllSemanticElements() { return DiagramElementEditPartOperation.resolveAllSemanticElements(this); } - /** - * {@inheritDoc} - * - * @see org.eclipse.sirius.diagram.edit.api.part.IDiagramElementEditPart#resolveTargetSemanticElement() - */ + @Override public EObject resolveTargetSemanticElement() { return DiagramElementEditPartOperation.resolveTargetSemanticElement(this); } - /** - * {@inheritDoc} - * - * @see org.eclipse.sirius.diagram.edit.api.part.IDiagramElementEditPart#getMetamodelType() - */ + @Override public Class<?> getMetamodelType() { Class<?> clazz = null; if (this.getParent() instanceof IDiagramNodeEditPart) { @@ -192,20 +162,11 @@ public abstract class AbstractDiagramNameEditPart extends LabelEditPart implemen return clazz; } - /** - * {@inheritDoc} - * - * @see org.eclipse.sirius.diagram.edit.api.part.IDiagramElementEditPart#getEditPartAuthorityListener() - */ + @Override public EditPartAuthorityListener getEditPartAuthorityListener() { return null; } - /** - * {@inheritDoc} - * - * @see org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart#createDefaultEditPolicies() - */ @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); @@ -247,23 +208,6 @@ public abstract class AbstractDiagramNameEditPart extends LabelEditPart implemen } /** - * Indicates if the given {@link DDiagramElement}'s parent - * {@link org.eclipse.sirius.diagram.DDiagram} is in Layouting Mode. - * - * @param element - * the element to test - * @return true if the given {@link DDiagramElement}'s parent - * {@link org.eclipse.sirius.diagram.DDiagram} is in Layouting Mode, - * false otherwise - */ - private boolean isInLayoutingModeDiagram(DDiagramElement element) { - if (element.getParentDiagram() != null) { - return element.getParentDiagram().isIsInLayoutingMode(); - } - return false; - } - - /** * Activate directEdit only if there is a directEdit tool on the mapping. * {@inheritDoc} * @@ -314,6 +258,7 @@ public abstract class AbstractDiagramNameEditPart extends LabelEditPart implemen * the tool-tip's text. * @since 0.9.0 */ + @Override public void setTooltipText(final String text) { if (!StringUtil.isEmpty(text)) { final IFigure tt = getFigure().getToolTip(); diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/DirectEditCommandBuilder.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/DirectEditCommandBuilder.java index b07aa4108d..a68b09a56f 100644 --- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/DirectEditCommandBuilder.java +++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/DirectEditCommandBuilder.java @@ -23,7 +23,6 @@ import org.eclipse.sirius.ext.base.Option; import org.eclipse.sirius.tools.api.command.DCommand; import org.eclipse.sirius.tools.api.interpreter.InterpreterUtil; import org.eclipse.sirius.viewpoint.DRepresentationElement; -import org.eclipse.sirius.viewpoint.DSemanticDecorator; public class DirectEditCommandBuilder extends AbstractDiagramCommandBuilder { @@ -51,12 +50,6 @@ public class DirectEditCommandBuilder extends AbstractDiagramCommandBuilder { this.newValue = newValue; } - /** - * - * {@inheritDoc} - * - * @see org.eclipse.sirius.tools.internal.command.builders.CommandBuilder#buildCommand() - */ @Override public Command buildCommand() { if (this.permissionAuthority.canEditInstance(repElement) && canDirectEdit()) { @@ -72,9 +65,8 @@ public class DirectEditCommandBuilder extends AbstractDiagramCommandBuilder { result.getTasks().add(new InitInterpreterFromParsedVariableTask(interpreter, messageFormat, newValue)); Option<DDiagram> parentDiagram = getDDiagram(); - if (parentDiagram.some() && repElement instanceof DSemanticDecorator && ((DSemanticDecorator) repElement).getTarget() != null && directEditTool.getInitialOperation() != null) { - final ICommandTask operations = taskHelper.buildTaskFromModelOperation(parentDiagram.get(), ((DSemanticDecorator) repElement).getTarget(), directEditTool.getInitialOperation() - .getFirstModelOperations()); + if (parentDiagram.some() && repElement.getTarget() != null && directEditTool.getInitialOperation() != null) { + final ICommandTask operations = taskHelper.buildTaskFromModelOperation(parentDiagram.get(), repElement.getTarget(), directEditTool.getInitialOperation().getFirstModelOperations()); result.getTasks().add(operations); } addPostOperationTasks(result, interpreter); @@ -110,17 +102,11 @@ public class DirectEditCommandBuilder extends AbstractDiagramCommandBuilder { } } - /** - * {@inheritDoc} - */ @Override protected String getEnclosingCommandLabel() { return EDIT_LABEL; } - /** - * {@inheritDoc} - */ @Override protected Option<DDiagram> getDDiagram() { return new EObjectQuery(repElement).getParentDiagram(); |
