diff options
| author | Eike Stepper | 2015-04-22 16:16:16 +0000 |
|---|---|---|
| committer | Eike Stepper | 2015-04-22 16:16:16 +0000 |
| commit | d2c5b0ee9d0634fb6c79d99e6952ee0d7c752dd7 (patch) | |
| tree | 6488f73e26dcddd9b1c7befccf7ba721215edce9 /plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src | |
| parent | ef5341796d793607c49d863f8607f3193ceb08ae (diff) | |
| download | cdo-d2c5b0ee9d0634fb6c79d99e6952ee0d7c752dd7.tar.gz cdo-d2c5b0ee9d0634fb6c79d99e6952ee0d7c752dd7.tar.xz cdo-d2c5b0ee9d0634fb6c79d99e6952ee0d7c752dd7.zip | |
[Releng] Reformat everything with M6 formatter
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src')
115 files changed, 942 insertions, 543 deletions
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AAttribute2CreateCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AAttribute2CreateCommand.java index 0bc2c69268..6088289d5d 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AAttribute2CreateCommand.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AAttribute2CreateCommand.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands; @@ -44,9 +44,10 @@ public class AAttribute2CreateCommand extends EditElementCommand /** * FIXME: replace with setElementToEdit() - * + * * @generated */ + @Override protected EObject getElementToEdit() { EObject container = ((CreateElementRequest)getRequest()).getContainer(); @@ -60,6 +61,7 @@ public class AAttribute2CreateCommand extends EditElementCommand /** * @generated */ + @Override public boolean canExecute() { return true; @@ -69,6 +71,7 @@ public class AAttribute2CreateCommand extends EditElementCommand /** * @generated */ + @Override protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { AAttribute newElement = AcoreFactory.eINSTANCE.createAAttribute(); @@ -85,8 +88,7 @@ public class AAttribute2CreateCommand extends EditElementCommand /** * @generated */ - protected void doConfigure(AAttribute newElement, IProgressMonitor monitor, IAdaptable info) - throws ExecutionException + protected void doConfigure(AAttribute newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException { IElementType elementType = ((CreateElementRequest)getRequest()).getElementType(); ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AAttributeCreateCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AAttributeCreateCommand.java index b3fee2835c..577bf26e68 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AAttributeCreateCommand.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AAttributeCreateCommand.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands; @@ -44,9 +44,10 @@ public class AAttributeCreateCommand extends EditElementCommand /** * FIXME: replace with setElementToEdit() - * + * * @generated */ + @Override protected EObject getElementToEdit() { EObject container = ((CreateElementRequest)getRequest()).getContainer(); @@ -60,6 +61,7 @@ public class AAttributeCreateCommand extends EditElementCommand /** * @generated */ + @Override public boolean canExecute() { return true; @@ -69,6 +71,7 @@ public class AAttributeCreateCommand extends EditElementCommand /** * @generated */ + @Override protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { AAttribute newElement = AcoreFactory.eINSTANCE.createAAttribute(); @@ -85,8 +88,7 @@ public class AAttributeCreateCommand extends EditElementCommand /** * @generated */ - protected void doConfigure(AAttribute newElement, IProgressMonitor monitor, IAdaptable info) - throws ExecutionException + protected void doConfigure(AAttribute newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException { IElementType elementType = ((CreateElementRequest)getRequest()).getElementType(); ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAggregationsCreateCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAggregationsCreateCommand.java index 2f29ce1f83..3c9e29d9ca 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAggregationsCreateCommand.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAggregationsCreateCommand.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands; @@ -52,6 +52,7 @@ public class AClassAggregationsCreateCommand extends EditElementCommand /** * @generated */ + @Override public boolean canExecute() { if (source == null && target == null) @@ -77,6 +78,7 @@ public class AClassAggregationsCreateCommand extends EditElementCommand /** * @generated */ + @Override protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { if (!canExecute()) @@ -95,6 +97,7 @@ public class AClassAggregationsCreateCommand extends EditElementCommand /** * @generated */ + @Override protected void setElementToEdit(EObject element) { throw new UnsupportedOperationException(); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAggregationsReorientCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAggregationsReorientCommand.java index 20c20fba19..0741bdf8d2 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAggregationsReorientCommand.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAggregationsReorientCommand.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands; @@ -65,6 +65,7 @@ public class AClassAggregationsReorientCommand extends EditElementCommand /** * @generated */ + @Override public boolean canExecute() { if (false == referenceOwner instanceof AClass) @@ -111,6 +112,7 @@ public class AClassAggregationsReorientCommand extends EditElementCommand /** * @generated */ + @Override protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { if (!canExecute()) diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAssociationsCreateCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAssociationsCreateCommand.java index 3868fae61b..73af92a5ac 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAssociationsCreateCommand.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAssociationsCreateCommand.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands; @@ -52,6 +52,7 @@ public class AClassAssociationsCreateCommand extends EditElementCommand /** * @generated */ + @Override public boolean canExecute() { if (source == null && target == null) @@ -77,6 +78,7 @@ public class AClassAssociationsCreateCommand extends EditElementCommand /** * @generated */ + @Override protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { if (!canExecute()) @@ -95,6 +97,7 @@ public class AClassAssociationsCreateCommand extends EditElementCommand /** * @generated */ + @Override protected void setElementToEdit(EObject element) { throw new UnsupportedOperationException(); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAssociationsReorientCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAssociationsReorientCommand.java index e6e6cfd573..98475e201b 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAssociationsReorientCommand.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassAssociationsReorientCommand.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands; @@ -65,6 +65,7 @@ public class AClassAssociationsReorientCommand extends EditElementCommand /** * @generated */ + @Override public boolean canExecute() { if (false == referenceOwner instanceof AClass) @@ -111,6 +112,7 @@ public class AClassAssociationsReorientCommand extends EditElementCommand /** * @generated */ + @Override protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { if (!canExecute()) diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassCompositionsCreateCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassCompositionsCreateCommand.java index 6a176fc57c..9f6e13b3e1 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassCompositionsCreateCommand.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassCompositionsCreateCommand.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands; @@ -52,6 +52,7 @@ public class AClassCompositionsCreateCommand extends EditElementCommand /** * @generated */ + @Override public boolean canExecute() { if (source == null && target == null) @@ -77,6 +78,7 @@ public class AClassCompositionsCreateCommand extends EditElementCommand /** * @generated */ + @Override protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { if (!canExecute()) @@ -95,6 +97,7 @@ public class AClassCompositionsCreateCommand extends EditElementCommand /** * @generated */ + @Override protected void setElementToEdit(EObject element) { throw new UnsupportedOperationException(); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassCompositionsReorientCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassCompositionsReorientCommand.java index 248ce9d523..78259dca91 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassCompositionsReorientCommand.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassCompositionsReorientCommand.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands; @@ -65,6 +65,7 @@ public class AClassCompositionsReorientCommand extends EditElementCommand /** * @generated */ + @Override public boolean canExecute() { if (false == referenceOwner instanceof AClass) @@ -111,6 +112,7 @@ public class AClassCompositionsReorientCommand extends EditElementCommand /** * @generated */ + @Override protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { if (!canExecute()) diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassCreateCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassCreateCommand.java index 6327dca207..5c7ecaac05 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassCreateCommand.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassCreateCommand.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands; @@ -44,9 +44,10 @@ public class AClassCreateCommand extends EditElementCommand /** * FIXME: replace with setElementToEdit() - * + * * @generated */ + @Override protected EObject getElementToEdit() { EObject container = ((CreateElementRequest)getRequest()).getContainer(); @@ -60,6 +61,7 @@ public class AClassCreateCommand extends EditElementCommand /** * @generated */ + @Override public boolean canExecute() { return true; @@ -69,6 +71,7 @@ public class AClassCreateCommand extends EditElementCommand /** * @generated */ + @Override protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { AClass newElement = AcoreFactory.eINSTANCE.createAClass(); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassImplementedInterfacesCreateCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassImplementedInterfacesCreateCommand.java index a602a01225..558db49b89 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassImplementedInterfacesCreateCommand.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassImplementedInterfacesCreateCommand.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands; @@ -53,6 +53,7 @@ public class AClassImplementedInterfacesCreateCommand extends EditElementCommand /** * @generated */ + @Override public boolean canExecute() { if (source == null && target == null) @@ -79,6 +80,7 @@ public class AClassImplementedInterfacesCreateCommand extends EditElementCommand /** * @generated */ + @Override protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { if (!canExecute()) @@ -97,6 +99,7 @@ public class AClassImplementedInterfacesCreateCommand extends EditElementCommand /** * @generated */ + @Override protected void setElementToEdit(EObject element) { throw new UnsupportedOperationException(); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassImplementedInterfacesReorientCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassImplementedInterfacesReorientCommand.java index 2872ecdbc9..383e113e50 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassImplementedInterfacesReorientCommand.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassImplementedInterfacesReorientCommand.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands; @@ -66,6 +66,7 @@ public class AClassImplementedInterfacesReorientCommand extends EditElementComma /** * @generated */ + @Override public boolean canExecute() { if (false == referenceOwner instanceof AClass) @@ -112,6 +113,7 @@ public class AClassImplementedInterfacesReorientCommand extends EditElementComma /** * @generated */ + @Override protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { if (!canExecute()) diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassSubClassesCreateCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassSubClassesCreateCommand.java index 8068473578..308f31cf00 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassSubClassesCreateCommand.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassSubClassesCreateCommand.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands; @@ -52,6 +52,7 @@ public class AClassSubClassesCreateCommand extends EditElementCommand /** * @generated */ + @Override public boolean canExecute() { if (source == null && target == null) @@ -77,6 +78,7 @@ public class AClassSubClassesCreateCommand extends EditElementCommand /** * @generated */ + @Override protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { if (!canExecute()) @@ -95,6 +97,7 @@ public class AClassSubClassesCreateCommand extends EditElementCommand /** * @generated */ + @Override protected void setElementToEdit(EObject element) { throw new UnsupportedOperationException(); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassSubClassesReorientCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassSubClassesReorientCommand.java index ed55a553c1..13aacece6f 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassSubClassesReorientCommand.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AClassSubClassesReorientCommand.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands; @@ -65,6 +65,7 @@ public class AClassSubClassesReorientCommand extends EditElementCommand /** * @generated */ + @Override public boolean canExecute() { if (false == referenceOwner instanceof AClass) @@ -91,8 +92,8 @@ public class AClassSubClassesReorientCommand extends EditElementCommand { return false; } - return AcoreBaseItemSemanticEditPolicy.LinkConstraints - .canExistAClassSubClasses_4001(getNewSource(), getOldTarget()); + return AcoreBaseItemSemanticEditPolicy.LinkConstraints.canExistAClassSubClasses_4001(getNewSource(), + getOldTarget()); } /** @@ -104,13 +105,14 @@ public class AClassSubClassesReorientCommand extends EditElementCommand { return false; } - return AcoreBaseItemSemanticEditPolicy.LinkConstraints - .canExistAClassSubClasses_4001(getOldSource(), getNewTarget()); + return AcoreBaseItemSemanticEditPolicy.LinkConstraints.canExistAClassSubClasses_4001(getOldSource(), + getNewTarget()); } /** * @generated */ + @Override protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { if (!canExecute()) diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AInterfaceCreateCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AInterfaceCreateCommand.java index e4c93bb945..940b962893 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AInterfaceCreateCommand.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AInterfaceCreateCommand.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands; @@ -44,9 +44,10 @@ public class AInterfaceCreateCommand extends EditElementCommand /** * FIXME: replace with setElementToEdit() - * + * * @generated */ + @Override protected EObject getElementToEdit() { EObject container = ((CreateElementRequest)getRequest()).getContainer(); @@ -60,6 +61,7 @@ public class AInterfaceCreateCommand extends EditElementCommand /** * @generated */ + @Override public boolean canExecute() { return true; @@ -69,6 +71,7 @@ public class AInterfaceCreateCommand extends EditElementCommand /** * @generated */ + @Override protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { AInterface newElement = AcoreFactory.eINSTANCE.createAInterface(); @@ -85,8 +88,7 @@ public class AInterfaceCreateCommand extends EditElementCommand /** * @generated */ - protected void doConfigure(AInterface newElement, IProgressMonitor monitor, IAdaptable info) - throws ExecutionException + protected void doConfigure(AInterface newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException { IElementType elementType = ((CreateElementRequest)getRequest()).getElementType(); ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AOperation2CreateCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AOperation2CreateCommand.java index 09776d7455..70b448af36 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AOperation2CreateCommand.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AOperation2CreateCommand.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands; @@ -44,9 +44,10 @@ public class AOperation2CreateCommand extends EditElementCommand /** * FIXME: replace with setElementToEdit() - * + * * @generated */ + @Override protected EObject getElementToEdit() { EObject container = ((CreateElementRequest)getRequest()).getContainer(); @@ -60,6 +61,7 @@ public class AOperation2CreateCommand extends EditElementCommand /** * @generated */ + @Override public boolean canExecute() { return true; @@ -69,6 +71,7 @@ public class AOperation2CreateCommand extends EditElementCommand /** * @generated */ + @Override protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { AOperation newElement = AcoreFactory.eINSTANCE.createAOperation(); @@ -85,8 +88,7 @@ public class AOperation2CreateCommand extends EditElementCommand /** * @generated */ - protected void doConfigure(AOperation newElement, IProgressMonitor monitor, IAdaptable info) - throws ExecutionException + protected void doConfigure(AOperation newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException { IElementType elementType = ((CreateElementRequest)getRequest()).getElementType(); ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AOperationCreateCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AOperationCreateCommand.java index 0fd4ac7fe9..39fe36652f 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AOperationCreateCommand.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/commands/AOperationCreateCommand.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.commands; @@ -44,9 +44,10 @@ public class AOperationCreateCommand extends EditElementCommand /** * FIXME: replace with setElementToEdit() - * + * * @generated */ + @Override protected EObject getElementToEdit() { EObject container = ((CreateElementRequest)getRequest()).getContainer(); @@ -60,6 +61,7 @@ public class AOperationCreateCommand extends EditElementCommand /** * @generated */ + @Override public boolean canExecute() { return true; @@ -69,6 +71,7 @@ public class AOperationCreateCommand extends EditElementCommand /** * @generated */ + @Override protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { AOperation newElement = AcoreFactory.eINSTANCE.createAOperation(); @@ -85,8 +88,7 @@ public class AOperationCreateCommand extends EditElementCommand /** * @generated */ - protected void doConfigure(AOperation newElement, IProgressMonitor monitor, IAdaptable info) - throws ExecutionException + protected void doConfigure(AOperation newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException { IElementType elementType = ((CreateElementRequest)getRequest()).getElementType(); ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AAttributeEditHelper.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AAttributeEditHelper.java index 1bcf88bb46..1c62a220df 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AAttributeEditHelper.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AAttributeEditHelper.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.helpers; diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AClassEditHelper.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AClassEditHelper.java index fd98e6c8b4..e953dd1b65 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AClassEditHelper.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AClassEditHelper.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.helpers; diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/ACoreRootEditHelper.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/ACoreRootEditHelper.java index 8d5ab2e2c5..a69c987172 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/ACoreRootEditHelper.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/ACoreRootEditHelper.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.helpers; diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AInterfaceEditHelper.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AInterfaceEditHelper.java index 8faedd57a6..830a80e25b 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AInterfaceEditHelper.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AInterfaceEditHelper.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.helpers; diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AOperationEditHelper.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AOperationEditHelper.java index 28bdb36b7d..d6aaa82c33 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AOperationEditHelper.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AOperationEditHelper.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.helpers; diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AcoreBaseEditHelper.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AcoreBaseEditHelper.java index 42dad843d5..087cfc827f 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AcoreBaseEditHelper.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/helpers/AcoreBaseEditHelper.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.helpers; @@ -42,6 +42,7 @@ public class AcoreBaseEditHelper extends AbstractEditHelper /** * @generated */ + @Override protected IEditHelperAdvice[] getEditHelperAdvice(IEditCommandRequest req) { if (req.getParameter(CONTEXT_ELEMENT_TYPE) instanceof IElementType) @@ -55,6 +56,7 @@ public class AcoreBaseEditHelper extends AbstractEditHelper /** * @generated */ + @Override protected ICommand getInsteadCommand(IEditCommandRequest req) { ICommand epCommand = (ICommand)req.getParameter(EDIT_POLICY_COMMAND); @@ -77,6 +79,7 @@ public class AcoreBaseEditHelper extends AbstractEditHelper /** * @generated */ + @Override protected ICommand getCreateCommand(CreateElementRequest req) { return null; @@ -85,6 +88,7 @@ public class AcoreBaseEditHelper extends AbstractEditHelper /** * @generated */ + @Override protected ICommand getCreateRelationshipCommand(CreateRelationshipRequest req) { return null; @@ -93,6 +97,7 @@ public class AcoreBaseEditHelper extends AbstractEditHelper /** * @generated */ + @Override protected ICommand getDestroyElementCommand(DestroyElementRequest req) { return null; @@ -101,6 +106,7 @@ public class AcoreBaseEditHelper extends AbstractEditHelper /** * @generated */ + @Override protected ICommand getDestroyReferenceCommand(DestroyReferenceRequest req) { return null; diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AAttribute2EditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AAttribute2EditPart.java index 8d805ed6a7..6e9d30949b 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AAttribute2EditPart.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AAttribute2EditPart.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts; @@ -105,6 +105,7 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest)request).getLastButtonPressed() == 3) @@ -117,6 +118,7 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); @@ -201,6 +203,7 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa /** * @generated */ + @Override protected List getModelChildren() { return Collections.EMPTY_LIST; @@ -209,6 +212,7 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; @@ -353,7 +357,7 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa { parser = AcoreParserProvider.getParser(AcoreElementTypes.AAttribute_3003, getParserElement(), AcoreVisualIDRegistry - .getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AAttribute2EditPart.VISUAL_ID)); + .getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AAttribute2EditPart.VISUAL_ID)); } return parser; } @@ -416,6 +420,7 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -428,13 +433,14 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa { if (isActive() && isEditable()) { - if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get( - RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + 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()); @@ -456,6 +462,7 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); @@ -512,13 +519,14 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa /** * @generated */ + @Override protected void refreshFont() { 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); } } @@ -526,6 +534,7 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); @@ -534,6 +543,7 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) @@ -554,6 +564,7 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) @@ -572,6 +583,7 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) @@ -579,6 +591,7 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa accessibleEP = new AccessibleGraphicalEditPart() { + @Override public void getName(AccessibleEvent e) { e.result = getLabelTextHelper(getFigure()); @@ -599,6 +612,7 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); @@ -608,6 +622,7 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); @@ -617,6 +632,7 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); @@ -666,6 +682,7 @@ public class AAttribute2EditPart extends CompartmentEditPart implements ITextAwa /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AAttributeEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AAttributeEditPart.java index 4bb6ed44ea..c916525f3d 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AAttributeEditPart.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AAttributeEditPart.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts; @@ -105,6 +105,7 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest)request).getLastButtonPressed() == 3) @@ -117,6 +118,7 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); @@ -201,6 +203,7 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected List getModelChildren() { return Collections.EMPTY_LIST; @@ -209,6 +212,7 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; @@ -353,7 +357,7 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar { parser = AcoreParserProvider.getParser(AcoreElementTypes.AAttribute_3001, getParserElement(), AcoreVisualIDRegistry - .getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AAttributeEditPart.VISUAL_ID)); + .getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AAttributeEditPart.VISUAL_ID)); } return parser; } @@ -416,6 +420,7 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -428,13 +433,14 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar { if (isActive() && isEditable()) { - if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get( - RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + 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()); @@ -456,6 +462,7 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); @@ -512,13 +519,14 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected void refreshFont() { 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); } } @@ -526,6 +534,7 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); @@ -534,6 +543,7 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) @@ -554,6 +564,7 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) @@ -572,6 +583,7 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) @@ -579,6 +591,7 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar accessibleEP = new AccessibleGraphicalEditPart() { + @Override public void getName(AccessibleEvent e) { e.result = getLabelTextHelper(getFigure()); @@ -599,6 +612,7 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); @@ -608,6 +622,7 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); @@ -617,6 +632,7 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); @@ -666,6 +682,7 @@ public class AAttributeEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassAAttributeCompartmentEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassAAttributeCompartmentEditPart.java index cb2601b318..d22a84c570 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassAAttributeCompartmentEditPart.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassAAttributeCompartmentEditPart.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts; @@ -47,6 +47,7 @@ public class AClassAAttributeCompartmentEditPart extends ListCompartmentEditPart /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; @@ -55,6 +56,7 @@ public class AClassAAttributeCompartmentEditPart extends ListCompartmentEditPart /** * @generated */ + @Override public String getCompartmentName() { return Messages.AClassAAttributeCompartmentEditPart_title; @@ -63,6 +65,7 @@ public class AClassAAttributeCompartmentEditPart extends ListCompartmentEditPart /** * @generated */ + @Override public IFigure createFigure() { ResizableCompartmentFigure result = (ResizableCompartmentFigure)super.createFigure(); @@ -73,6 +76,7 @@ public class AClassAAttributeCompartmentEditPart extends ListCompartmentEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); @@ -85,6 +89,7 @@ public class AClassAAttributeCompartmentEditPart extends ListCompartmentEditPart /** * @generated */ + @Override protected void setRatio(Double ratio) { // nothing to do -- parent layout does not accept Double constraints as ratio diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassAOperationClassCompartmentEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassAOperationClassCompartmentEditPart.java index 8ac3fd40cf..facea597cc 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassAOperationClassCompartmentEditPart.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassAOperationClassCompartmentEditPart.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts; @@ -47,6 +47,7 @@ public class AClassAOperationClassCompartmentEditPart extends ListCompartmentEdi /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; @@ -55,6 +56,7 @@ public class AClassAOperationClassCompartmentEditPart extends ListCompartmentEdi /** * @generated */ + @Override public String getCompartmentName() { return Messages.AClassAOperationClassCompartmentEditPart_title; @@ -63,6 +65,7 @@ public class AClassAOperationClassCompartmentEditPart extends ListCompartmentEdi /** * @generated */ + @Override public IFigure createFigure() { ResizableCompartmentFigure result = (ResizableCompartmentFigure)super.createFigure(); @@ -73,6 +76,7 @@ public class AClassAOperationClassCompartmentEditPart extends ListCompartmentEdi /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); @@ -85,6 +89,7 @@ public class AClassAOperationClassCompartmentEditPart extends ListCompartmentEdi /** * @generated */ + @Override protected void setRatio(Double ratio) { // nothing to do -- parent layout does not accept Double constraints as ratio diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassAggregationsEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassAggregationsEditPart.java index 00347a0756..083ece4bdf 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassAggregationsEditPart.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassAggregationsEditPart.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts; @@ -46,6 +46,7 @@ public class AClassAggregationsEditPart extends ConnectionNodeEditPart implement /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); @@ -55,10 +56,11 @@ public class AClassAggregationsEditPart extends ConnectionNodeEditPart 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 AClassAggregationClassesFigure(); @@ -83,7 +85,7 @@ public class AClassAggregationsEditPart extends ConnectionNodeEditPart implement */ public AClassAggregationClassesFigure() { - this.setLineWidth(1); + setLineWidth(1); setTargetDecoration(createTargetDecoration()); } diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassAssociationsEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassAssociationsEditPart.java index 165ca7ac2e..99d8886e9a 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassAssociationsEditPart.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassAssociationsEditPart.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts; @@ -42,6 +42,7 @@ public class AClassAssociationsEditPart extends ConnectionNodeEditPart implement /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); @@ -51,9 +52,10 @@ public class AClassAssociationsEditPart extends ConnectionNodeEditPart 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 PolylineConnectionEx(); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassCompositionsEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassCompositionsEditPart.java index eed7a02ed4..9ea78a5afe 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassCompositionsEditPart.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassCompositionsEditPart.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts; @@ -46,6 +46,7 @@ public class AClassCompositionsEditPart extends ConnectionNodeEditPart implement /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); @@ -55,10 +56,11 @@ public class AClassCompositionsEditPart extends ConnectionNodeEditPart 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 AClassCompositionClassesFigure(); @@ -83,7 +85,7 @@ public class AClassCompositionsEditPart extends ConnectionNodeEditPart implement */ public AClassCompositionClassesFigure() { - this.setLineWidth(1); + setLineWidth(1); setTargetDecoration(createTargetDecoration()); } diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassEditPart.java index f5e18b3a3a..ab8f3d9020 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassEditPart.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassEditPart.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts; @@ -77,6 +77,7 @@ public class AClassEditPart extends ShapeNodeEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CreationEditPolicy()); @@ -97,6 +98,7 @@ public class AClassEditPart extends ShapeNodeEditPart ConstrainedToolbarLayoutEditPolicy lep = new ConstrainedToolbarLayoutEditPolicy() { + @Override protected EditPolicy createChildEditPolicy(EditPart child) { if (child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE) == null) @@ -185,6 +187,7 @@ public class AClassEditPart extends ShapeNodeEditPart /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) @@ -197,6 +200,7 @@ public class AClassEditPart extends ShapeNodeEditPart /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) @@ -209,6 +213,7 @@ public class AClassEditPart extends ShapeNodeEditPart /** * @generated */ + @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { if (editPart instanceof AClassAAttributeCompartmentEditPart) @@ -234,9 +239,10 @@ public class AClassEditPart extends ShapeNodeEditPart /** * 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(); @@ -249,7 +255,7 @@ public class AClassEditPart extends ShapeNodeEditPart /** * Default implementation treats passed figure as content pane. Respects layout one may have set for generated figure. - * + * * @param nodeShape * instance of generated figure class * @generated @@ -268,6 +274,7 @@ public class AClassEditPart extends ShapeNodeEditPart /** * @generated */ + @Override public IFigure getContentPane() { if (contentPane != null) @@ -280,6 +287,7 @@ public class AClassEditPart extends ShapeNodeEditPart /** * @generated */ + @Override protected void setForegroundColor(Color color) { if (primaryShape != null) @@ -291,6 +299,7 @@ public class AClassEditPart extends ShapeNodeEditPart /** * @generated */ + @Override protected void setBackgroundColor(Color color) { if (primaryShape != null) @@ -302,6 +311,7 @@ public class AClassEditPart extends ShapeNodeEditPart /** * @generated */ + @Override protected void setLineWidth(int width) { if (primaryShape instanceof Shape) @@ -313,6 +323,7 @@ public class AClassEditPart extends ShapeNodeEditPart /** * @generated */ + @Override protected void setLineType(int style) { if (primaryShape instanceof Shape) @@ -324,6 +335,7 @@ public class AClassEditPart extends ShapeNodeEditPart /** * @generated */ + @Override public EditPart getPrimaryChildEditPart() { return getChildBySemanticHint(AcoreVisualIDRegistry.getType(AClassNameEditPart.VISUAL_ID)); @@ -442,6 +454,7 @@ public class AClassEditPart extends ShapeNodeEditPart /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { if (request instanceof CreateViewAndElementRequest) @@ -455,7 +468,8 @@ public class AClassEditPart extends ShapeNodeEditPart } if (type == AcoreElementTypes.AOperation_3004) { - return getChildBySemanticHint(AcoreVisualIDRegistry.getType(AClassAOperationClassCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint( + AcoreVisualIDRegistry.getType(AClassAOperationClassCompartmentEditPart.VISUAL_ID)); } } return super.getTargetEditPart(request); @@ -495,10 +509,10 @@ public class AClassEditPart extends ShapeNodeEditPart layoutThis.setSpacing(0); layoutThis.setVertical(true); - this.setLayoutManager(layoutThis); + setLayoutManager(layoutThis); - this.setLineWidth(1); - this.setBackgroundColor(THIS_BACK); + setLineWidth(1); + setBackgroundColor(THIS_BACK); createContents(); } @@ -535,6 +549,7 @@ public class AClassEditPart extends ShapeNodeEditPart /** * @generated */ + @Override protected boolean useLocalCoordinates() { return myUseLocalCoordinates; diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassImplementedInterfacesEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassImplementedInterfacesEditPart.java index 66759583a2..0784f546b9 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassImplementedInterfacesEditPart.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassImplementedInterfacesEditPart.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts; @@ -45,6 +45,7 @@ public class AClassImplementedInterfacesEditPart extends ConnectionNodeEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); @@ -54,10 +55,11 @@ public class AClassImplementedInterfacesEditPart extends ConnectionNodeEditPart /** * 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 AClassImplementedInterfacesFigure(); @@ -82,8 +84,8 @@ public class AClassImplementedInterfacesEditPart extends ConnectionNodeEditPart */ public AClassImplementedInterfacesFigure() { - this.setLineWidth(1); - this.setLineStyle(Graphics.LINE_DASH); + setLineWidth(1); + setLineStyle(Graphics.LINE_DASH); setTargetDecoration(createTargetDecoration()); } diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassNameEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassNameEditPart.java index 6a172f4e33..d0470cf525 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassNameEditPart.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassNameEditPart.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts; @@ -104,6 +104,7 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); @@ -112,6 +113,7 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new NonResizableEditPolicy() { + @Override protected List createSelectionHandles() { List handles = new ArrayList(); @@ -120,11 +122,13 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar return handles; } + @Override public Command getCommand(Request request) { return null; } + @Override public boolean understandsRequest(Request request) { return false; @@ -207,6 +211,7 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected List getModelChildren() { return Collections.EMPTY_LIST; @@ -215,6 +220,7 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; @@ -426,6 +432,7 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -438,13 +445,14 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar { if (isActive() && isEditable()) { - if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get( - RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + 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()); @@ -466,6 +474,7 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); @@ -522,13 +531,14 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected void refreshFont() { 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); } } @@ -536,6 +546,7 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); @@ -544,6 +555,7 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) @@ -564,6 +576,7 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) @@ -582,6 +595,7 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) @@ -589,6 +603,7 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar accessibleEP = new AccessibleGraphicalEditPart() { + @Override public void getName(AccessibleEvent e) { e.result = getLabelTextHelper(getFigure()); @@ -609,6 +624,7 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); @@ -618,6 +634,7 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); @@ -627,6 +644,7 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); @@ -676,6 +694,7 @@ public class AClassNameEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassSubClassesEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassSubClassesEditPart.java index 0609d22e4d..4d8e850193 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassSubClassesEditPart.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AClassSubClassesEditPart.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts; @@ -46,6 +46,7 @@ public class AClassSubClassesEditPart extends ConnectionNodeEditPart implements /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); @@ -55,10 +56,11 @@ public class AClassSubClassesEditPart extends ConnectionNodeEditPart 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 AClassSubClassesFigure(); @@ -83,7 +85,7 @@ public class AClassSubClassesEditPart extends ConnectionNodeEditPart implements */ public AClassSubClassesFigure() { - this.setLineWidth(1); + setLineWidth(1); setTargetDecoration(createTargetDecoration()); } diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/ACoreRootEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/ACoreRootEditPart.java index 95c938345b..78e4185c77 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/ACoreRootEditPart.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/ACoreRootEditPart.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts; @@ -45,6 +45,7 @@ public class ACoreRootEditPart extends DiagramEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceAAttributeInterfaceCompartmentEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceAAttributeInterfaceCompartmentEditPart.java index e034073c44..8c34b3f0b0 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceAAttributeInterfaceCompartmentEditPart.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceAAttributeInterfaceCompartmentEditPart.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts; @@ -47,6 +47,7 @@ public class AInterfaceAAttributeInterfaceCompartmentEditPart extends ListCompar /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; @@ -55,6 +56,7 @@ public class AInterfaceAAttributeInterfaceCompartmentEditPart extends ListCompar /** * @generated */ + @Override public String getCompartmentName() { return Messages.AInterfaceAAttributeInterfaceCompartmentEditPart_title; @@ -63,6 +65,7 @@ public class AInterfaceAAttributeInterfaceCompartmentEditPart extends ListCompar /** * @generated */ + @Override public IFigure createFigure() { ResizableCompartmentFigure result = (ResizableCompartmentFigure)super.createFigure(); @@ -73,6 +76,7 @@ public class AInterfaceAAttributeInterfaceCompartmentEditPart extends ListCompar /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); @@ -80,12 +84,14 @@ public class AInterfaceAAttributeInterfaceCompartmentEditPart extends ListCompar new AInterfaceAAttributeInterfaceCompartmentItemSemanticEditPolicy()); installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); - installEditPolicy(EditPolicyRoles.CANONICAL_ROLE, new AInterfaceAAttributeInterfaceCompartmentCanonicalEditPolicy()); + installEditPolicy(EditPolicyRoles.CANONICAL_ROLE, + new AInterfaceAAttributeInterfaceCompartmentCanonicalEditPolicy()); } /** * @generated */ + @Override protected void setRatio(Double ratio) { // nothing to do -- parent layout does not accept Double constraints as ratio diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceAOperationInterfaceCompartmentEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceAOperationInterfaceCompartmentEditPart.java index e01845f5ab..aa55e6ed33 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceAOperationInterfaceCompartmentEditPart.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceAOperationInterfaceCompartmentEditPart.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts; @@ -47,6 +47,7 @@ public class AInterfaceAOperationInterfaceCompartmentEditPart extends ListCompar /** * @generated */ + @Override protected boolean hasModelChildrenChanged(Notification evt) { return false; @@ -55,6 +56,7 @@ public class AInterfaceAOperationInterfaceCompartmentEditPart extends ListCompar /** * @generated */ + @Override public String getCompartmentName() { return Messages.AInterfaceAOperationInterfaceCompartmentEditPart_title; @@ -63,6 +65,7 @@ public class AInterfaceAOperationInterfaceCompartmentEditPart extends ListCompar /** * @generated */ + @Override public IFigure createFigure() { ResizableCompartmentFigure result = (ResizableCompartmentFigure)super.createFigure(); @@ -73,6 +76,7 @@ public class AInterfaceAOperationInterfaceCompartmentEditPart extends ListCompar /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); @@ -80,12 +84,14 @@ public class AInterfaceAOperationInterfaceCompartmentEditPart extends ListCompar new AInterfaceAOperationInterfaceCompartmentItemSemanticEditPolicy()); installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CreationEditPolicy()); installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy()); - installEditPolicy(EditPolicyRoles.CANONICAL_ROLE, new AInterfaceAOperationInterfaceCompartmentCanonicalEditPolicy()); + installEditPolicy(EditPolicyRoles.CANONICAL_ROLE, + new AInterfaceAOperationInterfaceCompartmentCanonicalEditPolicy()); } /** * @generated */ + @Override protected void setRatio(Double ratio) { // nothing to do -- parent layout does not accept Double constraints as ratio diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceEditPart.java index 684301a1fb..b8148f39c1 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceEditPart.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceEditPart.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts; @@ -79,6 +79,7 @@ public class AInterfaceEditPart extends ShapeNodeEditPart /** * @generated */ + @Override protected void createDefaultEditPolicies() { installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CreationEditPolicy()); @@ -99,6 +100,7 @@ public class AInterfaceEditPart extends ShapeNodeEditPart ConstrainedToolbarLayoutEditPolicy lep = new ConstrainedToolbarLayoutEditPolicy() { + @Override protected EditPolicy createChildEditPolicy(EditPart child) { if (child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE) == null) @@ -187,6 +189,7 @@ public class AInterfaceEditPart extends ShapeNodeEditPart /** * @generated */ + @Override protected void addChildVisual(EditPart childEditPart, int index) { if (addFixedChild(childEditPart)) @@ -199,6 +202,7 @@ public class AInterfaceEditPart extends ShapeNodeEditPart /** * @generated */ + @Override protected void removeChildVisual(EditPart childEditPart) { if (removeFixedChild(childEditPart)) @@ -211,6 +215,7 @@ public class AInterfaceEditPart extends ShapeNodeEditPart /** * @generated */ + @Override protected IFigure getContentPaneFor(IGraphicalEditPart editPart) { if (editPart instanceof AInterfaceAAttributeInterfaceCompartmentEditPart) @@ -236,9 +241,10 @@ public class AInterfaceEditPart extends ShapeNodeEditPart /** * 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(); @@ -251,7 +257,7 @@ public class AInterfaceEditPart extends ShapeNodeEditPart /** * Default implementation treats passed figure as content pane. Respects layout one may have set for generated figure. - * + * * @param nodeShape * instance of generated figure class * @generated @@ -270,6 +276,7 @@ public class AInterfaceEditPart extends ShapeNodeEditPart /** * @generated */ + @Override public IFigure getContentPane() { if (contentPane != null) @@ -282,6 +289,7 @@ public class AInterfaceEditPart extends ShapeNodeEditPart /** * @generated */ + @Override protected void setForegroundColor(Color color) { if (primaryShape != null) @@ -293,6 +301,7 @@ public class AInterfaceEditPart extends ShapeNodeEditPart /** * @generated */ + @Override protected void setBackgroundColor(Color color) { if (primaryShape != null) @@ -304,6 +313,7 @@ public class AInterfaceEditPart extends ShapeNodeEditPart /** * @generated */ + @Override protected void setLineWidth(int width) { if (primaryShape instanceof Shape) @@ -315,6 +325,7 @@ public class AInterfaceEditPart extends ShapeNodeEditPart /** * @generated */ + @Override protected void setLineType(int style) { if (primaryShape instanceof Shape) @@ -326,6 +337,7 @@ public class AInterfaceEditPart extends ShapeNodeEditPart /** * @generated */ + @Override public EditPart getPrimaryChildEditPart() { return getChildBySemanticHint(AcoreVisualIDRegistry.getType(AInterfaceNameEditPart.VISUAL_ID)); @@ -357,6 +369,7 @@ public class AInterfaceEditPart extends ShapeNodeEditPart /** * @generated */ + @Override public EditPart getTargetEditPart(Request request) { if (request instanceof CreateViewAndElementRequest) @@ -366,13 +379,13 @@ public class AInterfaceEditPart extends ShapeNodeEditPart IElementType type = (IElementType)adapter.getAdapter(IElementType.class); if (type == AcoreElementTypes.AAttribute_3001) { - return getChildBySemanticHint(AcoreVisualIDRegistry - .getType(AInterfaceAAttributeInterfaceCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint( + AcoreVisualIDRegistry.getType(AInterfaceAAttributeInterfaceCompartmentEditPart.VISUAL_ID)); } if (type == AcoreElementTypes.AOperation_3002) { - return getChildBySemanticHint(AcoreVisualIDRegistry - .getType(AInterfaceAOperationInterfaceCompartmentEditPart.VISUAL_ID)); + return getChildBySemanticHint( + AcoreVisualIDRegistry.getType(AInterfaceAOperationInterfaceCompartmentEditPart.VISUAL_ID)); } } return super.getTargetEditPart(request); @@ -412,11 +425,11 @@ public class AInterfaceEditPart extends ShapeNodeEditPart layoutThis.setSpacing(0); layoutThis.setVertical(true); - this.setLayoutManager(layoutThis); + setLayoutManager(layoutThis); - this.setCornerDimensions(new Dimension(getMapMode().DPtoLP(12), getMapMode().DPtoLP(12))); - this.setLineWidth(1); - this.setBackgroundColor(THIS_BACK); + setCornerDimensions(new Dimension(getMapMode().DPtoLP(12), getMapMode().DPtoLP(12))); + setLineWidth(1); + setBackgroundColor(THIS_BACK); createContents(); } @@ -427,7 +440,7 @@ public class AInterfaceEditPart extends ShapeNodeEditPart { WrappingLabel aInterfaceTypeLabelFigure0 = new WrappingLabel(); - aInterfaceTypeLabelFigure0.setText("«Interface»"); + aInterfaceTypeLabelFigure0.setText("�Interface�"); this.add(aInterfaceTypeLabelFigure0); @@ -458,6 +471,7 @@ public class AInterfaceEditPart extends ShapeNodeEditPart /** * @generated */ + @Override protected boolean useLocalCoordinates() { return myUseLocalCoordinates; diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceNameEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceNameEditPart.java index 1aec5a1bfa..c94c537394 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceNameEditPart.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AInterfaceNameEditPart.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts; @@ -104,6 +104,7 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); @@ -112,6 +113,7 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new NonResizableEditPolicy() { + @Override protected List createSelectionHandles() { List handles = new ArrayList(); @@ -120,11 +122,13 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText return handles; } + @Override public Command getCommand(Request request) { return null; } + @Override public boolean understandsRequest(Request request) { return false; @@ -207,6 +211,7 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText /** * @generated */ + @Override protected List getModelChildren() { return Collections.EMPTY_LIST; @@ -215,6 +220,7 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; @@ -364,7 +370,7 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText { parser = AcoreParserProvider.getParser(AcoreElementTypes.AInterface_2001, getParserElement(), AcoreVisualIDRegistry - .getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AInterfaceNameEditPart.VISUAL_ID)); + .getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AInterfaceNameEditPart.VISUAL_ID)); } return parser; } @@ -427,6 +433,7 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -439,13 +446,14 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText { if (isActive() && isEditable()) { - if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get( - RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + 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()); @@ -467,6 +475,7 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); @@ -523,13 +532,14 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText /** * @generated */ + @Override protected void refreshFont() { 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); } } @@ -537,6 +547,7 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); @@ -545,6 +556,7 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) @@ -565,6 +577,7 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) @@ -583,6 +596,7 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) @@ -590,6 +604,7 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText accessibleEP = new AccessibleGraphicalEditPart() { + @Override public void getName(AccessibleEvent e) { e.result = getLabelTextHelper(getFigure()); @@ -610,6 +625,7 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); @@ -619,6 +635,7 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); @@ -628,6 +645,7 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); @@ -677,6 +695,7 @@ public class AInterfaceNameEditPart extends CompartmentEditPart implements IText /** * @generated */ + @Override protected IFigure createFigure() { // Parent should assign one using setLabel() method diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AOperation2EditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AOperation2EditPart.java index 783c23e71a..93748083fa 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AOperation2EditPart.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AOperation2EditPart.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts; @@ -105,6 +105,7 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest)request).getLastButtonPressed() == 3) @@ -117,6 +118,7 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); @@ -201,6 +203,7 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa /** * @generated */ + @Override protected List getModelChildren() { return Collections.EMPTY_LIST; @@ -209,6 +212,7 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; @@ -353,7 +357,7 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa { parser = AcoreParserProvider.getParser(AcoreElementTypes.AOperation_3004, getParserElement(), AcoreVisualIDRegistry - .getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AOperation2EditPart.VISUAL_ID)); + .getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AOperation2EditPart.VISUAL_ID)); } return parser; } @@ -416,6 +420,7 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -428,13 +433,14 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa { if (isActive() && isEditable()) { - if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get( - RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + 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()); @@ -456,6 +462,7 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); @@ -512,13 +519,14 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa /** * @generated */ + @Override protected void refreshFont() { 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); } } @@ -526,6 +534,7 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); @@ -534,6 +543,7 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) @@ -554,6 +564,7 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) @@ -572,6 +583,7 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) @@ -579,6 +591,7 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa accessibleEP = new AccessibleGraphicalEditPart() { + @Override public void getName(AccessibleEvent e) { e.result = getLabelTextHelper(getFigure()); @@ -599,6 +612,7 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); @@ -608,6 +622,7 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); @@ -617,6 +632,7 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); @@ -666,6 +682,7 @@ public class AOperation2EditPart extends CompartmentEditPart implements ITextAwa /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AOperationEditPart.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AOperationEditPart.java index 7e4f6f98f0..8c0c7dc1f9 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AOperationEditPart.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AOperationEditPart.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts; @@ -105,6 +105,7 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override public DragTracker getDragTracker(Request request) { if (request instanceof SelectionRequest && ((SelectionRequest)request).getLastButtonPressed() == 3) @@ -117,6 +118,7 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); @@ -201,6 +203,7 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected List getModelChildren() { return Collections.EMPTY_LIST; @@ -209,6 +212,7 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; @@ -353,7 +357,7 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar { parser = AcoreParserProvider.getParser(AcoreElementTypes.AOperation_3002, getParserElement(), AcoreVisualIDRegistry - .getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AOperationEditPart.VISUAL_ID)); + .getType(org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts.AOperationEditPart.VISUAL_ID)); } return parser; } @@ -416,6 +420,7 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; @@ -428,13 +433,14 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar { if (isActive() && isEditable()) { - if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) + if (theRequest.getExtendedData() + .get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get( - RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + 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()); @@ -456,6 +462,7 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected void refreshVisuals() { super.refreshVisuals(); @@ -512,13 +519,14 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected void refreshFont() { 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); } } @@ -526,6 +534,7 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); @@ -534,6 +543,7 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected void addSemanticListeners() { if (getParser() instanceof ISemanticParser) @@ -554,6 +564,7 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected void removeSemanticListeners() { if (parserElements != null) @@ -572,6 +583,7 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected AccessibleEditPart getAccessibleEditPart() { if (accessibleEP == null) @@ -579,6 +591,7 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar accessibleEP = new AccessibleGraphicalEditPart() { + @Override public void getName(AccessibleEvent e) { e.result = getLabelTextHelper(getFigure()); @@ -599,6 +612,7 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected void addNotationalListeners() { super.addNotationalListeners(); @@ -608,6 +622,7 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected void removeNotationalListeners() { super.removeNotationalListeners(); @@ -617,6 +632,7 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); @@ -666,6 +682,7 @@ public class AOperationEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AcoreEditPartFactory.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AcoreEditPartFactory.java index 11f1bde92f..0ea4d2d72a 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AcoreEditPartFactory.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/parts/AcoreEditPartFactory.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.parts; @@ -118,7 +118,9 @@ public class AcoreEditPartFactory implements EditPartFactory public static CellEditorLocator getTextCellEditorLocator(ITextAwareEditPart source) { if (source.getFigure() instanceof WrappingLabel) + { return new TextCellEditorLocator((WrappingLabel)source.getFigure()); + } else { return new LabelCellEditorLocator((Label)source.getFigure()); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AAttribute2ItemSemanticEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AAttribute2ItemSemanticEditPolicy.java index 585c83a903..b2d9179a9b 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AAttribute2ItemSemanticEditPolicy.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AAttribute2ItemSemanticEditPolicy.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies; @@ -39,6 +39,7 @@ public class AAttribute2ItemSemanticEditPolicy extends AcoreBaseItemSemanticEdit /** * @generated */ + @Override protected Command getDestroyElementCommand(DestroyElementRequest req) { View view = (View)getHost().getModel(); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AAttributeItemSemanticEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AAttributeItemSemanticEditPolicy.java index f711ba3c64..4259ee46d1 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AAttributeItemSemanticEditPolicy.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AAttributeItemSemanticEditPolicy.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies; @@ -39,6 +39,7 @@ public class AAttributeItemSemanticEditPolicy extends AcoreBaseItemSemanticEditP /** * @generated */ + @Override protected Command getDestroyElementCommand(DestroyElementRequest req) { View view = (View)getHost().getModel(); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAAttributeCompartmentCanonicalEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAAttributeCompartmentCanonicalEditPolicy.java index aaa09ae516..ae6acb190e 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAAttributeCompartmentCanonicalEditPolicy.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAAttributeCompartmentCanonicalEditPolicy.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies; @@ -37,6 +37,7 @@ public class AClassAAttributeCompartmentCanonicalEditPolicy extends CanonicalEdi /** * @generated */ + @Override protected List getSemanticChildrenList() { View viewObject = (View)getHost().getModel(); @@ -54,6 +55,7 @@ public class AClassAAttributeCompartmentCanonicalEditPolicy extends CanonicalEdi /** * @generated */ + @Override protected boolean isOrphaned(Collection semanticChildren, final View view) { int visualID = AcoreVisualIDRegistry.getVisualID(view); @@ -71,6 +73,7 @@ public class AClassAAttributeCompartmentCanonicalEditPolicy extends CanonicalEdi /** * @generated */ + @Override protected EStructuralFeature getFeatureToSynchronize() { return AcorePackage.eINSTANCE.getABasicClass_Attributes(); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAAttributeCompartmentItemSemanticEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAAttributeCompartmentItemSemanticEditPolicy.java index db06451fd0..dee0a355a0 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAAttributeCompartmentItemSemanticEditPolicy.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAAttributeCompartmentItemSemanticEditPolicy.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies; @@ -34,6 +34,7 @@ public class AClassAAttributeCompartmentItemSemanticEditPolicy extends AcoreBase /** * @generated */ + @Override protected Command getCreateCommand(CreateElementRequest req) { if (AcoreElementTypes.AAttribute_3003 == req.getElementType()) diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAOperationClassCompartmentCanonicalEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAOperationClassCompartmentCanonicalEditPolicy.java index 28149aed9a..abdac56e12 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAOperationClassCompartmentCanonicalEditPolicy.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAOperationClassCompartmentCanonicalEditPolicy.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies; @@ -37,6 +37,7 @@ public class AClassAOperationClassCompartmentCanonicalEditPolicy extends Canonic /** * @generated */ + @Override protected List getSemanticChildrenList() { View viewObject = (View)getHost().getModel(); @@ -54,6 +55,7 @@ public class AClassAOperationClassCompartmentCanonicalEditPolicy extends Canonic /** * @generated */ + @Override protected boolean isOrphaned(Collection semanticChildren, final View view) { int visualID = AcoreVisualIDRegistry.getVisualID(view); @@ -71,6 +73,7 @@ public class AClassAOperationClassCompartmentCanonicalEditPolicy extends Canonic /** * @generated */ + @Override protected EStructuralFeature getFeatureToSynchronize() { return AcorePackage.eINSTANCE.getABasicClass_Operations(); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAOperationClassCompartmentItemSemanticEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAOperationClassCompartmentItemSemanticEditPolicy.java index 319f720244..e794fd191a 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAOperationClassCompartmentItemSemanticEditPolicy.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAOperationClassCompartmentItemSemanticEditPolicy.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies; @@ -34,6 +34,7 @@ public class AClassAOperationClassCompartmentItemSemanticEditPolicy extends Acor /** * @generated */ + @Override protected Command getCreateCommand(CreateElementRequest req) { if (AcoreElementTypes.AOperation_3004 == req.getElementType()) diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAggregationsItemSemanticEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAggregationsItemSemanticEditPolicy.java index ce82db2abc..02953f00d7 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAggregationsItemSemanticEditPolicy.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAggregationsItemSemanticEditPolicy.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies; @@ -34,6 +34,7 @@ public class AClassAggregationsItemSemanticEditPolicy extends AcoreBaseItemSeman /** * @generated */ + @Override protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) { return getGEFWrapper(new DestroyReferenceCommand(req)); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAssociationsItemSemanticEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAssociationsItemSemanticEditPolicy.java index 26fd642036..fdad9b43d5 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAssociationsItemSemanticEditPolicy.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassAssociationsItemSemanticEditPolicy.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies; @@ -34,6 +34,7 @@ public class AClassAssociationsItemSemanticEditPolicy extends AcoreBaseItemSeman /** * @generated */ + @Override protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) { return getGEFWrapper(new DestroyReferenceCommand(req)); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassCompositionsItemSemanticEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassCompositionsItemSemanticEditPolicy.java index 5035eb867f..c62216df5b 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassCompositionsItemSemanticEditPolicy.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassCompositionsItemSemanticEditPolicy.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies; @@ -34,6 +34,7 @@ public class AClassCompositionsItemSemanticEditPolicy extends AcoreBaseItemSeman /** * @generated */ + @Override protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) { return getGEFWrapper(new DestroyReferenceCommand(req)); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassImplementedInterfacesItemSemanticEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassImplementedInterfacesItemSemanticEditPolicy.java index daceaf55cb..b0a1d42973 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassImplementedInterfacesItemSemanticEditPolicy.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassImplementedInterfacesItemSemanticEditPolicy.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies; @@ -34,6 +34,7 @@ public class AClassImplementedInterfacesItemSemanticEditPolicy extends AcoreBase /** * @generated */ + @Override protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) { return getGEFWrapper(new DestroyReferenceCommand(req)); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassItemSemanticEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassItemSemanticEditPolicy.java index d0a062bd0c..14e8a7adc1 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassItemSemanticEditPolicy.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassItemSemanticEditPolicy.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies; @@ -68,6 +68,7 @@ public class AClassItemSemanticEditPolicy extends AcoreBaseItemSemanticEditPolic /** * @generated */ + @Override protected Command getDestroyElementCommand(DestroyElementRequest req) { View view = (View)getHost().getModel(); @@ -187,8 +188,9 @@ public class AClassItemSemanticEditPolicy extends AcoreBaseItemSemanticEditPolic switch (AcoreVisualIDRegistry.getVisualID(cnode)) { case AAttribute2EditPart.VISUAL_ID: - cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned: - // true + cmd.add( + new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned: + // true // don't need explicit deletion of cnode as parent's view deletion would clean child views as well // cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode)); break; @@ -202,8 +204,9 @@ public class AClassItemSemanticEditPolicy extends AcoreBaseItemSemanticEditPolic switch (AcoreVisualIDRegistry.getVisualID(cnode)) { case AOperation2EditPart.VISUAL_ID: - cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned: - // true + cmd.add( + new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned: + // true // don't need explicit deletion of cnode as parent's view deletion would clean child views as well // cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode)); break; @@ -217,6 +220,7 @@ public class AClassItemSemanticEditPolicy extends AcoreBaseItemSemanticEditPolic /** * @generated */ + @Override protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) { Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) @@ -283,9 +287,10 @@ public class AClassItemSemanticEditPolicy extends AcoreBaseItemSemanticEditPolic /** * Returns command to reorient EReference based link. New link target or source should be the domain model element * associated with this node. - * + * * @generated */ + @Override protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) { switch (getVisualID(req)) diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassSubClassesItemSemanticEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassSubClassesItemSemanticEditPolicy.java index 1af0c563b5..30e95e6a99 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassSubClassesItemSemanticEditPolicy.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AClassSubClassesItemSemanticEditPolicy.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies; @@ -34,6 +34,7 @@ public class AClassSubClassesItemSemanticEditPolicy extends AcoreBaseItemSemanti /** * @generated */ + @Override protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) { return getGEFWrapper(new DestroyReferenceCommand(req)); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/ACoreRootCanonicalEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/ACoreRootCanonicalEditPolicy.java index 28e4fb20c7..b32b02308c 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/ACoreRootCanonicalEditPolicy.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/ACoreRootCanonicalEditPolicy.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies; @@ -66,6 +66,7 @@ public class ACoreRootCanonicalEditPolicy extends CanonicalEditPolicy /** * @generated */ + @Override protected List getSemanticChildrenList() { View viewObject = (View)getHost().getModel(); @@ -82,6 +83,7 @@ public class ACoreRootCanonicalEditPolicy extends CanonicalEditPolicy /** * @generated */ + @Override protected boolean shouldDeleteView(View view) { return true; @@ -90,6 +92,7 @@ public class ACoreRootCanonicalEditPolicy extends CanonicalEditPolicy /** * @generated */ + @Override protected boolean isOrphaned(Collection semanticChildren, final View view) { int visualID = AcoreVisualIDRegistry.getVisualID(view); @@ -108,6 +111,7 @@ public class ACoreRootCanonicalEditPolicy extends CanonicalEditPolicy /** * @generated */ + @Override protected Set getFeaturesToSynchronize() { if (myFeaturesToSynchronize == null) @@ -122,6 +126,7 @@ public class ACoreRootCanonicalEditPolicy extends CanonicalEditPolicy /** * @generated */ + @Override protected void refreshSemantic() { if (resolveSemanticElement() == null) @@ -130,8 +135,8 @@ public class ACoreRootCanonicalEditPolicy extends CanonicalEditPolicy } LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>(); // refreshSemanticChildren() alternative - List<AcoreNodeDescriptor> childDescriptors = AcoreDiagramUpdater.getACoreRoot_1000SemanticChildren((View)getHost() - .getModel()); + List<AcoreNodeDescriptor> childDescriptors = AcoreDiagramUpdater + .getACoreRoot_1000SemanticChildren((View)getHost().getModel()); ArrayList<EObject> semanticChildren = new ArrayList<EObject>(childDescriptors.size()); for (Iterator<AcoreNodeDescriptor> it = childDescriptors.iterator(); it.hasNext();) { @@ -158,8 +163,8 @@ public class ACoreRootCanonicalEditPolicy extends CanonicalEditPolicy AcoreNodeDescriptor next = it.next(); String hint = AcoreVisualIDRegistry.getType(next.getVisualID()); IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint); - viewDescriptors.add(new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, - false, host().getDiagramPreferencesHint())); + viewDescriptors.add(new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, + host().getDiagramPreferencesHint())); } // CreateViewRequest request = getCreateViewRequest(viewDescriptors); @@ -223,8 +228,7 @@ public class ACoreRootCanonicalEditPolicy extends CanonicalEditPolicy { AcoreLinkDescriptor nextLinkDescriptor = linkDescriptorsIterator.next(); if (diagramLinkObject == nextLinkDescriptor.getModelElement() - && diagramLinkSrc == nextLinkDescriptor.getSource() - && diagramLinkDst == nextLinkDescriptor.getDestination() + && diagramLinkSrc == nextLinkDescriptor.getSource() && diagramLinkDst == nextLinkDescriptor.getDestination() && diagramLinkVisualID == nextLinkDescriptor.getVisualID()) { linksIterator.remove(); @@ -255,7 +259,8 @@ public class ACoreRootCanonicalEditPolicy extends CanonicalEditPolicy { result.addAll(AcoreDiagramUpdater.getACoreRoot_1000ContainedLinks(view)); } - if (!domain2NotationMap.containsKey(view.getElement()) || view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$ + if (!domain2NotationMap.containsKey(view.getElement()) || view.getEAnnotation("Shortcut") == null) //$NON-NLS-1$ + { domain2NotationMap.put(view.getElement(), view); } break; @@ -266,7 +271,8 @@ public class ACoreRootCanonicalEditPolicy extends CanonicalEditPolicy { result.addAll(AcoreDiagramUpdater.getAInterface_2001ContainedLinks(view)); } - if (!domain2NotationMap.containsKey(view.getElement()) || view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$ + if (!domain2NotationMap.containsKey(view.getElement()) || view.getEAnnotation("Shortcut") == null) //$NON-NLS-1$ + { domain2NotationMap.put(view.getElement(), view); } break; @@ -277,7 +283,8 @@ public class ACoreRootCanonicalEditPolicy extends CanonicalEditPolicy { result.addAll(AcoreDiagramUpdater.getAClass_2002ContainedLinks(view)); } - if (!domain2NotationMap.containsKey(view.getElement()) || view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$ + if (!domain2NotationMap.containsKey(view.getElement()) || view.getEAnnotation("Shortcut") == null) //$NON-NLS-1$ + { domain2NotationMap.put(view.getElement(), view); } break; @@ -338,7 +345,7 @@ public class ACoreRootCanonicalEditPolicy extends CanonicalEditPolicy */ private EditPart getEditPart(EObject domainModelElement, Map<EObject, View> domain2NotationMap) { - View view = (View)domain2NotationMap.get(domainModelElement); + View view = domain2NotationMap.get(domainModelElement); if (view != null) { return (EditPart)getHost().getViewer().getEditPartRegistry().get(view); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/ACoreRootItemSemanticEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/ACoreRootItemSemanticEditPolicy.java index bc987d6a9f..811fc760ee 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/ACoreRootItemSemanticEditPolicy.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/ACoreRootItemSemanticEditPolicy.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies; @@ -40,6 +40,7 @@ public class ACoreRootItemSemanticEditPolicy extends AcoreBaseItemSemanticEditPo /** * @generated */ + @Override protected Command getCreateCommand(CreateElementRequest req) { if (AcoreElementTypes.AInterface_2001 == req.getElementType()) @@ -56,6 +57,7 @@ public class ACoreRootItemSemanticEditPolicy extends AcoreBaseItemSemanticEditPo /** * @generated */ + @Override protected Command getDuplicateCommand(DuplicateElementsRequest req) { TransactionalEditingDomain editingDomain = ((IGraphicalEditPart)getHost()).getEditingDomain(); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAAttributeInterfaceCompartmentCanonicalEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAAttributeInterfaceCompartmentCanonicalEditPolicy.java index 6aa7af68bc..4f16d8084f 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAAttributeInterfaceCompartmentCanonicalEditPolicy.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAAttributeInterfaceCompartmentCanonicalEditPolicy.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies; @@ -37,6 +37,7 @@ public class AInterfaceAAttributeInterfaceCompartmentCanonicalEditPolicy extends /** * @generated */ + @Override protected List getSemanticChildrenList() { View viewObject = (View)getHost().getModel(); @@ -54,6 +55,7 @@ public class AInterfaceAAttributeInterfaceCompartmentCanonicalEditPolicy extends /** * @generated */ + @Override protected boolean isOrphaned(Collection semanticChildren, final View view) { int visualID = AcoreVisualIDRegistry.getVisualID(view); @@ -71,6 +73,7 @@ public class AInterfaceAAttributeInterfaceCompartmentCanonicalEditPolicy extends /** * @generated */ + @Override protected EStructuralFeature getFeatureToSynchronize() { return AcorePackage.eINSTANCE.getABasicClass_Attributes(); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAAttributeInterfaceCompartmentItemSemanticEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAAttributeInterfaceCompartmentItemSemanticEditPolicy.java index d6d9929706..fe3b277e9b 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAAttributeInterfaceCompartmentItemSemanticEditPolicy.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAAttributeInterfaceCompartmentItemSemanticEditPolicy.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies; @@ -34,6 +34,7 @@ public class AInterfaceAAttributeInterfaceCompartmentItemSemanticEditPolicy exte /** * @generated */ + @Override protected Command getCreateCommand(CreateElementRequest req) { if (AcoreElementTypes.AAttribute_3001 == req.getElementType()) diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAOperationInterfaceCompartmentCanonicalEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAOperationInterfaceCompartmentCanonicalEditPolicy.java index 2638821d5a..9d083b795c 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAOperationInterfaceCompartmentCanonicalEditPolicy.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAOperationInterfaceCompartmentCanonicalEditPolicy.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies; @@ -37,6 +37,7 @@ public class AInterfaceAOperationInterfaceCompartmentCanonicalEditPolicy extends /** * @generated */ + @Override protected List getSemanticChildrenList() { View viewObject = (View)getHost().getModel(); @@ -54,6 +55,7 @@ public class AInterfaceAOperationInterfaceCompartmentCanonicalEditPolicy extends /** * @generated */ + @Override protected boolean isOrphaned(Collection semanticChildren, final View view) { int visualID = AcoreVisualIDRegistry.getVisualID(view); @@ -71,6 +73,7 @@ public class AInterfaceAOperationInterfaceCompartmentCanonicalEditPolicy extends /** * @generated */ + @Override protected EStructuralFeature getFeatureToSynchronize() { return AcorePackage.eINSTANCE.getABasicClass_Operations(); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAOperationInterfaceCompartmentItemSemanticEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAOperationInterfaceCompartmentItemSemanticEditPolicy.java index 3b1caa8fcb..c94570c3c2 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAOperationInterfaceCompartmentItemSemanticEditPolicy.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceAOperationInterfaceCompartmentItemSemanticEditPolicy.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies; @@ -34,6 +34,7 @@ public class AInterfaceAOperationInterfaceCompartmentItemSemanticEditPolicy exte /** * @generated */ + @Override protected Command getCreateCommand(CreateElementRequest req) { if (AcoreElementTypes.AOperation_3002 == req.getElementType()) diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceItemSemanticEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceItemSemanticEditPolicy.java index c8ae82251d..b1746e7d4e 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceItemSemanticEditPolicy.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AInterfaceItemSemanticEditPolicy.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies; @@ -56,6 +56,7 @@ public class AInterfaceItemSemanticEditPolicy extends AcoreBaseItemSemanticEditP /** * @generated */ + @Override protected Command getDestroyElementCommand(DestroyElementRequest req) { View view = (View)getHost().getModel(); @@ -107,8 +108,9 @@ public class AInterfaceItemSemanticEditPolicy extends AcoreBaseItemSemanticEditP switch (AcoreVisualIDRegistry.getVisualID(cnode)) { case AAttributeEditPart.VISUAL_ID: - cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned: - // true + cmd.add( + new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned: + // true // don't need explicit deletion of cnode as parent's view deletion would clean child views as well // cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode)); break; @@ -122,8 +124,9 @@ public class AInterfaceItemSemanticEditPolicy extends AcoreBaseItemSemanticEditP switch (AcoreVisualIDRegistry.getVisualID(cnode)) { case AOperationEditPart.VISUAL_ID: - cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned: - // true + cmd.add( + new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), cnode.getElement(), false))); // directlyOwned: + // true // don't need explicit deletion of cnode as parent's view deletion would clean child views as well // cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), cnode)); break; @@ -137,6 +140,7 @@ public class AInterfaceItemSemanticEditPolicy extends AcoreBaseItemSemanticEditP /** * @generated */ + @Override protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) { Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) @@ -171,9 +175,10 @@ public class AInterfaceItemSemanticEditPolicy extends AcoreBaseItemSemanticEditP /** * Returns command to reorient EReference based link. New link target or source should be the domain model element * associated with this node. - * + * * @generated */ + @Override protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) { switch (getVisualID(req)) diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AOperation2ItemSemanticEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AOperation2ItemSemanticEditPolicy.java index f718a66b02..dd00392d8e 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AOperation2ItemSemanticEditPolicy.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AOperation2ItemSemanticEditPolicy.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies; @@ -39,6 +39,7 @@ public class AOperation2ItemSemanticEditPolicy extends AcoreBaseItemSemanticEdit /** * @generated */ + @Override protected Command getDestroyElementCommand(DestroyElementRequest req) { View view = (View)getHost().getModel(); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AOperationItemSemanticEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AOperationItemSemanticEditPolicy.java index 20bdcb7fef..c29e018921 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AOperationItemSemanticEditPolicy.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AOperationItemSemanticEditPolicy.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies; @@ -39,6 +39,7 @@ public class AOperationItemSemanticEditPolicy extends AcoreBaseItemSemanticEditP /** * @generated */ + @Override protected Command getDestroyElementCommand(DestroyElementRequest req) { View view = (View)getHost().getModel(); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AcoreBaseItemSemanticEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AcoreBaseItemSemanticEditPolicy.java index 83300edead..39bff28e93 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AcoreBaseItemSemanticEditPolicy.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AcoreBaseItemSemanticEditPolicy.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies; @@ -57,7 +57,7 @@ public class AcoreBaseItemSemanticEditPolicy extends SemanticEditPolicy /** * Extended request data key to hold editpart visual id. - * + * * @generated */ public static final String VISUAL_ID_KEY = "visual_id"; //$NON-NLS-1$ @@ -79,9 +79,10 @@ public class AcoreBaseItemSemanticEditPolicy extends SemanticEditPolicy * Extended request data key to hold editpart visual id. Add visual id of edited editpart to extended data of the * request so command switch can decide what kind of diagram element is being edited. It is done in those cases when * it's not possible to deduce diagram element kind from domain element. - * + * * @generated */ + @Override public Command getCommand(Request request) { if (request instanceof ReconnectRequest) @@ -98,7 +99,7 @@ public class AcoreBaseItemSemanticEditPolicy extends SemanticEditPolicy /** * Returns visual id from request parameters. - * + * * @generated */ protected int getVisualID(IEditCommandRequest request) @@ -110,6 +111,7 @@ public class AcoreBaseItemSemanticEditPolicy extends SemanticEditPolicy /** * @generated */ + @Override protected Command getSemanticCommand(IEditCommandRequest request) { IEditCommandRequest completedRequest = completeRequest(request); @@ -318,7 +320,7 @@ public class AcoreBaseItemSemanticEditPolicy extends SemanticEditPolicy /** * Returns editing domain from the host edit part. - * + * * @generated */ protected TransactionalEditingDomain getEditingDomain() @@ -328,7 +330,7 @@ public class AcoreBaseItemSemanticEditPolicy extends SemanticEditPolicy /** * Clean all shortcuts to the host element from the same diagram - * + * * @generated */ protected void addDestroyShortcutsCommand(ICompositeCommand cmd, View view) @@ -337,7 +339,9 @@ public class AcoreBaseItemSemanticEditPolicy extends SemanticEditPolicy for (Iterator it = view.getDiagram().getChildren().iterator(); it.hasNext();) { View nextView = (View)it.next(); - if (nextView.getEAnnotation("Shortcut") == null || !nextView.isSetElement() || nextView.getElement() != view.getElement()) { //$NON-NLS-1$ + if (nextView.getEAnnotation("Shortcut") == null || !nextView.isSetElement() //$NON-NLS-1$ + || nextView.getElement() != view.getElement()) + { continue; } cmd.add(new DeleteCommand(getEditingDomain(), nextView)); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AcoreTextNonResizableEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AcoreTextNonResizableEditPolicy.java index 522357c579..73798facd0 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AcoreTextNonResizableEditPolicy.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AcoreTextNonResizableEditPolicy.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies; @@ -52,6 +52,7 @@ public class AcoreTextNonResizableEditPolicy extends NonResizableEditPolicyEx /** * @generated */ + @Override protected void showPrimarySelection() { if (getHostFigure() instanceof WrappingLabel) @@ -69,6 +70,7 @@ public class AcoreTextNonResizableEditPolicy extends NonResizableEditPolicyEx /** * @generated */ + @Override protected void showSelection() { if (getHostFigure() instanceof WrappingLabel) @@ -89,6 +91,7 @@ public class AcoreTextNonResizableEditPolicy extends NonResizableEditPolicyEx /** * @generated */ + @Override protected void hideSelection() { if (getHostFigure() instanceof WrappingLabel) @@ -111,6 +114,7 @@ public class AcoreTextNonResizableEditPolicy extends NonResizableEditPolicyEx /** * @generated */ + @Override protected void showFocus() { if (getHostFigure() instanceof WrappingLabel) @@ -128,6 +132,7 @@ public class AcoreTextNonResizableEditPolicy extends NonResizableEditPolicyEx /** * @generated */ + @Override protected void hideFocus() { if (getHostFigure() instanceof WrappingLabel) @@ -193,6 +198,7 @@ public class AcoreTextNonResizableEditPolicy extends NonResizableEditPolicyEx return new Figure() { + @Override protected void paintFigure(Graphics graphics) { graphics.drawFocus(getBounds().getResized(-1, -1)); @@ -271,6 +277,7 @@ public class AcoreTextNonResizableEditPolicy extends NonResizableEditPolicyEx /** * @generated */ + @Override protected List createSelectionHandles() { MoveHandle moveHandle = new MoveHandle((GraphicalEditPart)getHost()); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AcoreTextSelectionEditPolicy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AcoreTextSelectionEditPolicy.java index 1d663c93f1..dbad3e5681 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AcoreTextSelectionEditPolicy.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/edit/policies/AcoreTextSelectionEditPolicy.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.edit.policies; @@ -46,6 +46,7 @@ public class AcoreTextSelectionEditPolicy extends SelectionEditPolicy /** * @generated */ + @Override protected void showPrimarySelection() { if (getHostFigure() instanceof WrappingLabel) @@ -63,6 +64,7 @@ public class AcoreTextSelectionEditPolicy extends SelectionEditPolicy /** * @generated */ + @Override protected void showSelection() { if (getHostFigure() instanceof WrappingLabel) @@ -83,6 +85,7 @@ public class AcoreTextSelectionEditPolicy extends SelectionEditPolicy /** * @generated */ + @Override protected void hideSelection() { if (getHostFigure() instanceof WrappingLabel) @@ -105,6 +108,7 @@ public class AcoreTextSelectionEditPolicy extends SelectionEditPolicy /** * @generated */ + @Override protected void showFocus() { if (getHostFigure() instanceof WrappingLabel) @@ -122,6 +126,7 @@ public class AcoreTextSelectionEditPolicy extends SelectionEditPolicy /** * @generated */ + @Override protected void hideFocus() { if (getHostFigure() instanceof WrappingLabel) @@ -187,6 +192,7 @@ public class AcoreTextSelectionEditPolicy extends SelectionEditPolicy return new Figure() { + @Override protected void paintFigure(Graphics graphics) { graphics.drawFocus(getBounds().getResized(-1, -1)); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreAbstractNavigatorItem.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreAbstractNavigatorItem.java index 53062a984c..be39d6fe27 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreAbstractNavigatorItem.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreAbstractNavigatorItem.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator; diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreDomainNavigatorContentProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreDomainNavigatorContentProvider.java index 648637b0c9..58acc46d96 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreDomainNavigatorContentProvider.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreDomainNavigatorContentProvider.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator; @@ -74,12 +74,15 @@ public class AcoreDomainNavigatorContentProvider implements ICommonContentProvid */ public AcoreDomainNavigatorContentProvider() { - myAdapterFctoryContentProvier = new AdapterFactoryContentProvider(AcoreDiagramEditorPlugin.getInstance() - .getItemProvidersAdapterFactory()); + myAdapterFctoryContentProvier = new AdapterFactoryContentProvider( + AcoreDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory()); TransactionalEditingDomain editingDomain = GMFEditingDomainFactory.INSTANCE.createEditingDomain(); myEditingDomain = (AdapterFactoryEditingDomain)editingDomain; myEditingDomain.setResourceToReadOnlyMap(new HashMap() { + private static final long serialVersionUID = 1L; + + @Override public Object get(Object key) { if (!containsKey(key)) diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreDomainNavigatorItem.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreDomainNavigatorItem.java index fda7a6837e..b22c6f5d32 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreDomainNavigatorItem.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreDomainNavigatorItem.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator; @@ -113,13 +113,13 @@ public class AcoreDomainNavigatorItem extends PlatformObject /** * @generated */ + @Override public boolean equals(Object obj) { if (obj instanceof org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator.AcoreDomainNavigatorItem) { - return EcoreUtil.getURI(getEObject()).equals( - EcoreUtil.getURI(((org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator.AcoreDomainNavigatorItem)obj) - .getEObject())); + return EcoreUtil.getURI(getEObject()).equals(EcoreUtil.getURI( + ((org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator.AcoreDomainNavigatorItem)obj).getEObject())); } return super.equals(obj); } @@ -127,6 +127,7 @@ public class AcoreDomainNavigatorItem extends PlatformObject /** * @generated */ + @Override public int hashCode() { return EcoreUtil.getURI(getEObject()).hashCode(); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreDomainNavigatorLabelProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreDomainNavigatorLabelProvider.java index d40bf3956c..31693264a6 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreDomainNavigatorLabelProvider.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreDomainNavigatorLabelProvider.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator; diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorActionProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorActionProvider.java index ab314ea25f..162fe4a19a 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorActionProvider.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorActionProvider.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator; @@ -60,6 +60,7 @@ public class AcoreNavigatorActionProvider extends CommonActionProvider /** * @generated */ + @Override public void init(ICommonActionExtensionSite aSite) { super.init(aSite); @@ -85,6 +86,7 @@ public class AcoreNavigatorActionProvider extends CommonActionProvider /** * @generated */ + @Override public void fillActionBars(IActionBars actionBars) { if (!myContribute) @@ -102,6 +104,7 @@ public class AcoreNavigatorActionProvider extends CommonActionProvider /** * @generated */ + @Override public void fillContextMenu(IMenuManager menu) { } @@ -163,6 +166,7 @@ public class AcoreNavigatorActionProvider extends CommonActionProvider /** * @generated */ + @Override public void run() { if (myDiagram == null || myDiagram.eResource() == null) diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorContentProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorContentProvider.java index 4c01a2b951..7abbfae0ca 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorContentProvider.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorContentProvider.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator; @@ -94,6 +94,9 @@ public class AcoreNavigatorContentProvider implements ICommonContentProvider myEditingDomain = (AdapterFactoryEditingDomain)editingDomain; myEditingDomain.setResourceToReadOnlyMap(new HashMap() { + private static final long serialVersionUID = 1L; + + @Override public Object get(Object key) { if (!containsKey(key)) @@ -322,8 +325,8 @@ public class AcoreNavigatorContentProvider implements ICommonContentProvider { LinkedList<AcoreAbstractNavigatorItem> result = new LinkedList<AcoreAbstractNavigatorItem>(); AcoreNavigatorGroup incominglinks = new AcoreNavigatorGroup( - Messages.NavigatorGroupName_AInterface_2001_incominglinks, - "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ + Messages.NavigatorGroupName_AInterface_2001_incominglinks, "icons/incomingLinksNavigatorGroup.gif", //$NON-NLS-1$ + parentElement); Collection<View> connectedViews; connectedViews = getChildrenByType(Collections.singleton(view), AcoreVisualIDRegistry.getType(AInterfaceAAttributeInterfaceCompartmentEditPart.VISUAL_ID)); @@ -372,11 +375,11 @@ public class AcoreNavigatorContentProvider implements ICommonContentProvider { LinkedList<AcoreAbstractNavigatorItem> result = new LinkedList<AcoreAbstractNavigatorItem>(); AcoreNavigatorGroup target = new AcoreNavigatorGroup( - Messages.NavigatorGroupName_AClassImplementedInterfaces_4002_target, - "icons/linkTargetNavigatorGroup.gif", parentElement); //$NON-NLS-1$ + Messages.NavigatorGroupName_AClassImplementedInterfaces_4002_target, "icons/linkTargetNavigatorGroup.gif", //$NON-NLS-1$ + parentElement); AcoreNavigatorGroup source = new AcoreNavigatorGroup( - Messages.NavigatorGroupName_AClassImplementedInterfaces_4002_source, - "icons/linkSourceNavigatorGroup.gif", parentElement); //$NON-NLS-1$ + Messages.NavigatorGroupName_AClassImplementedInterfaces_4002_source, "icons/linkSourceNavigatorGroup.gif", //$NON-NLS-1$ + parentElement); Collection<View> connectedViews; connectedViews = getLinksTargetByType(Collections.singleton(view), AcoreVisualIDRegistry.getType(AInterfaceEditPart.VISUAL_ID)); @@ -398,10 +401,10 @@ public class AcoreNavigatorContentProvider implements ICommonContentProvider case AClassEditPart.VISUAL_ID: { LinkedList<AcoreAbstractNavigatorItem> result = new LinkedList<AcoreAbstractNavigatorItem>(); - AcoreNavigatorGroup incominglinks = new AcoreNavigatorGroup( - Messages.NavigatorGroupName_AClass_2002_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ - AcoreNavigatorGroup outgoinglinks = new AcoreNavigatorGroup( - Messages.NavigatorGroupName_AClass_2002_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ + AcoreNavigatorGroup incominglinks = new AcoreNavigatorGroup(Messages.NavigatorGroupName_AClass_2002_incominglinks, + "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ + AcoreNavigatorGroup outgoinglinks = new AcoreNavigatorGroup(Messages.NavigatorGroupName_AClass_2002_outgoinglinks, + "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$ Collection<View> connectedViews; connectedViews = getChildrenByType(Collections.singleton(view), AcoreVisualIDRegistry.getType(AClassAAttributeCompartmentEditPart.VISUAL_ID)); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorGroup.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorGroup.java index 48f841deb0..b45c471d7c 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorGroup.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorGroup.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator; @@ -96,6 +96,7 @@ public class AcoreNavigatorGroup extends AcoreAbstractNavigatorItem /** * @generated */ + @Override public boolean equals(Object obj) { if (obj instanceof org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator.AcoreNavigatorGroup) @@ -112,6 +113,7 @@ public class AcoreNavigatorGroup extends AcoreAbstractNavigatorItem /** * @generated */ + @Override public int hashCode() { return getGroupName().hashCode(); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorItem.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorItem.java index 0e455b1861..6f02d32859 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorItem.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorItem.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator; @@ -38,7 +38,8 @@ public class AcoreNavigatorItem extends AcoreAbstractNavigatorItem if (adaptableObject instanceof org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator.AcoreNavigatorItem && (adapterType == View.class || adapterType == EObject.class)) { - return ((org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator.AcoreNavigatorItem)adaptableObject).getView(); + return ((org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator.AcoreNavigatorItem)adaptableObject) + .getView(); } return null; } @@ -89,13 +90,13 @@ public class AcoreNavigatorItem extends AcoreAbstractNavigatorItem /** * @generated */ + @Override public boolean equals(Object obj) { if (obj instanceof org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator.AcoreNavigatorItem) { - return EcoreUtil.getURI(getView()).equals( - EcoreUtil.getURI(((org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator.AcoreNavigatorItem)obj) - .getView())); + return EcoreUtil.getURI(getView()).equals(EcoreUtil + .getURI(((org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator.AcoreNavigatorItem)obj).getView())); } return super.equals(obj); } @@ -103,6 +104,7 @@ public class AcoreNavigatorItem extends AcoreAbstractNavigatorItem /** * @generated */ + @Override public int hashCode() { return EcoreUtil.getURI(getView()).hashCode(); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorLabelProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorLabelProvider.java index 19ec0bc695..c39fe2f4be 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorLabelProvider.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorLabelProvider.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator; @@ -58,10 +58,10 @@ public class AcoreNavigatorLabelProvider extends LabelProvider implements ICommo */ static { - AcoreDiagramEditorPlugin.getInstance().getImageRegistry() - .put("Navigator?UnknownElement", ImageDescriptor.getMissingImageDescriptor()); //$NON-NLS-1$ - AcoreDiagramEditorPlugin.getInstance().getImageRegistry() - .put("Navigator?ImageNotFound", ImageDescriptor.getMissingImageDescriptor()); //$NON-NLS-1$ + AcoreDiagramEditorPlugin.getInstance().getImageRegistry().put("Navigator?UnknownElement", //$NON-NLS-1$ + ImageDescriptor.getMissingImageDescriptor()); + AcoreDiagramEditorPlugin.getInstance().getImageRegistry().put("Navigator?ImageNotFound", //$NON-NLS-1$ + ImageDescriptor.getMissingImageDescriptor()); } /** @@ -81,6 +81,7 @@ public class AcoreNavigatorLabelProvider extends LabelProvider implements ICommo /** * @generated */ + @Override public Image getImage(Object element) { if (element instanceof AcoreNavigatorGroup) @@ -110,41 +111,42 @@ public class AcoreNavigatorLabelProvider extends LabelProvider implements ICommo switch (AcoreVisualIDRegistry.getVisualID(view)) { case AAttributeEditPart.VISUAL_ID: - return getImage( - "Navigator?Node?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AAttribute", AcoreElementTypes.AAttribute_3001); //$NON-NLS-1$ + return getImage("Navigator?Node?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AAttribute", //$NON-NLS-1$ + AcoreElementTypes.AAttribute_3001); case AOperation2EditPart.VISUAL_ID: - return getImage( - "Navigator?Node?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AOperation", AcoreElementTypes.AOperation_3004); //$NON-NLS-1$ + return getImage("Navigator?Node?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AOperation", //$NON-NLS-1$ + AcoreElementTypes.AOperation_3004); case AClassSubClassesEditPart.VISUAL_ID: - return getImage( - "Navigator?Link?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AClass?subClasses", AcoreElementTypes.AClassSubClasses_4001); //$NON-NLS-1$ + return getImage("Navigator?Link?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AClass?subClasses", //$NON-NLS-1$ + AcoreElementTypes.AClassSubClasses_4001); case AClassCompositionsEditPart.VISUAL_ID: - return getImage( - "Navigator?Link?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AClass?compositions", AcoreElementTypes.AClassCompositions_4005); //$NON-NLS-1$ + return getImage("Navigator?Link?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AClass?compositions", //$NON-NLS-1$ + AcoreElementTypes.AClassCompositions_4005); case AInterfaceEditPart.VISUAL_ID: - return getImage( - "Navigator?TopLevelNode?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AInterface", AcoreElementTypes.AInterface_2001); //$NON-NLS-1$ + return getImage("Navigator?TopLevelNode?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AInterface", //$NON-NLS-1$ + AcoreElementTypes.AInterface_2001); case AClassAggregationsEditPart.VISUAL_ID: - return getImage( - "Navigator?Link?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AClass?aggregations", AcoreElementTypes.AClassAggregations_4004); //$NON-NLS-1$ + return getImage("Navigator?Link?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AClass?aggregations", //$NON-NLS-1$ + AcoreElementTypes.AClassAggregations_4004); case AClassImplementedInterfacesEditPart.VISUAL_ID: return getImage( - "Navigator?Link?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AClass?implementedInterfaces", AcoreElementTypes.AClassImplementedInterfaces_4002); //$NON-NLS-1$ + "Navigator?Link?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AClass?implementedInterfaces", //$NON-NLS-1$ + AcoreElementTypes.AClassImplementedInterfaces_4002); case AAttribute2EditPart.VISUAL_ID: - return getImage( - "Navigator?Node?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AAttribute", AcoreElementTypes.AAttribute_3003); //$NON-NLS-1$ + return getImage("Navigator?Node?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AAttribute", //$NON-NLS-1$ + AcoreElementTypes.AAttribute_3003); case AClassEditPart.VISUAL_ID: - return getImage( - "Navigator?TopLevelNode?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AClass", AcoreElementTypes.AClass_2002); //$NON-NLS-1$ + return getImage("Navigator?TopLevelNode?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AClass", //$NON-NLS-1$ + AcoreElementTypes.AClass_2002); case ACoreRootEditPart.VISUAL_ID: - return getImage( - "Navigator?Diagram?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?ACoreRoot", AcoreElementTypes.ACoreRoot_1000); //$NON-NLS-1$ + return getImage("Navigator?Diagram?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?ACoreRoot", //$NON-NLS-1$ + AcoreElementTypes.ACoreRoot_1000); case AClassAssociationsEditPart.VISUAL_ID: - return getImage( - "Navigator?Link?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AClass?associations", AcoreElementTypes.AClassAssociations_4003); //$NON-NLS-1$ + return getImage("Navigator?Link?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AClass?associations", //$NON-NLS-1$ + AcoreElementTypes.AClassAssociations_4003); case AOperationEditPart.VISUAL_ID: - return getImage( - "Navigator?Node?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AOperation", AcoreElementTypes.AOperation_3002); //$NON-NLS-1$ + return getImage("Navigator?Node?http://www.eclipse.org/emf/cdo/dawn/examples/2010/ACore?AOperation", //$NON-NLS-1$ + AcoreElementTypes.AOperation_3002); } return getImage("Navigator?UnknownElement", null); //$NON-NLS-1$ } @@ -173,6 +175,7 @@ public class AcoreNavigatorLabelProvider extends LabelProvider implements ICommo /** * @generated */ + @Override public String getText(Object element) { if (element instanceof AcoreNavigatorGroup) @@ -240,7 +243,7 @@ public class AcoreNavigatorLabelProvider extends LabelProvider implements ICommo { IParser parser = AcoreParserProvider.getParser(AcoreElementTypes.AAttribute_3001, view.getElement() != null ? view.getElement() : view, - AcoreVisualIDRegistry.getType(AAttributeEditPart.VISUAL_ID)); + AcoreVisualIDRegistry.getType(AAttributeEditPart.VISUAL_ID)); if (parser != null) { return parser.getPrintString(new EObjectAdapter(view.getElement() != null ? view.getElement() : view), @@ -260,7 +263,7 @@ public class AcoreNavigatorLabelProvider extends LabelProvider implements ICommo { IParser parser = AcoreParserProvider.getParser(AcoreElementTypes.AOperation_3004, view.getElement() != null ? view.getElement() : view, - AcoreVisualIDRegistry.getType(AOperation2EditPart.VISUAL_ID)); + AcoreVisualIDRegistry.getType(AOperation2EditPart.VISUAL_ID)); if (parser != null) { return parser.getPrintString(new EObjectAdapter(view.getElement() != null ? view.getElement() : view), @@ -296,7 +299,7 @@ public class AcoreNavigatorLabelProvider extends LabelProvider implements ICommo { IParser parser = AcoreParserProvider.getParser(AcoreElementTypes.AInterface_2001, view.getElement() != null ? view.getElement() : view, - AcoreVisualIDRegistry.getType(AInterfaceNameEditPart.VISUAL_ID)); + AcoreVisualIDRegistry.getType(AInterfaceNameEditPart.VISUAL_ID)); if (parser != null) { return parser.getPrintString(new EObjectAdapter(view.getElement() != null ? view.getElement() : view), @@ -332,7 +335,7 @@ public class AcoreNavigatorLabelProvider extends LabelProvider implements ICommo { IParser parser = AcoreParserProvider.getParser(AcoreElementTypes.AAttribute_3003, view.getElement() != null ? view.getElement() : view, - AcoreVisualIDRegistry.getType(AAttribute2EditPart.VISUAL_ID)); + AcoreVisualIDRegistry.getType(AAttribute2EditPart.VISUAL_ID)); if (parser != null) { return parser.getPrintString(new EObjectAdapter(view.getElement() != null ? view.getElement() : view), @@ -352,7 +355,7 @@ public class AcoreNavigatorLabelProvider extends LabelProvider implements ICommo { IParser parser = AcoreParserProvider.getParser(AcoreElementTypes.AClass_2002, view.getElement() != null ? view.getElement() : view, - AcoreVisualIDRegistry.getType(AClassNameEditPart.VISUAL_ID)); + AcoreVisualIDRegistry.getType(AClassNameEditPart.VISUAL_ID)); if (parser != null) { return parser.getPrintString(new EObjectAdapter(view.getElement() != null ? view.getElement() : view), @@ -397,7 +400,7 @@ public class AcoreNavigatorLabelProvider extends LabelProvider implements ICommo { IParser parser = AcoreParserProvider.getParser(AcoreElementTypes.AOperation_3002, view.getElement() != null ? view.getElement() : view, - AcoreVisualIDRegistry.getType(AOperationEditPart.VISUAL_ID)); + AcoreVisualIDRegistry.getType(AOperationEditPart.VISUAL_ID)); if (parser != null) { return parser.getPrintString(new EObjectAdapter(view.getElement() != null ? view.getElement() : view), @@ -415,7 +418,7 @@ public class AcoreNavigatorLabelProvider extends LabelProvider implements ICommo */ 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$ } /** @@ -423,7 +426,7 @@ public class AcoreNavigatorLabelProvider extends LabelProvider implements ICommo */ 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$ } /** diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorLinkHelper.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorLinkHelper.java index 5cd1f7fd24..678c62cd95 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorLinkHelper.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorLinkHelper.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator; diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorSorter.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorSorter.java index 9b53f4e12c..3500475485 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorSorter.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/navigator/AcoreNavigatorSorter.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.navigator; @@ -29,6 +29,7 @@ public class AcoreNavigatorSorter extends ViewerSorter /** * @generated */ + @Override public int category(Object element) { if (element instanceof AcoreNavigatorItem) diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/parsers/AbstractParser.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/parsers/AbstractParser.java index 7fa205ec31..2d9c3e3c12 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/parsers/AbstractParser.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/parsers/AbstractParser.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.parsers; @@ -78,7 +78,7 @@ public abstract class AbstractParser implements IParser { throw new IllegalArgumentException(); } - this.editableFeatures = this.features = features; + editableFeatures = this.features = features; } /** @@ -233,7 +233,7 @@ public abstract class AbstractParser implements IParser { return UnexecutableCommand.INSTANCE; } - EObject element = (EObject)adapter.getAdapter(EObject.class); + EObject element = adapter.getAdapter(EObject.class); TransactionalEditingDomain editingDomain = TransactionUtil.getEditingDomain(element); if (editingDomain == null) { @@ -577,6 +577,7 @@ public abstract class AbstractParser implements IParser /** * @generated */ + @Override public String toString() { return description; diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/parsers/MessageFormatParser.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/parsers/MessageFormatParser.java index 872f8a7425..3e1660493e 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/parsers/MessageFormatParser.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/parsers/MessageFormatParser.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.parsers; @@ -100,6 +100,7 @@ public class MessageFormatParser extends AbstractParser /** * @generated */ + @Override public void setViewPattern(String viewPattern) { super.setViewPattern(viewPattern); @@ -109,6 +110,7 @@ public class MessageFormatParser extends AbstractParser /** * @generated */ + @Override public void setEditorPattern(String editorPattern) { super.setEditorPattern(editorPattern); @@ -134,7 +136,8 @@ public class MessageFormatParser extends AbstractParser { if (editorProcessor == null) { - editorProcessor = new MessageFormat(getEditorPattern() == null ? getDefaultEditablePattern() : getEditorPattern()); + editorProcessor = new MessageFormat( + getEditorPattern() == null ? getDefaultEditablePattern() : getEditorPattern()); } return editorProcessor; } @@ -165,6 +168,7 @@ public class MessageFormatParser extends AbstractParser /** * @generated */ + @Override public void setEditPattern(String editPattern) { super.setEditPattern(editPattern); @@ -188,7 +192,7 @@ public class MessageFormatParser extends AbstractParser */ public String getEditString(IAdaptable adapter, int flags) { - EObject element = (EObject)adapter.getAdapter(EObject.class); + EObject element = adapter.getAdapter(EObject.class); return getEditorProcessor().format(getEditableValues(element), new StringBuffer(), new FieldPosition(0)).toString(); } @@ -201,8 +205,8 @@ public class MessageFormatParser extends AbstractParser Object[] values = getEditProcessor().parse(editString, pos); if (values == null) { - return new ParserEditStatus(AcoreDiagramEditorPlugin.ID, IParserEditStatus.UNEDITABLE, NLS.bind( - Messages.MessageFormatParser_InvalidInputError, new Integer(pos.getErrorIndex()))); + return new ParserEditStatus(AcoreDiagramEditorPlugin.ID, IParserEditStatus.UNEDITABLE, + NLS.bind(Messages.MessageFormatParser_InvalidInputError, new Integer(pos.getErrorIndex()))); } return validateNewValues(values); } @@ -221,7 +225,7 @@ public class MessageFormatParser extends AbstractParser */ 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(); } diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreCreationWizard.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreCreationWizard.java index fd4bdb99eb..ee3da401b0 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreCreationWizard.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreCreationWizard.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part; @@ -110,13 +110,15 @@ public class AcoreCreationWizard extends Wizard implements INewWizard this.workbench = workbench; this.selection = selection; setWindowTitle(Messages.AcoreCreationWizardTitle); - setDefaultPageImageDescriptor(AcoreDiagramEditorPlugin.getBundledImageDescriptor("icons/wizban/NewAcoreWizard.gif")); //$NON-NLS-1$ + setDefaultPageImageDescriptor( + AcoreDiagramEditorPlugin.getBundledImageDescriptor("icons/wizban/NewAcoreWizard.gif")); //$NON-NLS-1$ setNeedsProgressMonitor(true); } /** * @generated */ + @Override public void addPages() { diagramModelFilePage = new AcoreCreationWizardPage("DiagramModelFile", getSelection(), "acore_diagram"); //$NON-NLS-1$ //$NON-NLS-2$ @@ -124,8 +126,10 @@ public class AcoreCreationWizard extends Wizard implements INewWizard diagramModelFilePage.setDescription(Messages.AcoreCreationWizard_DiagramModelFilePageDescription); addPage(diagramModelFilePage); - domainModelFilePage = new AcoreCreationWizardPage("DomainModelFile", getSelection(), "acore") { //$NON-NLS-1$ //$NON-NLS-2$ + domainModelFilePage = new AcoreCreationWizardPage("DomainModelFile", getSelection(), "acore") //$NON-NLS-1$ //$NON-NLS-2$ + { + @Override public void setVisible(boolean visible) { if (visible) @@ -145,11 +149,13 @@ public class AcoreCreationWizard extends Wizard implements INewWizard /** * @generated */ + @Override public boolean performFinish() { IRunnableWithProgress op = new WorkspaceModifyOperation(null) { + @Override protected void execute(IProgressMonitor monitor) throws CoreException, InterruptedException { diagram = AcoreDiagramEditorUtil.createDiagram(diagramModelFilePage.getURI(), domainModelFilePage.getURI(), diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreCreationWizardPage.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreCreationWizardPage.java index 9d7f4f315d..8a2e758b75 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreCreationWizardPage.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreCreationWizardPage.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part; @@ -42,7 +42,7 @@ public class AcoreCreationWizardPage extends WizardNewFileCreationPage /** * Override to create files with this extension. - * + * * @generated */ protected String getExtension() @@ -79,6 +79,7 @@ public class AcoreCreationWizardPage extends WizardNewFileCreationPage /** * @generated */ + @Override public void createControl(Composite parent) { super.createControl(parent); @@ -89,6 +90,7 @@ public class AcoreCreationWizardPage extends WizardNewFileCreationPage /** * @generated */ + @Override protected boolean validatePage() { if (!super.validatePage()) diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramActionBarContributor.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramActionBarContributor.java index 795214723d..5c39ab66f9 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramActionBarContributor.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramActionBarContributor.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part; @@ -26,6 +26,7 @@ public class AcoreDiagramActionBarContributor extends DiagramActionBarContributo /** * @generated */ + @Override protected Class getEditorClass() { return AcoreDiagramEditor.class; @@ -34,6 +35,7 @@ public class AcoreDiagramActionBarContributor extends DiagramActionBarContributo /** * @generated */ + @Override protected String getEditorId() { return AcoreDiagramEditor.ID; @@ -42,6 +44,7 @@ public class AcoreDiagramActionBarContributor extends DiagramActionBarContributo /** * @generated */ + @Override public void init(IActionBars bars, IWorkbenchPage page) { super.init(bars, page); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramEditor.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramEditor.java index 5dd90391b2..aecdd3056f 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramEditor.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramEditor.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part; @@ -82,6 +82,7 @@ public class AcoreDiagramEditor extends DiagramDocumentEditor implements IGotoMa /** * @generated */ + @Override protected String getContextID() { return CONTEXT_ID; @@ -90,6 +91,7 @@ public class AcoreDiagramEditor extends DiagramDocumentEditor implements IGotoMa /** * @generated */ + @Override protected PaletteRoot createPaletteRoot(PaletteRoot existingPaletteRoot) { PaletteRoot root = super.createPaletteRoot(existingPaletteRoot); @@ -100,6 +102,7 @@ public class AcoreDiagramEditor extends DiagramDocumentEditor implements IGotoMa /** * @generated */ + @Override protected PreferencesHint getPreferencesHint() { return AcoreDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT; @@ -108,6 +111,7 @@ public class AcoreDiagramEditor extends DiagramDocumentEditor implements IGotoMa /** * @generated */ + @Override public String getContributorId() { return AcoreDiagramEditorPlugin.ID; @@ -116,6 +120,7 @@ public class AcoreDiagramEditor extends DiagramDocumentEditor implements IGotoMa /** * @generated */ + @Override public Object getAdapter(Class type) { if (type == IShowInTargetList.class) @@ -134,6 +139,7 @@ public class AcoreDiagramEditor extends DiagramDocumentEditor implements IGotoMa /** * @generated */ + @Override protected IDocumentProvider getDocumentProvider(IEditorInput input) { if (input instanceof IFileEditorInput || input instanceof URIEditorInput) @@ -146,6 +152,7 @@ public class AcoreDiagramEditor extends DiagramDocumentEditor implements IGotoMa /** * @generated */ + @Override public TransactionalEditingDomain getEditingDomain() { IDocument document = getEditorInput() != null ? getDocumentProvider().getDocument(getEditorInput()) : null; @@ -159,6 +166,7 @@ public class AcoreDiagramEditor extends DiagramDocumentEditor implements IGotoMa /** * @generated */ + @Override protected void setDocumentProvider(IEditorInput input) { if (input instanceof IFileEditorInput || input instanceof URIEditorInput) @@ -182,6 +190,7 @@ public class AcoreDiagramEditor extends DiagramDocumentEditor implements IGotoMa /** * @generated */ + @Override public boolean isSaveAsAllowed() { return true; @@ -190,6 +199,7 @@ public class AcoreDiagramEditor extends DiagramDocumentEditor implements IGotoMa /** * @generated */ + @Override public void doSaveAs() { performSaveAs(new NullProgressMonitor()); @@ -198,6 +208,7 @@ public class AcoreDiagramEditor extends DiagramDocumentEditor implements IGotoMa /** * @generated */ + @Override protected void performSaveAs(IProgressMonitor progressMonitor) { Shell shell = getSite().getShell(); @@ -288,6 +299,7 @@ public class AcoreDiagramEditor extends DiagramDocumentEditor implements IGotoMa /** * @generated */ + @Override public ShowInContext getShowInContext() { return new ShowInContext(getEditorInput(), getNavigatorSelection()); @@ -316,6 +328,7 @@ public class AcoreDiagramEditor extends DiagramDocumentEditor implements IGotoMa /** * @generated */ + @Override protected void configureGraphicalViewer() { super.configureGraphicalViewer(); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramEditorPlugin.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramEditorPlugin.java index 3d378f4941..cf16b4c2ea 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramEditorPlugin.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramEditorPlugin.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part; @@ -76,6 +76,7 @@ public class AcoreDiagramEditorPlugin extends AbstractUIPlugin /** * @generated */ + @Override public void start(BundleContext context) throws Exception { super.start(context); @@ -87,6 +88,7 @@ public class AcoreDiagramEditorPlugin extends AbstractUIPlugin /** * @generated */ + @Override public void stop(BundleContext context) throws Exception { adapterFactory.dispose(); @@ -146,7 +148,7 @@ public class AcoreDiagramEditorPlugin extends AbstractUIPlugin /** * Returns an image descriptor for the image file at the given plug-in relative path. - * + * * @generated * @param path * the path @@ -160,7 +162,7 @@ public class AcoreDiagramEditorPlugin 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 @@ -171,8 +173,8 @@ public class AcoreDiagramEditorPlugin extends AbstractUIPlugin 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 { @@ -183,7 +185,7 @@ public class AcoreDiagramEditorPlugin extends AbstractUIPlugin /** * Returns an image for the image file at the given plug-in relative path. Client do not need to dispose this image. * Images will be disposed automatically. - * + * * @generated * @param path * the path @@ -202,7 +204,7 @@ public class AcoreDiagramEditorPlugin extends AbstractUIPlugin /** * Returns string from plug-in's resource bundle - * + * * @generated */ public static String getString(String key) diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramEditorUtil.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramEditorUtil.java index a13f9d4812..06d3ac45c2 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramEditorUtil.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramEditorUtil.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part; @@ -151,7 +151,7 @@ public class AcoreDiagramEditorUtil /** * Runs the wizard in a dialog. - * + * * @generated */ public static void runWizard(Shell shell, Wizard wizard, String settingsKey) @@ -171,7 +171,7 @@ public class AcoreDiagramEditorUtil /** * 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) @@ -184,6 +184,7 @@ public class AcoreDiagramEditorUtil AbstractTransactionalCommand command = new AbstractTransactionalCommand(editingDomain, Messages.AcoreDiagramEditorUtil_CreateDiagramCommandLabel, Collections.EMPTY_LIST) { + @Override protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { ACoreRoot model = createInitialModel(); @@ -200,10 +201,10 @@ public class AcoreDiagramEditorUtil try { - modelResource.save(org.eclipse.emf.cdo.dawn.examples.acore.diagram.part.AcoreDiagramEditorUtil - .getSaveOptions()); - diagramResource.save(org.eclipse.emf.cdo.dawn.examples.acore.diagram.part.AcoreDiagramEditorUtil - .getSaveOptions()); + modelResource + .save(org.eclipse.emf.cdo.dawn.examples.acore.diagram.part.AcoreDiagramEditorUtil.getSaveOptions()); + diagramResource + .save(org.eclipse.emf.cdo.dawn.examples.acore.diagram.part.AcoreDiagramEditorUtil.getSaveOptions()); } catch (IOException e) { @@ -228,7 +229,7 @@ public class AcoreDiagramEditorUtil /** * Create a new instance of domain element associated with canvas. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ private static ACoreRoot createInitialModel() @@ -238,7 +239,7 @@ public class AcoreDiagramEditorUtil /** * Store model element in the resource. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ private static void attachModelToResource(ACoreRoot model, Resource resource) @@ -249,7 +250,7 @@ public class AcoreDiagramEditorUtil /** * @generated */ - public static void selectElementsInDiagram(IDiagramWorkbenchPart diagramPart, List/* EditPart */editParts) + public static void selectElementsInDiagram(IDiagramWorkbenchPart diagramPart, List/* EditPart */ editParts) { diagramPart.getDiagramGraphicalViewer().deselectAll(); @@ -346,7 +347,7 @@ public class AcoreDiagramEditorUtil view = editPart.getModel() instanceof View ? (View)editPart.getModel() : null; } - return (view == null) ? diagramEditPart.getDiagramView() : view; + return view == null ? diagramEditPart.getDiagramView() : view; } /** @@ -380,7 +381,7 @@ public class AcoreDiagramEditorUtil public LazyElement2ViewMap(View scope, Set elements) { this.scope = scope; - this.elementSet = elements; + elementSet = elements; } /** @@ -416,33 +417,43 @@ public class AcoreDiagramEditorUtil static Map buildElement2ViewMap(View parentView, Map element2ViewMap, Set elements) { if (elements.size() == element2ViewMap.size()) + { return element2ViewMap; + } if (parentView.isSetElement() && !element2ViewMap.containsKey(parentView.getElement()) && elements.contains(parentView.getElement())) { element2ViewMap.put(parentView.getElement(), parentView); if (elements.size() == element2ViewMap.size()) + { return element2ViewMap; + } } for (Iterator it = parentView.getChildren().iterator(); it.hasNext();) { buildElement2ViewMap((View)it.next(), element2ViewMap, elements); if (elements.size() == element2ViewMap.size()) + { return element2ViewMap; + } } for (Iterator it = parentView.getSourceEdges().iterator(); it.hasNext();) { buildElement2ViewMap((View)it.next(), element2ViewMap, elements); if (elements.size() == element2ViewMap.size()) + { return element2ViewMap; + } } for (Iterator it = parentView.getSourceEdges().iterator(); it.hasNext();) { buildElement2ViewMap((View)it.next(), element2ViewMap, elements); if (elements.size() == element2ViewMap.size()) + { return element2ViewMap; + } } return element2ViewMap; } diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramUpdateCommand.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramUpdateCommand.java index e7b8493bf5..cea551110e 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramUpdateCommand.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramUpdateCommand.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part; diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramUpdater.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramUpdater.java index 3b80513c74..3ae3f67d76 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramUpdater.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDiagramUpdater.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part; @@ -475,8 +475,8 @@ public class AcoreDiagramUpdater /** * @generated */ - private static Collection<AcoreLinkDescriptor> getIncomingFeatureModelFacetLinks_AClass_SubClasses_4001( - AClass target, Map crossReferences) + private static Collection<AcoreLinkDescriptor> getIncomingFeatureModelFacetLinks_AClass_SubClasses_4001(AClass target, + Map crossReferences) { LinkedList<AcoreLinkDescriptor> result = new LinkedList<AcoreLinkDescriptor>(); Collection settings = (Collection)crossReferences.get(target); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDocumentProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDocumentProvider.java index a17f48fce0..648134da84 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDocumentProvider.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreDocumentProvider.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part; @@ -75,14 +75,16 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I /** * @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, AcoreDiagramEditorPlugin.ID, 0, NLS.bind( - Messages.AcoreDocumentProvider_IncorrectInputError, new Object[] { element, - "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$ - null)); + throw new CoreException(new Status(IStatus.ERROR, AcoreDiagramEditorPlugin.ID, 0, + NLS.bind(Messages.AcoreDocumentProvider_IncorrectInputError, + new Object[] { element, "org.eclipse.ui.part.FileEditorInput", //$NON-NLS-1$ + "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ + null)); } IEditorInput editorInput = (IEditorInput)element; IDiagramDocument document = (IDiagramDocument)createDocument(editorInput); @@ -96,14 +98,16 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I /** * @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, AcoreDiagramEditorPlugin.ID, 0, NLS.bind( - Messages.AcoreDocumentProvider_IncorrectInputError, new Object[] { element, - "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$ - null)); + throw new CoreException(new Status(IStatus.ERROR, AcoreDiagramEditorPlugin.ID, 0, + NLS.bind(Messages.AcoreDocumentProvider_IncorrectInputError, + new Object[] { element, "org.eclipse.ui.part.FileEditorInput", //$NON-NLS-1$ + "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ + null)); } IDocument document = createEmptyDocument(); setDocumentContent(document, (IEditorInput)element); @@ -114,7 +118,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I /** * 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 @@ -154,6 +158,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I /** * @generated */ + @Override protected IDocument createEmptyDocument() { DiagramDocument document = new DiagramDocument(); @@ -253,7 +258,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I EObject rootElement = resource.getEObject(uri.fragment()); if (rootElement instanceof Diagram) { - document.setContent((Diagram)rootElement); + document.setContent(rootElement); return; } } @@ -264,7 +269,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I Object rootElement = it.next(); if (rootElement instanceof Diagram) { - document.setContent((Diagram)rootElement); + document.setContent(rootElement); return; } } @@ -281,24 +286,26 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I else { String msg = e.getLocalizedMessage(); - thrownExcp = new CoreException(new Status(IStatus.ERROR, AcoreDiagramEditorPlugin.ID, 0, msg != null ? msg - : Messages.AcoreDocumentProvider_DiagramLoadingError, e)); + thrownExcp = new CoreException(new Status(IStatus.ERROR, AcoreDiagramEditorPlugin.ID, 0, + msg != null ? msg : Messages.AcoreDocumentProvider_DiagramLoadingError, e)); } throw thrownExcp; } } else { - throw new CoreException(new Status(IStatus.ERROR, AcoreDiagramEditorPlugin.ID, 0, NLS.bind( - Messages.AcoreDocumentProvider_IncorrectInputError, new Object[] { element, - "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$ - null)); + throw new CoreException(new Status(IStatus.ERROR, AcoreDiagramEditorPlugin.ID, 0, + NLS.bind(Messages.AcoreDocumentProvider_IncorrectInputError, + new Object[] { element, "org.eclipse.ui.part.FileEditorInput", //$NON-NLS-1$ + "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ + null)); } } /** * @generated */ + @Override public long getModificationStamp(Object element) { ResourceSetInfo info = getResourceSetInfo(element); @@ -312,6 +319,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I /** * @generated */ + @Override public boolean isDeleted(Object element) { IDiagramDocument document = getDiagramDocument(element); @@ -338,6 +346,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I /** * @generated */ + @Override protected void disposeElementInfo(Object element, ElementInfo info) { if (info instanceof ResourceSetInfo) @@ -351,6 +360,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I /** * @generated */ + @Override protected void doValidateState(Object element, Object computationContext) throws CoreException { ResourceSetInfo info = getResourceSetInfo(element); @@ -366,7 +376,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I files2Validate.add(file); } } - ResourcesPlugin.getWorkspace().validateEdit((IFile[])files2Validate.toArray(new IFile[files2Validate.size()]), + ResourcesPlugin.getWorkspace().validateEdit(files2Validate.toArray(new IFile[files2Validate.size()]), computationContext); } @@ -376,6 +386,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I /** * @generated */ + @Override public boolean isReadOnly(Object element) { ResourceSetInfo info = getResourceSetInfo(element); @@ -402,6 +413,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I /** * @generated */ + @Override public boolean isModifiable(Object element) { if (!isStateValidated(element)) @@ -460,6 +472,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I /** * @generated */ + @Override protected void doUpdateStateCache(Object element) throws CoreException { ResourceSetInfo info = getResourceSetInfo(element); @@ -473,6 +486,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I /** * @generated */ + @Override public boolean isSynchronized(Object element) { ResourceSetInfo info = getResourceSetInfo(element); @@ -486,6 +500,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I /** * @generated */ + @Override protected ISchedulingRule getResetRule(Object element) { ResourceSetInfo info = getResourceSetInfo(element); @@ -501,7 +516,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I rules.add(ResourcesPlugin.getWorkspace().getRuleFactory().modifyRule(file)); } } - return new MultiRule((ISchedulingRule[])rules.toArray(new ISchedulingRule[rules.size()])); + return new MultiRule(rules.toArray(new ISchedulingRule[rules.size()])); } return null; } @@ -509,6 +524,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I /** * @generated */ + @Override protected ISchedulingRule getSaveRule(Object element) { ResourceSetInfo info = getResourceSetInfo(element); @@ -524,7 +540,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I rules.add(computeSchedulingRule(file)); } } - return new MultiRule((ISchedulingRule[])rules.toArray(new ISchedulingRule[rules.size()])); + return new MultiRule(rules.toArray(new ISchedulingRule[rules.size()])); } return null; } @@ -532,6 +548,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I /** * @generated */ + @Override protected ISchedulingRule getSynchronizeRule(Object element) { ResourceSetInfo info = getResourceSetInfo(element); @@ -547,7 +564,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I rules.add(ResourcesPlugin.getWorkspace().getRuleFactory().refreshRule(file)); } } - return new MultiRule((ISchedulingRule[])rules.toArray(new ISchedulingRule[rules.size()])); + return new MultiRule(rules.toArray(new ISchedulingRule[rules.size()])); } return null; } @@ -555,6 +572,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I /** * @generated */ + @Override protected ISchedulingRule getValidateStateRule(Object element) { ResourceSetInfo info = getResourceSetInfo(element); @@ -570,8 +588,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I files.add(file); } } - return ResourcesPlugin.getWorkspace().getRuleFactory() - .validateEditRule((IFile[])files.toArray(new IFile[files.size()])); + return ResourcesPlugin.getWorkspace().getRuleFactory().validateEditRule(files.toArray(new IFile[files.size()])); } return null; } @@ -582,7 +599,9 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I private ISchedulingRule computeSchedulingRule(IResource toCreateOrModify) { if (toCreateOrModify.exists()) + { return ResourcesPlugin.getWorkspace().getRuleFactory().modifyRule(toCreateOrModify); + } IResource parent = toCreateOrModify; do @@ -601,6 +620,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I /** * @generated */ + @Override protected void doSynchronize(Object element, IProgressMonitor monitor) throws CoreException { ResourceSetInfo info = getResourceSetInfo(element); @@ -619,6 +639,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I /** * @generated */ + @Override protected void doSaveDocument(IProgressMonitor monitor, Object element, IDocument document, boolean overwrite) throws CoreException { @@ -685,29 +706,30 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I else { fireElementStateChangeFailed(element); - throw new CoreException(new Status(IStatus.ERROR, AcoreDiagramEditorPlugin.ID, 0, NLS.bind( - Messages.AcoreDocumentProvider_IncorrectInputError, new Object[] { element, - "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$ - null)); + throw new CoreException(new Status(IStatus.ERROR, AcoreDiagramEditorPlugin.ID, 0, + NLS.bind(Messages.AcoreDocumentProvider_IncorrectInputError, + new Object[] { element, "org.eclipse.ui.part.FileEditorInput", //$NON-NLS-1$ + "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ + null)); } if (false == document instanceof IDiagramDocument) { fireElementStateChangeFailed(element); throw new CoreException( - new Status( - IStatus.ERROR, - AcoreDiagramEditorPlugin.ID, - 0, - "Incorrect document used: " + document + " instead of org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument", null)); //$NON-NLS-1$ //$NON-NLS-2$ + new Status(IStatus.ERROR, AcoreDiagramEditorPlugin.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)); } IDiagramDocument diagramDocument = (IDiagramDocument)document; final Resource newResource = diagramDocument.getEditingDomain().getResourceSet().createResource(newResoruceURI); - final Diagram diagramCopy = (Diagram)EcoreUtil.copy(diagramDocument.getDiagram()); + final Diagram diagramCopy = EcoreUtil.copy(diagramDocument.getDiagram()); try { - new AbstractTransactionalCommand(diagramDocument.getEditingDomain(), NLS.bind( - Messages.AcoreDocumentProvider_SaveAsOperation, diagramCopy.getName()), affectedFiles) + new AbstractTransactionalCommand(diagramDocument.getEditingDomain(), + NLS.bind(Messages.AcoreDocumentProvider_SaveAsOperation, diagramCopy.getName()), affectedFiles) { + @Override protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { @@ -813,6 +835,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I /** * @generated */ + @Override protected IRunnableContext getOperationRunner(IProgressMonitor monitor) { return null; @@ -1056,7 +1079,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I { if (ResourceSetInfo.this.fCanBeSaved) { - ResourceSetInfo.this.setUnSynchronized(resource); + setUnSynchronized(resource); return true; } } @@ -1079,7 +1102,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I { if (ResourceSetInfo.this.fCanBeSaved) { - ResourceSetInfo.this.setUnSynchronized(resource); + setUnSynchronized(resource); return true; } } @@ -1087,7 +1110,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I { public void run() { - fireElementDeleted(ResourceSetInfo.this.getEditorInput()); + fireElementDeleted(getEditorInput()); } }); return true; @@ -1102,7 +1125,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I { if (ResourceSetInfo.this.fCanBeSaved) { - ResourceSetInfo.this.setUnSynchronized(resource); + setUnSynchronized(resource); return true; } } @@ -1112,7 +1135,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I { public void run() { - handleElementMoved(ResourceSetInfo.this.getEditorInput(), newURI); + handleElementMoved(getEditorInput(), newURI); } }); } @@ -1157,6 +1180,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I /** * @generated */ + @Override public void notifyChanged(Notification notification) { if (notification.getNotifier() instanceof ResourceSet) @@ -1171,7 +1195,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I if (resource.isLoaded()) { boolean modified = false; - for (Iterator/* <org.eclipse.emf.ecore.resource.Resource> */it = myInfo.getLoadedResourcesIterator(); it + for (Iterator /* <org.eclipse.emf.ecore.resource.Resource> */it = myInfo.getLoadedResourcesIterator(); it .hasNext() && !modified;) { Resource nextResource = (Resource)it.next(); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreInitDiagramFileAction.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreInitDiagramFileAction.java index 6a4d53978f..d825f60381 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreInitDiagramFileAction.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreInitDiagramFileAction.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part; @@ -91,7 +91,7 @@ public class AcoreInitDiagramFileAction implements IObjectActionDelegate try { Resource resource = resourceSet.getResource(domainModelURI, true); - diagramRoot = (EObject)resource.getContents().get(0); + diagramRoot = resource.getContents().get(0); } catch (WrappedException ex) { diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreLinkDescriptor.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreLinkDescriptor.java index 97c63af576..257860a120 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreLinkDescriptor.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreLinkDescriptor.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part; @@ -78,6 +78,7 @@ public class AcoreLinkDescriptor extends AcoreNodeDescriptor final IElementType elementTypeCopy = elementType; mySemanticAdapter = new EObjectAdapter(linkElement) { + @Override public Object getAdapter(Class adapter) { if (IElementType.class.equals(adapter)) diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreMatchingStrategy.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreMatchingStrategy.java index 79a0a20c73..4dbfa645d6 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreMatchingStrategy.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreMatchingStrategy.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part; diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreNewDiagramFileWizard.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreNewDiagramFileWizard.java index 9d880d6885..50d8d7c564 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreNewDiagramFileWizard.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreNewDiagramFileWizard.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part; @@ -76,8 +76,8 @@ public class AcoreNewDiagramFileWizard extends Wizard myFileCreationPage = new WizardNewFileCreationPage(Messages.AcoreNewDiagramFileWizard_CreationPageName, StructuredSelection.EMPTY); myFileCreationPage.setTitle(Messages.AcoreNewDiagramFileWizard_CreationPageTitle); - myFileCreationPage.setDescription(NLS.bind(Messages.AcoreNewDiagramFileWizard_CreationPageDescription, - ACoreRootEditPart.MODEL_ID)); + myFileCreationPage.setDescription( + NLS.bind(Messages.AcoreNewDiagramFileWizard_CreationPageDescription, ACoreRootEditPart.MODEL_ID)); IPath filePath; String fileName = URI.decode(domainModelURI.trimFileExtension().lastSegment()); if (domainModelURI.isPlatformResource()) @@ -108,6 +108,7 @@ public class AcoreNewDiagramFileWizard extends Wizard /** * @generated */ + @Override public void addPages() { addPage(myFileCreationPage); @@ -117,6 +118,7 @@ public class AcoreNewDiagramFileWizard extends Wizard /** * @generated */ + @Override public boolean performFinish() { List affectedFiles = new LinkedList(); @@ -130,6 +132,7 @@ public class AcoreNewDiagramFileWizard extends Wizard Messages.AcoreNewDiagramFileWizard_InitDiagramCommand, affectedFiles) { + @Override protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { int diagramVID = AcoreVisualIDRegistry.getDiagramVisualID(diagramRootElementSelectionPage.getModelElement()); @@ -181,6 +184,7 @@ public class AcoreNewDiagramFileWizard extends Wizard /** * @generated */ + @Override protected String getSelectionTitle() { return Messages.AcoreNewDiagramFileWizard_RootSelectionPageSelectionTitle; @@ -189,6 +193,7 @@ public class AcoreNewDiagramFileWizard extends Wizard /** * @generated */ + @Override protected boolean validatePage() { if (selectedModelElement == null) @@ -196,8 +201,8 @@ public class AcoreNewDiagramFileWizard extends Wizard setErrorMessage(Messages.AcoreNewDiagramFileWizard_RootSelectionPageNoSelectionMessage); return false; } - boolean result = ViewService.getInstance().provides( - new CreateDiagramViewOperation(new EObjectAdapter(selectedModelElement), ACoreRootEditPart.MODEL_ID, + boolean result = ViewService.getInstance() + .provides(new CreateDiagramViewOperation(new EObjectAdapter(selectedModelElement), ACoreRootEditPart.MODEL_ID, AcoreDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT)); setErrorMessage(result ? null : Messages.AcoreNewDiagramFileWizard_RootSelectionPageInvalidSelectionMessage); return result; diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreNodeDescriptor.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreNodeDescriptor.java index eb8ef719a5..1911b6f6bd 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreNodeDescriptor.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreNodeDescriptor.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part; diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcorePaletteFactory.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcorePaletteFactory.java index b7ef0ba495..0704d1dd14 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcorePaletteFactory.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcorePaletteFactory.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part; @@ -43,7 +43,7 @@ public class AcorePaletteFactory /** * Creates "Node" palette tool group - * + * * @generated */ private PaletteContainer createNode1Group() @@ -59,7 +59,7 @@ public class AcorePaletteFactory /** * Creates "Connections" palette tool group - * + * * @generated */ private PaletteContainer createConnections2Group() @@ -231,6 +231,7 @@ public class AcorePaletteFactory /** * @generated */ + @Override public Tool createTool() { Tool tool = new UnspecifiedTypeCreationTool(elementTypes); @@ -262,6 +263,7 @@ public class AcorePaletteFactory /** * @generated */ + @Override public Tool createTool() { Tool tool = new UnspecifiedTypeConnectionTool(relationshipTypes); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreUriEditorInputTester.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreUriEditorInputTester.java index 9282b85566..7a04e15f9a 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreUriEditorInputTester.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreUriEditorInputTester.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part; diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreVisualIDRegistry.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreVisualIDRegistry.java index eb29c78d77..43408a832e 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreVisualIDRegistry.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/AcoreVisualIDRegistry.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part; @@ -37,7 +37,7 @@ import org.eclipse.gmf.runtime.notation.View; /** * 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 AcoreVisualIDRegistry @@ -78,7 +78,7 @@ public class AcoreVisualIDRegistry EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$ if (annotation != null) { - return (String)annotation.getDetails().get("modelID"); //$NON-NLS-1$ + return annotation.getDetails().get("modelID"); //$NON-NLS-1$ } view = (View)view.eContainer(); } @@ -311,7 +311,7 @@ public class AcoreVisualIDRegistry /** * User can change implementation of this method to handle some specific situations not covered by default logic. - * + * * @generated */ private static boolean isDiagram(ACoreRoot element) diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DeleteElementAction.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DeleteElementAction.java index ff9775eeb7..a46008cc69 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DeleteElementAction.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DeleteElementAction.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part; @@ -54,6 +54,7 @@ public class DeleteElementAction extends AbstractDeleteFromAction /** * @generated */ + @Override public void init() { super.init(); @@ -69,6 +70,7 @@ public class DeleteElementAction extends AbstractDeleteFromAction /** * @generated */ + @Override protected String getCommandLabel() { return DiagramUIMessages.DiagramEditor_Delete_from_Model; @@ -77,6 +79,7 @@ public class DeleteElementAction extends AbstractDeleteFromAction /** * @generated */ + @Override protected Command getCommand(Request request) { List operationSet = getOperationSet(); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DiagramEditorContextMenuProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DiagramEditorContextMenuProvider.java index 255a3100f4..334c9e21dd 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DiagramEditorContextMenuProvider.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/DiagramEditorContextMenuProvider.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part; @@ -51,6 +51,7 @@ public class DiagramEditorContextMenuProvider extends DiagramContextMenuProvider /** * @generated */ + @Override public void dispose() { if (deleteAction != null) @@ -64,6 +65,7 @@ public class DiagramEditorContextMenuProvider extends DiagramContextMenuProvider /** * @generated */ + @Override public void buildContextMenu(final IMenuManager menu) { getViewer().flush(); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/LoadResourceAction.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/LoadResourceAction.java index 13f3646328..795bcbf766 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/LoadResourceAction.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/LoadResourceAction.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part; diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/Messages.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/Messages.java index fad8630a25..17bebd7dec 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/Messages.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/Messages.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part; diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/ModelElementSelectionPage.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/ModelElementSelectionPage.java index 80086c301c..8299c9a80f 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/ModelElementSelectionPage.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/part/ModelElementSelectionPage.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.part; @@ -31,7 +31,7 @@ import org.eclipse.swt.widgets.Label; /** * Wizard page that allows to select element from model. - * + * * @generated */ public class ModelElementSelectionPage extends WizardPage @@ -106,10 +106,10 @@ public class ModelElementSelectionPage extends WizardPage layoutData.heightHint = 300; layoutData.widthHint = 300; modelViewer.getTree().setLayoutData(layoutData); - modelViewer.setContentProvider(new AdapterFactoryContentProvider(AcoreDiagramEditorPlugin.getInstance() - .getItemProvidersAdapterFactory())); - modelViewer.setLabelProvider(new AdapterFactoryLabelProvider(AcoreDiagramEditorPlugin.getInstance() - .getItemProvidersAdapterFactory())); + modelViewer.setContentProvider( + new AdapterFactoryContentProvider(AcoreDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory())); + modelViewer.setLabelProvider( + new AdapterFactoryLabelProvider(AcoreDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory())); if (selectedModelElement != null) { modelViewer.setInput(selectedModelElement.eResource()); @@ -128,7 +128,7 @@ public class ModelElementSelectionPage extends WizardPage /** * Override to provide custom model element description. - * + * * @generated */ protected String getSelectionTitle() @@ -163,7 +163,7 @@ public class ModelElementSelectionPage extends WizardPage /** * Override to provide specific validation of the selected model element. - * + * * @generated */ protected boolean validatePage() diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramAppearancePreferencePage.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramAppearancePreferencePage.java index f93dfa0fc0..fff01e9259 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramAppearancePreferencePage.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramAppearancePreferencePage.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.preferences; diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramConnectionsPreferencePage.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramConnectionsPreferencePage.java index f082cf459d..95406a7985 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramConnectionsPreferencePage.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramConnectionsPreferencePage.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.preferences; diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramGeneralPreferencePage.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramGeneralPreferencePage.java index a6c24d35f3..0505f22022 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramGeneralPreferencePage.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramGeneralPreferencePage.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.preferences; diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramPreferenceInitializer.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramPreferenceInitializer.java index 177cf75cdd..d23a2b2ebf 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramPreferenceInitializer.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramPreferenceInitializer.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.preferences; @@ -25,6 +25,7 @@ public class DiagramPreferenceInitializer extends AbstractPreferenceInitializer /** * @generated */ + @Override public void initializeDefaultPreferences() { IPreferenceStore store = getPreferenceStore(); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramPrintingPreferencePage.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramPrintingPreferencePage.java index 6fe58d5649..84250dcb65 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramPrintingPreferencePage.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramPrintingPreferencePage.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.preferences; diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramRulersAndGridPreferencePage.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramRulersAndGridPreferencePage.java index c112dc3d04..c22f5028ac 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramRulersAndGridPreferencePage.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/preferences/DiagramRulersAndGridPreferencePage.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.preferences; diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreEditPartProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreEditPartProvider.java index e25008b0d1..6c1e34f6ff 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreEditPartProvider.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreEditPartProvider.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.providers; @@ -126,6 +126,7 @@ public class AcoreEditPartProvider extends AbstractEditPartProvider /** * @generated */ + @Override public synchronized IGraphicalEditPart createGraphicEditPart(View view) { if (isAllowCaching()) @@ -144,6 +145,7 @@ public class AcoreEditPartProvider extends AbstractEditPartProvider /** * @generated */ + @Override public synchronized boolean provides(IOperation operation) { if (operation instanceof CreateGraphicEditPartOperation) diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreElementTypes.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreElementTypes.java index f1252b43aa..82b57d1a3c 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreElementTypes.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreElementTypes.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.providers; @@ -74,62 +74,74 @@ public class AcoreElementTypes extends ElementInitializers /** * @generated */ - public static final IElementType ACoreRoot_1000 = getElementType("org.eclipse.emf.cdo.dawn.examples.acore.diagram.ACoreRoot_1000"); //$NON-NLS-1$ + public static final IElementType ACoreRoot_1000 = getElementType( + "org.eclipse.emf.cdo.dawn.examples.acore.diagram.ACoreRoot_1000"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType AInterface_2001 = getElementType("org.eclipse.emf.cdo.dawn.examples.acore.diagram.AInterface_2001"); //$NON-NLS-1$ + public static final IElementType AInterface_2001 = getElementType( + "org.eclipse.emf.cdo.dawn.examples.acore.diagram.AInterface_2001"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType AClass_2002 = getElementType("org.eclipse.emf.cdo.dawn.examples.acore.diagram.AClass_2002"); //$NON-NLS-1$ + public static final IElementType AClass_2002 = getElementType( + "org.eclipse.emf.cdo.dawn.examples.acore.diagram.AClass_2002"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType AAttribute_3001 = getElementType("org.eclipse.emf.cdo.dawn.examples.acore.diagram.AAttribute_3001"); //$NON-NLS-1$ + public static final IElementType AAttribute_3001 = getElementType( + "org.eclipse.emf.cdo.dawn.examples.acore.diagram.AAttribute_3001"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType AOperation_3002 = getElementType("org.eclipse.emf.cdo.dawn.examples.acore.diagram.AOperation_3002"); //$NON-NLS-1$ + public static final IElementType AOperation_3002 = getElementType( + "org.eclipse.emf.cdo.dawn.examples.acore.diagram.AOperation_3002"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType AAttribute_3003 = getElementType("org.eclipse.emf.cdo.dawn.examples.acore.diagram.AAttribute_3003"); //$NON-NLS-1$ + public static final IElementType AAttribute_3003 = getElementType( + "org.eclipse.emf.cdo.dawn.examples.acore.diagram.AAttribute_3003"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType AOperation_3004 = getElementType("org.eclipse.emf.cdo.dawn.examples.acore.diagram.AOperation_3004"); //$NON-NLS-1$ + public static final IElementType AOperation_3004 = getElementType( + "org.eclipse.emf.cdo.dawn.examples.acore.diagram.AOperation_3004"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType AClassSubClasses_4001 = getElementType("org.eclipse.emf.cdo.dawn.examples.acore.diagram.AClassSubClasses_4001"); //$NON-NLS-1$ + public static final IElementType AClassSubClasses_4001 = getElementType( + "org.eclipse.emf.cdo.dawn.examples.acore.diagram.AClassSubClasses_4001"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType AClassImplementedInterfaces_4002 = getElementType("org.eclipse.emf.cdo.dawn.examples.acore.diagram.AClassImplementedInterfaces_4002"); //$NON-NLS-1$ + public static final IElementType AClassImplementedInterfaces_4002 = getElementType( + "org.eclipse.emf.cdo.dawn.examples.acore.diagram.AClassImplementedInterfaces_4002"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType AClassAssociations_4003 = getElementType("org.eclipse.emf.cdo.dawn.examples.acore.diagram.AClassAssociations_4003"); //$NON-NLS-1$ + public static final IElementType AClassAssociations_4003 = getElementType( + "org.eclipse.emf.cdo.dawn.examples.acore.diagram.AClassAssociations_4003"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType AClassAggregations_4004 = getElementType("org.eclipse.emf.cdo.dawn.examples.acore.diagram.AClassAggregations_4004"); //$NON-NLS-1$ + public static final IElementType AClassAggregations_4004 = getElementType( + "org.eclipse.emf.cdo.dawn.examples.acore.diagram.AClassAggregations_4004"); //$NON-NLS-1$ /** * @generated */ - public static final IElementType AClassCompositions_4005 = getElementType("org.eclipse.emf.cdo.dawn.examples.acore.diagram.AClassCompositions_4005"); //$NON-NLS-1$ + public static final IElementType AClassCompositions_4005 = getElementType( + "org.eclipse.emf.cdo.dawn.examples.acore.diagram.AClassCompositions_4005"); //$NON-NLS-1$ /** * @generated @@ -158,7 +170,7 @@ public class AcoreElementTypes extends ElementInitializers { if (element instanceof EStructuralFeature) { - EStructuralFeature feature = ((EStructuralFeature)element); + EStructuralFeature feature = (EStructuralFeature)element; EClass eContainingClass = feature.getEContainingClass(); EClassifier eType = feature.getEType(); if (eContainingClass != null && !eContainingClass.isAbstract()) @@ -175,8 +187,8 @@ public class AcoreElementTypes extends ElementInitializers EClass eClass = (EClass)element; if (!eClass.isAbstract()) { - return AcoreDiagramEditorPlugin.getInstance().getItemImageDescriptor( - eClass.getEPackage().getEFactoryInstance().create(eClass)); + return AcoreDiagramEditorPlugin.getInstance() + .getItemImageDescriptor(eClass.getEPackage().getEFactoryInstance().create(eClass)); } } // TODO : support structural features @@ -250,7 +262,7 @@ public class AcoreElementTypes extends ElementInitializers /** * Returns 'type' of the ecore object associated with the hint. - * + * * @generated */ public static ENamedElement getElement(IAdaptable hint) @@ -284,7 +296,7 @@ public class AcoreElementTypes extends ElementInitializers elements.put(AClassCompositions_4005, AcorePackage.eINSTANCE.getAClass_Compositions()); } - return (ENamedElement)elements.get(type); + return elements.get(type); } /** diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreIconProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreIconProvider.java index fd0c8092b0..1afab629f0 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreIconProvider.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreIconProvider.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.providers; diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreModelingAssistantProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreModelingAssistantProvider.java index a62c86a976..f18539b95c 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreModelingAssistantProvider.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreModelingAssistantProvider.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.providers; @@ -48,9 +48,10 @@ public class AcoreModelingAssistantProvider extends ModelingAssistantProvider /** * @generated */ + @Override public List getTypesForPopupBar(IAdaptable host) { - IGraphicalEditPart editPart = (IGraphicalEditPart)host.getAdapter(IGraphicalEditPart.class); + IGraphicalEditPart editPart = host.getAdapter(IGraphicalEditPart.class); if (editPart instanceof ACoreRootEditPart) { ArrayList<IElementType> types = new ArrayList<IElementType>(2); @@ -78,9 +79,10 @@ public class AcoreModelingAssistantProvider extends ModelingAssistantProvider /** * @generated */ + @Override public List getRelTypesOnSource(IAdaptable source) { - IGraphicalEditPart sourceEditPart = (IGraphicalEditPart)source.getAdapter(IGraphicalEditPart.class); + IGraphicalEditPart sourceEditPart = source.getAdapter(IGraphicalEditPart.class); if (sourceEditPart instanceof AClassEditPart) { return ((AClassEditPart)sourceEditPart).getMARelTypesOnSource(); @@ -91,9 +93,10 @@ public class AcoreModelingAssistantProvider extends ModelingAssistantProvider /** * @generated */ + @Override public List getRelTypesOnTarget(IAdaptable target) { - IGraphicalEditPart targetEditPart = (IGraphicalEditPart)target.getAdapter(IGraphicalEditPart.class); + IGraphicalEditPart targetEditPart = target.getAdapter(IGraphicalEditPart.class); if (targetEditPart instanceof AInterfaceEditPart) { return ((AInterfaceEditPart)targetEditPart).getMARelTypesOnTarget(); @@ -108,10 +111,11 @@ public class AcoreModelingAssistantProvider extends ModelingAssistantProvider /** * @generated */ + @Override public List getRelTypesOnSourceAndTarget(IAdaptable source, IAdaptable target) { - IGraphicalEditPart sourceEditPart = (IGraphicalEditPart)source.getAdapter(IGraphicalEditPart.class); - IGraphicalEditPart targetEditPart = (IGraphicalEditPart)target.getAdapter(IGraphicalEditPart.class); + IGraphicalEditPart sourceEditPart = source.getAdapter(IGraphicalEditPart.class); + IGraphicalEditPart targetEditPart = target.getAdapter(IGraphicalEditPart.class); if (sourceEditPart instanceof AClassEditPart) { return ((AClassEditPart)sourceEditPart).getMARelTypesOnSourceAndTarget(targetEditPart); @@ -122,9 +126,10 @@ public class AcoreModelingAssistantProvider extends ModelingAssistantProvider /** * @generated */ + @Override public List getTypesForSource(IAdaptable target, IElementType relationshipType) { - IGraphicalEditPart targetEditPart = (IGraphicalEditPart)target.getAdapter(IGraphicalEditPart.class); + IGraphicalEditPart targetEditPart = target.getAdapter(IGraphicalEditPart.class); if (targetEditPart instanceof AInterfaceEditPart) { return ((AInterfaceEditPart)targetEditPart).getMATypesForSource(relationshipType); @@ -139,9 +144,10 @@ public class AcoreModelingAssistantProvider extends ModelingAssistantProvider /** * @generated */ + @Override public List getTypesForTarget(IAdaptable source, IElementType relationshipType) { - IGraphicalEditPart sourceEditPart = (IGraphicalEditPart)source.getAdapter(IGraphicalEditPart.class); + IGraphicalEditPart sourceEditPart = source.getAdapter(IGraphicalEditPart.class); if (sourceEditPart instanceof AClassEditPart) { return ((AClassEditPart)sourceEditPart).getMATypesForTarget(relationshipType); @@ -152,6 +158,7 @@ public class AcoreModelingAssistantProvider extends ModelingAssistantProvider /** * @generated */ + @Override public EObject selectExistingElementForSource(IAdaptable target, IElementType relationshipType) { return selectExistingElement(target, getTypesForSource(target, relationshipType)); @@ -160,6 +167,7 @@ public class AcoreModelingAssistantProvider extends ModelingAssistantProvider /** * @generated */ + @Override public EObject selectExistingElementForTarget(IAdaptable source, IElementType relationshipType) { return selectExistingElement(source, getTypesForTarget(source, relationshipType)); @@ -174,7 +182,7 @@ public class AcoreModelingAssistantProvider extends ModelingAssistantProvider { return null; } - IGraphicalEditPart editPart = (IGraphicalEditPart)host.getAdapter(IGraphicalEditPart.class); + IGraphicalEditPart editPart = host.getAdapter(IGraphicalEditPart.class); if (editPart == null) { return null; @@ -193,7 +201,7 @@ public class AcoreModelingAssistantProvider extends ModelingAssistantProvider { return null; } - return selectElement((EObject[])elements.toArray(new EObject[elements.size()])); + return selectElement(elements.toArray(new EObject[elements.size()])); } /** @@ -211,8 +219,8 @@ public class AcoreModelingAssistantProvider extends ModelingAssistantProvider protected EObject selectElement(EObject[] elements) { Shell shell = Display.getCurrent().getActiveShell(); - ILabelProvider labelProvider = new AdapterFactoryLabelProvider(AcoreDiagramEditorPlugin.getInstance() - .getItemProvidersAdapterFactory()); + ILabelProvider labelProvider = new AdapterFactoryLabelProvider( + AcoreDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory()); ElementListSelectionDialog dialog = new ElementListSelectionDialog(shell, labelProvider); dialog.setMessage(Messages.AcoreModelingAssistantProviderMessage); dialog.setTitle(Messages.AcoreModelingAssistantProviderTitle); diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreParserProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreParserProvider.java index ff71c631df..979701e6ae 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreParserProvider.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreParserProvider.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.providers; @@ -196,7 +196,7 @@ public class AcoreParserProvider extends AbstractProvider implements IParserProv /** * Utility method that consults ParserService - * + * * @generated */ public static IParser getParser(IElementType type, EObject object, String parserHint) @@ -209,12 +209,12 @@ public class AcoreParserProvider extends AbstractProvider implements IParserProv */ public IParser getParser(IAdaptable hint) { - String vid = (String)hint.getAdapter(String.class); + String vid = hint.getAdapter(String.class); if (vid != null) { return getParser(AcoreVisualIDRegistry.getVisualID(vid)); } - View view = (View)hint.getAdapter(View.class); + View view = hint.getAdapter(View.class); if (view != null) { return getParser(AcoreVisualIDRegistry.getVisualID(view)); @@ -263,6 +263,7 @@ public class AcoreParserProvider extends AbstractProvider implements IParserProv /** * @generated */ + @Override public Object getAdapter(Class adapter) { if (IElementType.class.equals(adapter)) diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreViewProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreViewProvider.java index 9c42191c2d..fb9f815f78 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreViewProvider.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/AcoreViewProvider.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.providers; @@ -154,7 +154,7 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider visualID = AcoreVisualIDRegistry.getVisualID(op.getSemanticHint()); if (elementType != null) { - if (!AcoreElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) + if (!AcoreElementTypes.isKnownElementType(elementType) || !(elementType instanceof IHintedType)) { return false; // foreign element type } @@ -184,7 +184,7 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider case AAttribute2EditPart.VISUAL_ID: case AOperation2EditPart.VISUAL_ID: if (domainElement == null - || visualID != AcoreVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement)) + || visualID != AcoreVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement)) { return false; // visual id in semantic hint should match visual id for domain element } @@ -205,12 +205,12 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider protected boolean provides(CreateEdgeViewOperation op) { IElementType elementType = getSemanticElementType(op.getSemanticAdapter()); - if (!AcoreElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) + if (!AcoreElementTypes.isKnownElementType(elementType) || !(elementType instanceof IHintedType)) { return false; // foreign element type } 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 } @@ -314,8 +314,8 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); - org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter - .getColor(prefStore, IPreferenceConstants.PREF_LINE_COLOR); + org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(prefStore, + IPreferenceConstants.PREF_LINE_COLOR); ViewUtil.setStructuralFeatureValue(node, NotationPackage.eINSTANCE.getLineStyle_LineColor(), FigureUtilities.RGBToInteger(lineRGB)); FontStyle nodeFontStyle = (FontStyle)node.getStyle(NotationPackage.Literals.FONT_STYLE); @@ -356,8 +356,8 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); - org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter - .getColor(prefStore, IPreferenceConstants.PREF_LINE_COLOR); + org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(prefStore, + IPreferenceConstants.PREF_LINE_COLOR); ViewUtil.setStructuralFeatureValue(node, NotationPackage.eINSTANCE.getLineStyle_LineColor(), FigureUtilities.RGBToInteger(lineRGB)); FontStyle nodeFontStyle = (FontStyle)node.getStyle(NotationPackage.Literals.FONT_STYLE); @@ -456,8 +456,8 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider // initializePreferences final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); - org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter - .getColor(prefStore, IPreferenceConstants.PREF_LINE_COLOR); + org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(prefStore, + IPreferenceConstants.PREF_LINE_COLOR); ViewUtil.setStructuralFeatureValue(edge, NotationPackage.eINSTANCE.getLineStyle_LineColor(), FigureUtilities.RGBToInteger(lineRGB)); FontStyle edgeFontStyle = (FontStyle)edge.getStyle(NotationPackage.Literals.FONT_STYLE); @@ -500,8 +500,8 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider // initializePreferences final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); - org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter - .getColor(prefStore, IPreferenceConstants.PREF_LINE_COLOR); + org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(prefStore, + IPreferenceConstants.PREF_LINE_COLOR); ViewUtil.setStructuralFeatureValue(edge, NotationPackage.eINSTANCE.getLineStyle_LineColor(), FigureUtilities.RGBToInteger(lineRGB)); FontStyle edgeFontStyle = (FontStyle)edge.getStyle(NotationPackage.Literals.FONT_STYLE); @@ -544,8 +544,8 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider // initializePreferences final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); - org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter - .getColor(prefStore, IPreferenceConstants.PREF_LINE_COLOR); + org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(prefStore, + IPreferenceConstants.PREF_LINE_COLOR); ViewUtil.setStructuralFeatureValue(edge, NotationPackage.eINSTANCE.getLineStyle_LineColor(), FigureUtilities.RGBToInteger(lineRGB)); FontStyle edgeFontStyle = (FontStyle)edge.getStyle(NotationPackage.Literals.FONT_STYLE); @@ -588,8 +588,8 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider // initializePreferences final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); - org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter - .getColor(prefStore, IPreferenceConstants.PREF_LINE_COLOR); + org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(prefStore, + IPreferenceConstants.PREF_LINE_COLOR); ViewUtil.setStructuralFeatureValue(edge, NotationPackage.eINSTANCE.getLineStyle_LineColor(), FigureUtilities.RGBToInteger(lineRGB)); FontStyle edgeFontStyle = (FontStyle)edge.getStyle(NotationPackage.Literals.FONT_STYLE); @@ -632,8 +632,8 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider // initializePreferences final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); - org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter - .getColor(prefStore, IPreferenceConstants.PREF_LINE_COLOR); + org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(prefStore, + IPreferenceConstants.PREF_LINE_COLOR); ViewUtil.setStructuralFeatureValue(edge, NotationPackage.eINSTANCE.getLineStyle_LineColor(), FigureUtilities.RGBToInteger(lineRGB)); FontStyle edgeFontStyle = (FontStyle)edge.getStyle(NotationPackage.Literals.FONT_STYLE); @@ -727,7 +727,7 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider { 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); @@ -744,6 +744,6 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider { return null; } - return (IElementType)semanticAdapter.getAdapter(IElementType.class); + return semanticAdapter.getAdapter(IElementType.class); } } diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/ElementInitializers.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/ElementInitializers.java index 0f9906de30..2d7e119c58 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/ElementInitializers.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/providers/ElementInitializers.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.providers; diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/sheet/AcorePropertySection.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/sheet/AcorePropertySection.java index c691200338..7905c549bb 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/sheet/AcorePropertySection.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/sheet/AcorePropertySection.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.sheet; @@ -57,7 +57,7 @@ public class AcorePropertySection extends AdvancedPropertySection implements IPr } if (object instanceof IAdaptable) { - return (IPropertySource)((IAdaptable)object).getAdapter(IPropertySource.class); + return ((IAdaptable)object).getAdapter(IPropertySource.class); } return null; } @@ -65,6 +65,7 @@ public class AcorePropertySection extends AdvancedPropertySection implements IPr /** * @generated */ + @Override protected IPropertySourceProvider getPropertySourceProvider() { return this; @@ -72,7 +73,7 @@ public class AcorePropertySection extends AdvancedPropertySection implements IPr /** * Modify/unwrap selection. - * + * * @generated */ protected Object transformSelection(Object selected) @@ -89,7 +90,7 @@ public class AcorePropertySection extends AdvancedPropertySection implements IPr } if (selected instanceof IAdaptable) { - View view = (View)((IAdaptable)selected).getAdapter(View.class); + View view = ((IAdaptable)selected).getAdapter(View.class); if (view != null) { return view.getElement(); @@ -101,6 +102,7 @@ public class AcorePropertySection extends AdvancedPropertySection implements IPr /** * @generated */ + @Override public void setInput(IWorkbenchPart part, ISelection selection) { if (selection.isEmpty() || false == selection instanceof StructuredSelection) @@ -108,7 +110,7 @@ public class AcorePropertySection extends AdvancedPropertySection implements IPr super.setInput(part, selection); return; } - final StructuredSelection structuredSelection = ((StructuredSelection)selection); + final StructuredSelection structuredSelection = (StructuredSelection)selection; ArrayList transformedSelection = new ArrayList(structuredSelection.size()); for (Iterator it = structuredSelection.iterator(); it.hasNext();) { diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/sheet/AcoreSheetLabelProvider.java b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/sheet/AcoreSheetLabelProvider.java index f169780a15..e3a3f47806 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/sheet/AcoreSheetLabelProvider.java +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/src/org/eclipse/emf/cdo/dawn/examples/acore/diagram/sheet/AcoreSheetLabelProvider.java @@ -4,10 +4,10 @@ * 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: * Martin Fluegge - initial API and implementation - * + * */ package org.eclipse.emf.cdo.dawn.examples.acore.diagram.sheet; @@ -75,7 +75,7 @@ public class AcoreSheetLabelProvider extends BaseLabelProvider implements ILabel } if (element instanceof IAdaptable) { - return (View)((IAdaptable)element).getAdapter(View.class); + return ((IAdaptable)element).getAdapter(View.class); } return null; } |