diff options
Diffstat (limited to 'plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/GMFtoEMFCommandWrapper.java')
| -rw-r--r-- | plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/GMFtoEMFCommandWrapper.java | 276 |
1 files changed, 71 insertions, 205 deletions
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/GMFtoEMFCommandWrapper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/GMFtoEMFCommandWrapper.java index 7161d938c4a..7cb2bf5a9c4 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/GMFtoEMFCommandWrapper.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/wrappers/GMFtoEMFCommandWrapper.java @@ -1,205 +1,71 @@ -/***************************************************************************
- * Copyright (c) 2007, 2014 Conselleria de Infraestructuras y Transporte, Generalitat de la Comunitat Valenciana, CEA, and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Mario Cervera Ubeda (Prodevelop)
- * Christian W. Damus (CEA) - bug 430701
- *
- ******************************************************************************/
-package org.eclipse.papyrus.commands.wrappers;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.papyrus.commands.INonDirtying;
-
-// TODO: Auto-generated Javadoc
-/**
- * A EMF Command that wraps a GMF command. Each method is redirected to the GMF one.
- */
-public class GMFtoEMFCommandWrapper extends AbstractCommand {
-
- /**
- *
- * Wraps the GMF command return value to be returned by this method.
- *
- * @return the possible return value from the GMF command
- */
- @Override
- public Collection<?> getResult() {
-
- Collection<Object> result = new ArrayList<Object>();
- if (getGMFReturnValue() != null) {
- result.add(getGMFReturnValue());
- } // else return an empty collection
-
- return result;
- }
-
- private Object getGMFReturnValue() {
- if (getGMFCommand().getCommandResult() != null) {
- return getGMFCommand().getCommandResult().getReturnValue();
- }
-
- return null;
- }
-
- /**
- * The wrapped GMF Command. Package-level visibility so that the command stack wrapper can
- * access the field.
- */
- private final ICommand gmfCommand;
-
- /**
- * Constructor.
- *
- * @param gmfCommand
- * the gmf command
- */
- public GMFtoEMFCommandWrapper(ICommand gmfCommand) {
- super(gmfCommand.getLabel());
- this.gmfCommand = gmfCommand;
- }
-
- /**
- * Wraps the given {@code command}, accounting for possible non-dirty state.
- *
- * @param command
- * a command to wrap
- * @return the best wrapper for the {@code command}
- */
- public static Command wrap(ICommand command) {
- if (command instanceof INonDirtying) {
- return new NonDirtying(command);
- }
- return new GMFtoEMFCommandWrapper(command);
- }
-
- /**
- * Returns the wrapped GMF command.
- *
- * @return the GMF command
- */
- // @unused
- public ICommand getGMFCommand() {
- return gmfCommand;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.command.AbstractCommand#canExecute()
- */
- @Override
- public boolean canExecute() {
- return gmfCommand.canExecute();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.command.AbstractCommand#dispose()
- */
- @Override
- public void dispose() {
- gmfCommand.dispose();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.command.AbstractCommand#canUndo()
- */
- @Override
- public boolean canUndo() {
- return gmfCommand.canUndo();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.command.Command#execute()
- */
- public void execute() {
- try {
- gmfCommand.execute(new NullProgressMonitor(), null);
- } catch (ExecutionException e) {
- }
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.command.Command#redo()
- */
- public void redo() {
- try {
- gmfCommand.redo(new NullProgressMonitor(), null);
- } catch (ExecutionException e) {
- }
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.command.AbstractCommand#undo()
- */
- @Override
- public void undo() {
- try {
- gmfCommand.undo(new NullProgressMonitor(), null);
- } catch (ExecutionException e) {
- }
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.command.Command#getAffectedObjects()
- */
- @Override
- public Collection<?> getAffectedObjects() {
- return gmfCommand.getAffectedFiles();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.command.Command#getDescription()
- */
- @Override
- public String getDescription() {
- return gmfCommand.getLabel();
- }
-
- //
- // Nested types
- //
-
- /**
- * A non-dirtying wrapper for non-dirtying commands.
- */
- public static class NonDirtying extends GMFtoEMFCommandWrapper implements AbstractCommand.NonDirtying {
-
- public NonDirtying(ICommand command) {
- super(command);
-
- if (!(command instanceof INonDirtying)) {
- throw new IllegalArgumentException("Wrapped command is not non-dirtying"); //$NON-NLS-1$
- }
- }
-
- }
-
-}
+/*************************************************************************** + * Copyright (c) 2007, 2014 Conselleria de Infraestructuras y Transporte, Generalitat de la Comunitat Valenciana, CEA, 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 v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: Mario Cervera Ubeda (Prodevelop) + * Christian W. Damus (CEA) - bug 430701 + * Christian W. Damus - bug 485220 + * + ******************************************************************************/ +package org.eclipse.papyrus.commands.wrappers; + +import org.eclipse.emf.common.command.Command; +import org.eclipse.gmf.runtime.common.core.command.ICommand; + +/** + * A EMF Command that wraps a GMF command. Each method is redirected to the GMF one. + * + * @deprecated Use the {@link org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper} API, instead. + */ +@Deprecated +public class GMFtoEMFCommandWrapper extends org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper { + + static { + // Configure legacy compatibility + setWrapperFunction(GMFtoEMFCommandWrapper::new); + setNonDirtyingWrapperFunction(NonDirtying::new); + } + + /** + * Constructor. + * + * @param gmfCommand + * the gmf command + */ + public GMFtoEMFCommandWrapper(ICommand gmfCommand) { + super(gmfCommand); + } + + /** + * Wraps the given {@code command}, accounting for possible non-dirty state. + * + * @param command + * a command to wrap + * @return the best wrapper for the {@code command} + */ + public static Command wrap(ICommand command) { + return org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper.wrap(command); + } + + // + // Nested types + // + + /** + * A non-dirtying wrapper for non-dirtying commands. + * + * @deprecated Use the {@link org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper.NonDirtying} API, instead. + */ + @Deprecated + public static class NonDirtying extends org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper.NonDirtying { + + public NonDirtying(ICommand command) { + super(command); + } + + } + +} |