diff options
author | Martin Fluegge | 2010-06-06 14:39:45 +0000 |
---|---|---|
committer | Martin Fluegge | 2010-06-06 14:39:45 +0000 |
commit | da36bd46832db377b9f670735ec3265ec15f3410 (patch) | |
tree | 459630952de970e91405fb6efc9ef94378356056 /plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram | |
parent | a55d29d37931b44d3c1d8464be9e75b24e9fcc9a (diff) | |
download | cdo-da36bd46832db377b9f670735ec3265ec15f3410.tar.gz cdo-da36bd46832db377b9f670735ec3265ec15f3410.tar.xz cdo-da36bd46832db377b9f670735ec3265ec15f3410.zip |
[308232] [Dawn] Develop collaborative support for GMF on CDO
https://bugs.eclipse.org/bugs/show_bug.cgi?id=308232
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram')
32 files changed, 193 insertions, 119 deletions
diff --git a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/.settings/org.eclipse.jdt.core.prefs index 73fe0bd48b..373f66341d 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.emf.cdo.dawn.examples.acore.diagram/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Sat Jun 05 21:13:40 CEST 2010 +#Sun Jun 06 13:27:08 CEST 2010 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 @@ -7,6 +7,71 @@ org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=ignore org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.comparingIdentical=ignore +org.eclipse.jdt.core.compiler.problem.deadCode=ignore +org.eclipse.jdt.core.compiler.problem.deprecation=ignore +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore +org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore +org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=ignore +org.eclipse.jdt.core.compiler.problem.forbiddenReference=ignore +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=ignore +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=ignore +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=ignore +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore +org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=ignore +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=ignore +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nullReference=ignore +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=ignore +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore +org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=ignore +org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedImport=ignore +org.eclipse.jdt.core.compiler.problem.unusedLabel=ignore +org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore +org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=ignore org.eclipse.jdt.core.compiler.source=1.5 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 1b7d24f852..ce6e81106d 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 @@ -42,6 +42,7 @@ public class AAttribute2CreateCommand extends EditElementCommand /** * FIXME: replace with setElementToEdit() + * * @generated */ protected EObject getElementToEdit() 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 ff60d8441e..49b34d6007 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 @@ -42,6 +42,7 @@ public class AAttributeCreateCommand extends EditElementCommand /** * FIXME: replace with setElementToEdit() + * * @generated */ protected EObject getElementToEdit() 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 5ab6039916..f5896a50df 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 @@ -42,6 +42,7 @@ public class AClassCreateCommand extends EditElementCommand /** * FIXME: replace with setElementToEdit() + * * @generated */ protected EObject getElementToEdit() 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 ed80a8ede0..f2645ad47f 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 @@ -42,6 +42,7 @@ public class AInterfaceCreateCommand extends EditElementCommand /** * FIXME: replace with setElementToEdit() + * * @generated */ protected EObject getElementToEdit() 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 4ce577867b..2e76f3617b 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 @@ -42,6 +42,7 @@ public class AOperation2CreateCommand extends EditElementCommand /** * FIXME: replace with setElementToEdit() + * * @generated */ protected EObject getElementToEdit() 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 76d30326fe..d7e8798606 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 @@ -42,6 +42,7 @@ public class AOperationCreateCommand extends EditElementCommand /** * FIXME: replace with setElementToEdit() + * * @generated */ protected EObject getElementToEdit() 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 3440e62958..dfd3aef981 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 @@ -86,7 +86,7 @@ public class AClassAAttributeCompartmentEditPart extends ListCompartmentEditPart protected void setRatio(Double ratio) { // nothing to do -- parent layout does not accept Double constraints as ratio - // super.setRatio(ratio); + // super.setRatio(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 a2c524c4e9..59dbd68cd0 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 @@ -86,7 +86,7 @@ public class AClassAOperationClassCompartmentEditPart extends ListCompartmentEdi protected void setRatio(Double ratio) { // nothing to do -- parent layout does not accept Double constraints as ratio - // super.setRatio(ratio); + // super.setRatio(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 22402cf228..013f915d22 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 @@ -52,10 +52,8 @@ 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. + * 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 */ 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 395daea6bd..ba61ed9375 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 @@ -48,10 +48,8 @@ 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. + * 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 */ 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 c572398f54..33102905c7 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 @@ -52,10 +52,8 @@ 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. + * 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 */ 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 a71cfd13f5..d7818a9f4e 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 @@ -82,7 +82,8 @@ public class AClassEditPart extends ShapeNodeEditPart super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new AClassItemSemanticEditPolicy()); installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); - // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies + // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable + // editpolicies // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE); } @@ -140,14 +141,14 @@ public class AClassEditPart extends ShapeNodeEditPart if (childEditPart instanceof AClassAAttributeCompartmentEditPart) { IFigure pane = getPrimaryShape().getFigureClassAttributes(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((AClassAAttributeCompartmentEditPart)childEditPart).getFigure()); return true; } if (childEditPart instanceof AClassAOperationClassCompartmentEditPart) { IFigure pane = getPrimaryShape().getFigureClassOperations(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((AClassAOperationClassCompartmentEditPart)childEditPart).getFigure()); return true; } @@ -166,14 +167,14 @@ public class AClassEditPart extends ShapeNodeEditPart if (childEditPart instanceof AClassAAttributeCompartmentEditPart) { IFigure pane = getPrimaryShape().getFigureClassAttributes(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.remove(((AClassAAttributeCompartmentEditPart)childEditPart).getFigure()); return true; } if (childEditPart instanceof AClassAOperationClassCompartmentEditPart) { IFigure pane = getPrimaryShape().getFigureClassOperations(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.remove(((AClassAOperationClassCompartmentEditPart)childEditPart).getFigure()); return true; } @@ -230,10 +231,8 @@ 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. + * 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 */ @@ -248,9 +247,10 @@ 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 + * 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 */ protected IFigure setupContentPane(IFigure nodeShape) 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 cadb28c77a..7fd0b0b9c3 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 @@ -51,10 +51,8 @@ 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. + * 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 */ 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 34c9a55e73..d811a8a317 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 @@ -52,10 +52,8 @@ 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. + * 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 */ 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 aa8a2a2326..704e485d3b 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 @@ -87,7 +87,7 @@ public class AInterfaceAAttributeInterfaceCompartmentEditPart extends ListCompar protected void setRatio(Double ratio) { // nothing to do -- parent layout does not accept Double constraints as ratio - // super.setRatio(ratio); + // super.setRatio(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 f21ee2ede3..61f45610f3 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 @@ -87,7 +87,7 @@ public class AInterfaceAOperationInterfaceCompartmentEditPart extends ListCompar protected void setRatio(Double ratio) { // nothing to do -- parent layout does not accept Double constraints as ratio - // super.setRatio(ratio); + // super.setRatio(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 9575419a06..247e111b9c 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 @@ -84,7 +84,8 @@ public class AInterfaceEditPart extends ShapeNodeEditPart super.createDefaultEditPolicies(); installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new AInterfaceItemSemanticEditPolicy()); installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy()); - // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies + // XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable + // editpolicies // removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE); } @@ -142,14 +143,14 @@ public class AInterfaceEditPart extends ShapeNodeEditPart if (childEditPart instanceof AInterfaceAAttributeInterfaceCompartmentEditPart) { IFigure pane = getPrimaryShape().getFigureInterfaceAttributes(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((AInterfaceAAttributeInterfaceCompartmentEditPart)childEditPart).getFigure()); return true; } if (childEditPart instanceof AInterfaceAOperationInterfaceCompartmentEditPart) { IFigure pane = getPrimaryShape().getFigureInterfaceOperations(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.add(((AInterfaceAOperationInterfaceCompartmentEditPart)childEditPart).getFigure()); return true; } @@ -168,14 +169,14 @@ public class AInterfaceEditPart extends ShapeNodeEditPart if (childEditPart instanceof AInterfaceAAttributeInterfaceCompartmentEditPart) { IFigure pane = getPrimaryShape().getFigureInterfaceAttributes(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.remove(((AInterfaceAAttributeInterfaceCompartmentEditPart)childEditPart).getFigure()); return true; } if (childEditPart instanceof AInterfaceAOperationInterfaceCompartmentEditPart) { IFigure pane = getPrimaryShape().getFigureInterfaceOperations(); - setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way + setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way pane.remove(((AInterfaceAOperationInterfaceCompartmentEditPart)childEditPart).getFigure()); return true; } @@ -232,10 +233,8 @@ 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. + * 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 */ @@ -250,9 +249,10 @@ 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 + * 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 */ protected IFigure setupContentPane(IFigure nodeShape) 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 7c9ec3575c..3823060b8e 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 @@ -185,8 +185,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 - // don't need explicit deletion of cnode as parent's view deletion would clean child views as well + 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; } @@ -199,8 +200,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 - // don't need explicit deletion of cnode as parent's view deletion would clean child views as well + 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; } @@ -277,8 +279,8 @@ 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. + * Returns command to reorient EReference based link. New link target or source should be the domain model element + * associated with this node. * * @generated */ 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 fa983769ad..fbff1c28e4 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 @@ -139,7 +139,8 @@ public class ACoreRootCanonicalEditPolicy extends CanonicalEditPolicy List<View> orphaned = cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren); boolean changed = deleteViews(orphaned.iterator()); // leave descriptors that reference survived semanticChildren. - // NOTE, we may want to stop using cleanCanonicalSemanticChildren() here, replacing with own code, that respects NodeDescriptors + // NOTE, we may want to stop using cleanCanonicalSemanticChildren() here, replacing with own code, that respects + // NodeDescriptors for (Iterator<AcoreNodeDescriptor> it = childDescriptors.iterator(); it.hasNext();) { AcoreNodeDescriptor next = it.next(); 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 6669573eba..903be83b7f 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 @@ -105,8 +105,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 - // don't need explicit deletion of cnode as parent's view deletion would clean child views as well + 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; } @@ -119,8 +120,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 - // don't need explicit deletion of cnode as parent's view deletion would clean child views as well + 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; } @@ -165,8 +167,8 @@ 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. + * Returns command to reorient EReference based link. New link target or source should be the domain model element + * associated with this node. * * @generated */ 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 94789ea680..b76cab75b9 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 @@ -55,6 +55,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$ @@ -73,11 +74,9 @@ 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. + * 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 */ @@ -97,6 +96,7 @@ public class AcoreBaseItemSemanticEditPolicy extends SemanticEditPolicy /** * Returns visual id from request parameters. + * * @generated */ protected int getVisualID(IEditCommandRequest request) @@ -316,6 +316,7 @@ public class AcoreBaseItemSemanticEditPolicy extends SemanticEditPolicy /** * Returns editing domain from the host edit part. + * * @generated */ protected TransactionalEditingDomain getEditingDomain() @@ -325,6 +326,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) 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 d6c91dc927..fc5dc492a6 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 @@ -142,11 +142,11 @@ public class AcoreDiagramEditorPlugin extends AbstractUIPlugin } /** - * Returns an image descriptor for the image file at the given - * plug-in relative path. - * + * Returns an image descriptor for the image file at the given plug-in relative path. + * * @generated - * @param path the path + * @param path + * the path * @return the image descriptor */ public static ImageDescriptor getBundledImageDescriptor(String path) @@ -155,12 +155,12 @@ 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 - * + * Respects images residing in any plug-in. If path is relative, then this bundle is looked up for the image, + * otherwise, for absolute path, first segment is taken as id of plug-in with image + * * @generated - * @param path the path to image, either absolute (with plug-in id as first segment), or relative for bundled images + * @param path + * the path to image, either absolute (with plug-in id as first segment), or relative for bundled images * @return the image descriptor */ public static ImageDescriptor findImageDescriptor(String path) @@ -178,11 +178,12 @@ 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. - * + * 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 + * @param path + * the path * @return image instance */ public Image getBundledImage(String path) @@ -198,7 +199,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 5ec3d076be..fcc54a6773 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 @@ -169,6 +169,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) @@ -224,9 +225,8 @@ public class AcoreDiagramEditorUtil } /** - * Create a new instance of domain element associated with canvas. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * Create a new instance of domain element associated with canvas. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ private static ACoreRoot createInitialModel() @@ -235,9 +235,8 @@ public class AcoreDiagramEditorUtil } /** - * Store model element in the resource. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * Store model element in the resource. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ private static void attachModelToResource(ACoreRoot model, Resource resource) @@ -248,7 +247,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(); @@ -445,6 +444,6 @@ public class AcoreDiagramEditorUtil } return element2ViewMap; } - } //LazyElement2ViewMap + } // LazyElement2ViewMap } 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 5120892e12..2c20f522d7 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 @@ -111,12 +111,13 @@ 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. + * Sets up the given document as it would be provided for the given element. The content of the document is not + * changed. This default implementation is empty. Subclasses may reimplement. * - * @param element the blue-print element - * @param document the document to set up + * @param element + * the blue-print element + * @param document + * the document to set up * @generated */ protected void setupDocument(Object element, IDocument document) @@ -235,7 +236,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I try { Map options = new HashMap(GMFResourceFactory.getDefaultLoadOptions()); - // @see 171060 + // @see 171060 // options.put(org.eclipse.emf.ecore.xmi.XMLResource.OPTION_RECORD_UNKNOWN_FEATURE, Boolean.TRUE); resource.load(options); } @@ -387,7 +388,8 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I catch (CoreException ex) { AcoreDiagramEditorPlugin.getInstance().logError(Messages.AcoreDocumentProvider_isModifiable, ex); - // Error message to log was initially taken from org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal.l10n.EditorMessages.StorageDocumentProvider_isModifiable + // Error message to log was initially taken from + // org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal.l10n.EditorMessages.StorageDocumentProvider_isModifiable } } return info.isReadOnly(); @@ -419,7 +421,8 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I catch (CoreException ex) { AcoreDiagramEditorPlugin.getInstance().logError(Messages.AcoreDocumentProvider_isModifiable, ex); - // Error message to log was initially taken from org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal.l10n.EditorMessages.StorageDocumentProvider_isModifiable + // Error message to log was initially taken from + // org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal.l10n.EditorMessages.StorageDocumentProvider_isModifiable } } return info.isModifiable(); @@ -583,10 +586,8 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I do { /* - * XXX This is a workaround for - * https://bugs.eclipse.org/bugs/show_bug.cgi?id=67601 - * IResourceRuleFactory.createRule should iterate the hierarchy - * itself. + * XXX This is a workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=67601 + * IResourceRuleFactory.createRule should iterate the hierarchy itself. */ toCreateOrModify = parent; parent = toCreateOrModify.getParent(); @@ -632,7 +633,7 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I try { monitor.beginTask(Messages.AcoreDocumentProvider_SaveDiagramTask, - info.getResourceSet().getResources().size() + 1); //"Saving diagram" + info.getResourceSet().getResources().size() + 1); // "Saving diagram" for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) { Resource nextResource = it.next(); @@ -745,7 +746,8 @@ public class AcoreDocumentProvider extends AbstractDocumentProvider implements I catch (CoreException ex) { AcoreDiagramEditorPlugin.getInstance().logError(Messages.AcoreDocumentProvider_handleElementContentChanged, ex); - // Error message to log was initially taken from org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal.l10n.EditorMessages.FileDocumentProvider_handleElementContentChanged + // Error message to log was initially taken from + // org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal.l10n.EditorMessages.FileDocumentProvider_handleElementContentChanged } } changedResource.unload(); @@ -1167,7 +1169,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;) { 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 8cb627195a..d9cb10e1bf 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 @@ -42,6 +42,7 @@ public class AcorePaletteFactory /** * Creates "Node" palette tool group + * * @generated */ private PaletteContainer createNode1Group() @@ -57,6 +58,7 @@ public class AcorePaletteFactory /** * Creates "Connections" palette tool group + * * @generated */ private PaletteContainer createConnections2Group() 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 20c11815c2..8917fdca3d 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 @@ -33,9 +33,8 @@ import org.eclipse.gmf.runtime.notation.Diagram; 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. + * 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 */ @@ -309,8 +308,7 @@ public class AcoreVisualIDRegistry } /** - * User can change implementation of this method to handle some specific - * situations not covered by default logic. + * User can change implementation of this method to handle some specific situations not covered by default logic. * * @generated */ 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 5738eb08cf..1c2ec87460 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 @@ -484,5 +484,5 @@ public class Messages extends NLS */ public static String AcoreModelingAssistantProviderMessage; - //TODO: put accessor fields manually + // TODO: put accessor fields manually } 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 279aeb423c..6bcbbebe89 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 @@ -30,6 +30,7 @@ import org.eclipse.swt.widgets.Label; /** * Wizard page that allows to select element from model. + * * @generated */ public class ModelElementSelectionPage extends WizardPage @@ -126,6 +127,7 @@ public class ModelElementSelectionPage extends WizardPage /** * Override to provide custom model element description. + * * @generated */ protected String getSelectionTitle() @@ -160,6 +162,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/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 c9ddd72de4..36c098eb26 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 @@ -194,6 +194,7 @@ public class AcoreParserProvider extends AbstractProvider implements IParserProv /** * Utility method that consults ParserService + * * @generated */ public static IParser getParser(IElementType type, EObject object, String parserHint) 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 f8424dd561..f7a0a17edc 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 @@ -108,10 +108,9 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider protected boolean provides(CreateViewForKindOperation op) { /* - if (op.getViewKind() == Node.class) - return getNodeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null; - if (op.getViewKind() == Edge.class) - return getEdgeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null; + * if (op.getViewKind() == Node.class) return getNodeViewClass(op.getSemanticAdapter(), op.getContainerView(), + * op.getSemanticHint()) != null; if (op.getViewKind() == Edge.class) return + * getEdgeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null; */ return true; } @@ -310,7 +309,7 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); stampShortcut(containerView, node); - // initializeFromPreferences + // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter @@ -352,7 +351,7 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider ViewUtil.insertChildView(containerView, node, index, persisted); node.setElement(domainElement); stampShortcut(containerView, node); - // initializeFromPreferences + // initializeFromPreferences final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore(); org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter @@ -686,9 +685,9 @@ public class AcoreViewProvider extends AbstractProvider implements IViewProvider private Node createCompartment(View owner, String hint, boolean canCollapse, boolean hasTitle, boolean canSort, boolean canFilter) { - //SemanticListCompartment rv = NotationFactory.eINSTANCE.createSemanticListCompartment(); - //rv.setShowTitle(showTitle); - //rv.setCollapsed(isCollapsed); + // SemanticListCompartment rv = NotationFactory.eINSTANCE.createSemanticListCompartment(); + // rv.setShowTitle(showTitle); + // rv.setCollapsed(isCollapsed); Node rv; if (canCollapse) { 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 eb94a90fb0..cb87971e93 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 @@ -71,6 +71,7 @@ public class AcorePropertySection extends AdvancedPropertySection implements IPr /** * Modify/unwrap selection. + * * @generated */ protected Object transformSelection(Object selected) |