Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoratikhomirov2007-04-16 12:36:08 -0400
committeratikhomirov2007-04-16 12:36:08 -0400
commit4479752b21b71e08824207447acc0b8db392ca49 (patch)
treec188eefed7ae59abcf22d30d95252badec0c829b
parente9866a7feac346f17e7a265204cf4620763a0634 (diff)
downloadorg.eclipse.gmf-tooling-4479752b21b71e08824207447acc0b8db392ca49.tar.gz
org.eclipse.gmf-tooling-4479752b21b71e08824207447acc0b8db392ca49.tar.xz
org.eclipse.gmf-tooling-4479752b21b71e08824207447acc0b8db392ca49.zip
remove superfluous setter
-rw-r--r--plugins/org.eclipse.gmf.codegen/models/gmfgen.ecore2
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenNodeLabel.java13
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenPackageImpl.java136
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GenNodeLabelImpl.java68
4 files changed, 5 insertions, 214 deletions
diff --git a/plugins/org.eclipse.gmf.codegen/models/gmfgen.ecore b/plugins/org.eclipse.gmf.codegen/models/gmfgen.ecore
index 3d7e62f1b..7cf268a83 100644
--- a/plugins/org.eclipse.gmf.codegen/models/gmfgen.ecore
+++ b/plugins/org.eclipse.gmf.codegen/models/gmfgen.ecore
@@ -791,7 +791,7 @@
<details key="description" value="Node label meta features must be owned by the node 'Meta Class' or its super-classes"/>
</eAnnotations>
<eStructuralFeatures xsi:type="ecore:EReference" name="node" lowerBound="1" eType="#//GenNode"
- eOpposite="#//GenNode/labels"/>
+ changeable="false" eOpposite="#//GenNode/labels"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="GenExternalNodeLabel" eSuperTypes="#//GenNodeLabel">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenNodeLabel.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenNodeLabel.java
index 57300b02d..c302dee1a 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenNodeLabel.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GenNodeLabel.java
@@ -38,22 +38,11 @@ public interface GenNodeLabel extends GenLabel {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Node</em>' container reference.
- * @see #setNode(GenNode)
* @see org.eclipse.gmf.codegen.gmfgen.GMFGenPackage#getGenNodeLabel_Node()
* @see org.eclipse.gmf.codegen.gmfgen.GenNode#getLabels
- * @model opposite="labels" required="true"
+ * @model opposite="labels" required="true" changeable="false"
* @generated
*/
GenNode getNode();
- /**
- * Sets the value of the '{@link org.eclipse.gmf.codegen.gmfgen.GenNodeLabel#getNode <em>Node</em>}' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Node</em>' container reference.
- * @see #getNode()
- * @generated
- */
- void setNode(GenNode value);
-
} // GenNodeLabel
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenPackageImpl.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenPackageImpl.java
index a144d8466..b6c3d4b50 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenPackageImpl.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenPackageImpl.java
@@ -16,140 +16,6 @@ import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.EValidator;
import org.eclipse.emf.ecore.EcorePackage;
import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.gmf.codegen.gmfgen.AbstractToolEntry;
-import org.eclipse.gmf.codegen.gmfgen.Attributes;
-import org.eclipse.gmf.codegen.gmfgen.BatchValidation;
-import org.eclipse.gmf.codegen.gmfgen.Behaviour;
-import org.eclipse.gmf.codegen.gmfgen.ColorAttributes;
-import org.eclipse.gmf.codegen.gmfgen.CustomBehaviour;
-import org.eclipse.gmf.codegen.gmfgen.CustomTabFilter;
-import org.eclipse.gmf.codegen.gmfgen.DefaultSizeAttributes;
-import org.eclipse.gmf.codegen.gmfgen.DesignLabelModelFacet;
-import org.eclipse.gmf.codegen.gmfgen.DiagramColors;
-import org.eclipse.gmf.codegen.gmfgen.EditPartCandies;
-import org.eclipse.gmf.codegen.gmfgen.EditorCandies;
-import org.eclipse.gmf.codegen.gmfgen.ElementType;
-import org.eclipse.gmf.codegen.gmfgen.EntryBase;
-import org.eclipse.gmf.codegen.gmfgen.FeatureLabelModelFacet;
-import org.eclipse.gmf.codegen.gmfgen.FeatureLinkModelFacet;
-import org.eclipse.gmf.codegen.gmfgen.FigureViewmap;
-import org.eclipse.gmf.codegen.gmfgen.FontStyle;
-import org.eclipse.gmf.codegen.gmfgen.GMFGenFactory;
-import org.eclipse.gmf.codegen.gmfgen.GMFGenPackage;
-import org.eclipse.gmf.codegen.gmfgen.GenActionFactoryContributionItem;
-import org.eclipse.gmf.codegen.gmfgen.GenApplication;
-import org.eclipse.gmf.codegen.gmfgen.GenAuditContainer;
-import org.eclipse.gmf.codegen.gmfgen.GenAuditRoot;
-import org.eclipse.gmf.codegen.gmfgen.GenAuditRule;
-import org.eclipse.gmf.codegen.gmfgen.GenAuditable;
-import org.eclipse.gmf.codegen.gmfgen.GenAuditedMetricTarget;
-import org.eclipse.gmf.codegen.gmfgen.GenChildContainer;
-import org.eclipse.gmf.codegen.gmfgen.GenChildLabelNode;
-import org.eclipse.gmf.codegen.gmfgen.GenChildNode;
-import org.eclipse.gmf.codegen.gmfgen.GenChildSideAffixedNode;
-import org.eclipse.gmf.codegen.gmfgen.GenColor;
-import org.eclipse.gmf.codegen.gmfgen.GenCommonBase;
-import org.eclipse.gmf.codegen.gmfgen.GenCompartment;
-import org.eclipse.gmf.codegen.gmfgen.GenConstantColor;
-import org.eclipse.gmf.codegen.gmfgen.GenConstraint;
-import org.eclipse.gmf.codegen.gmfgen.GenContainerBase;
-import org.eclipse.gmf.codegen.gmfgen.GenContributionItem;
-import org.eclipse.gmf.codegen.gmfgen.GenContributionManager;
-import org.eclipse.gmf.codegen.gmfgen.GenCustomFont;
-import org.eclipse.gmf.codegen.gmfgen.GenCustomPreferencePage;
-import org.eclipse.gmf.codegen.gmfgen.GenCustomPropertyTab;
-import org.eclipse.gmf.codegen.gmfgen.GenDiagram;
-import org.eclipse.gmf.codegen.gmfgen.GenDiagramElementTarget;
-import org.eclipse.gmf.codegen.gmfgen.GenDiagramPreferences;
-import org.eclipse.gmf.codegen.gmfgen.GenDomainAttributeTarget;
-import org.eclipse.gmf.codegen.gmfgen.GenDomainElementTarget;
-import org.eclipse.gmf.codegen.gmfgen.GenDomainModelNavigator;
-import org.eclipse.gmf.codegen.gmfgen.GenEditorGenerator;
-import org.eclipse.gmf.codegen.gmfgen.GenEditorView;
-import org.eclipse.gmf.codegen.gmfgen.GenElementInitializer;
-import org.eclipse.gmf.codegen.gmfgen.GenExpressionInterpreter;
-import org.eclipse.gmf.codegen.gmfgen.GenExpressionProviderBase;
-import org.eclipse.gmf.codegen.gmfgen.GenExpressionProviderContainer;
-import org.eclipse.gmf.codegen.gmfgen.GenExternalNodeLabel;
-import org.eclipse.gmf.codegen.gmfgen.GenFeatureInitializer;
-import org.eclipse.gmf.codegen.gmfgen.GenFeatureSeqInitializer;
-import org.eclipse.gmf.codegen.gmfgen.GenFeatureValueSpec;
-import org.eclipse.gmf.codegen.gmfgen.GenFont;
-import org.eclipse.gmf.codegen.gmfgen.GenGroupMarker;
-import org.eclipse.gmf.codegen.gmfgen.GenJavaExpressionProvider;
-import org.eclipse.gmf.codegen.gmfgen.GenLabel;
-import org.eclipse.gmf.codegen.gmfgen.GenLanguage;
-import org.eclipse.gmf.codegen.gmfgen.GenLink;
-import org.eclipse.gmf.codegen.gmfgen.GenLinkConstraints;
-import org.eclipse.gmf.codegen.gmfgen.GenLinkLabel;
-import org.eclipse.gmf.codegen.gmfgen.GenMeasurable;
-import org.eclipse.gmf.codegen.gmfgen.GenMenuManager;
-import org.eclipse.gmf.codegen.gmfgen.GenMetricContainer;
-import org.eclipse.gmf.codegen.gmfgen.GenMetricRule;
-import org.eclipse.gmf.codegen.gmfgen.GenNavigator;
-import org.eclipse.gmf.codegen.gmfgen.GenNavigatorChildReference;
-import org.eclipse.gmf.codegen.gmfgen.GenNavigatorPath;
-import org.eclipse.gmf.codegen.gmfgen.GenNavigatorPathSegment;
-import org.eclipse.gmf.codegen.gmfgen.GenNavigatorReferenceType;
-import org.eclipse.gmf.codegen.gmfgen.GenNode;
-import org.eclipse.gmf.codegen.gmfgen.GenNodeLabel;
-import org.eclipse.gmf.codegen.gmfgen.GenNotationElementTarget;
-import org.eclipse.gmf.codegen.gmfgen.GenPlugin;
-import org.eclipse.gmf.codegen.gmfgen.GenPreferencePage;
-import org.eclipse.gmf.codegen.gmfgen.GenPropertySheet;
-import org.eclipse.gmf.codegen.gmfgen.GenPropertyTab;
-import org.eclipse.gmf.codegen.gmfgen.GenPropertyTabFilter;
-import org.eclipse.gmf.codegen.gmfgen.GenRGBColor;
-import org.eclipse.gmf.codegen.gmfgen.GenReferenceNewElementSpec;
-import org.eclipse.gmf.codegen.gmfgen.GenRuleBase;
-import org.eclipse.gmf.codegen.gmfgen.GenRuleTarget;
-import org.eclipse.gmf.codegen.gmfgen.GenSeparator;
-import org.eclipse.gmf.codegen.gmfgen.GenSeverity;
-import org.eclipse.gmf.codegen.gmfgen.GenSharedContributionItem;
-import org.eclipse.gmf.codegen.gmfgen.GenStandardFont;
-import org.eclipse.gmf.codegen.gmfgen.GenStandardPreferencePage;
-import org.eclipse.gmf.codegen.gmfgen.GenStandardPropertyTab;
-import org.eclipse.gmf.codegen.gmfgen.GenToolBarManager;
-import org.eclipse.gmf.codegen.gmfgen.GenTopLevelNode;
-import org.eclipse.gmf.codegen.gmfgen.GeneratedType;
-import org.eclipse.gmf.codegen.gmfgen.InnerClassViewmap;
-import org.eclipse.gmf.codegen.gmfgen.JFaceFont;
-import org.eclipse.gmf.codegen.gmfgen.LabelModelFacet;
-import org.eclipse.gmf.codegen.gmfgen.LabelOffsetAttributes;
-import org.eclipse.gmf.codegen.gmfgen.LinkConstraints;
-import org.eclipse.gmf.codegen.gmfgen.LinkLabelAlignment;
-import org.eclipse.gmf.codegen.gmfgen.LinkModelFacet;
-import org.eclipse.gmf.codegen.gmfgen.MeasurementUnit;
-import org.eclipse.gmf.codegen.gmfgen.MetamodelType;
-import org.eclipse.gmf.codegen.gmfgen.ModelFacet;
-import org.eclipse.gmf.codegen.gmfgen.NotationType;
-import org.eclipse.gmf.codegen.gmfgen.OpenDiagramBehaviour;
-import org.eclipse.gmf.codegen.gmfgen.PackageNames;
-import org.eclipse.gmf.codegen.gmfgen.Palette;
-import org.eclipse.gmf.codegen.gmfgen.ParentAssignedViewmap;
-import org.eclipse.gmf.codegen.gmfgen.ProviderClassNames;
-import org.eclipse.gmf.codegen.gmfgen.ProviderPriority;
-import org.eclipse.gmf.codegen.gmfgen.ResizeConstraints;
-import org.eclipse.gmf.codegen.gmfgen.Routing;
-import org.eclipse.gmf.codegen.gmfgen.RulerUnits;
-import org.eclipse.gmf.codegen.gmfgen.Separator;
-import org.eclipse.gmf.codegen.gmfgen.SharedBehaviour;
-import org.eclipse.gmf.codegen.gmfgen.Shortcuts;
-import org.eclipse.gmf.codegen.gmfgen.SnippetViewmap;
-import org.eclipse.gmf.codegen.gmfgen.SpecializationType;
-import org.eclipse.gmf.codegen.gmfgen.StandardEntry;
-import org.eclipse.gmf.codegen.gmfgen.StandardEntryKind;
-import org.eclipse.gmf.codegen.gmfgen.StandardPreferencePages;
-import org.eclipse.gmf.codegen.gmfgen.StyleAttributes;
-import org.eclipse.gmf.codegen.gmfgen.ToolEntry;
-import org.eclipse.gmf.codegen.gmfgen.ToolGroup;
-import org.eclipse.gmf.codegen.gmfgen.ToolGroupItem;
-import org.eclipse.gmf.codegen.gmfgen.TypeLinkModelFacet;
-import org.eclipse.gmf.codegen.gmfgen.TypeModelFacet;
-import org.eclipse.gmf.codegen.gmfgen.TypeTabFilter;
-import org.eclipse.gmf.codegen.gmfgen.ValueExpression;
-import org.eclipse.gmf.codegen.gmfgen.Viewmap;
-import org.eclipse.gmf.codegen.gmfgen.ViewmapLayoutType;
import org.eclipse.gmf.codegen.gmfgen.*;
import org.eclipse.gmf.codegen.gmfgen.util.GMFGenMigration;
import org.eclipse.gmf.internal.common.migrate.MigrationConfig;
@@ -7093,7 +6959,7 @@ public class GMFGenPackageImpl extends EPackageImpl implements GMFGenPackage {
addEOperation(genLabelEClass, theGenModelPackage.getGenFeature(), "getMetaFeatures", 0, -1);
initEClass(genNodeLabelEClass, GenNodeLabel.class, "GenNodeLabel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getGenNodeLabel_Node(), this.getGenNode(), this.getGenNode_Labels(), "node", null, 1, 1, GenNodeLabel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getGenNodeLabel_Node(), this.getGenNode(), this.getGenNode_Labels(), "node", null, 1, 1, GenNodeLabel.class, !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(genExternalNodeLabelEClass, GenExternalNodeLabel.class, "GenExternalNodeLabel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GenNodeLabelImpl.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GenNodeLabelImpl.java
index bf5fd205c..fa1784c05 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GenNodeLabelImpl.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GenNodeLabelImpl.java
@@ -6,12 +6,9 @@
*/
package org.eclipse.gmf.codegen.gmfgen.impl;
-import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.gmf.codegen.gmfgen.GMFGenPackage;
import org.eclipse.gmf.codegen.gmfgen.GenDiagram;
import org.eclipse.gmf.codegen.gmfgen.GenNode;
@@ -65,44 +62,13 @@ public class GenNodeLabelImpl extends GenLabelImpl implements GenNodeLabel {
* <!-- end-user-doc -->
* @generated
*/
- public NotificationChain basicSetNode(GenNode newNode, NotificationChain msgs) {
- msgs = eBasicSetContainer((InternalEObject)newNode, GMFGenPackage.GEN_NODE_LABEL__NODE, msgs);
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setNode(GenNode newNode) {
- if (newNode != eInternalContainer() || (eContainerFeatureID != GMFGenPackage.GEN_NODE_LABEL__NODE && newNode != null)) {
- if (EcoreUtil.isAncestor(this, newNode))
- throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
- NotificationChain msgs = null;
- if (eInternalContainer() != null)
- msgs = eBasicRemoveFromContainer(msgs);
- if (newNode != null)
- msgs = ((InternalEObject)newNode).eInverseAdd(this, GMFGenPackage.GEN_NODE__LABELS, GenNode.class, msgs);
- msgs = basicSetNode(newNode, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, GMFGenPackage.GEN_NODE_LABEL__NODE, newNode, newNode));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
@Override
public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch (featureID) {
case GMFGenPackage.GEN_NODE_LABEL__NODE:
if (eInternalContainer() != null)
msgs = eBasicRemoveFromContainer(msgs);
- return basicSetNode((GenNode)otherEnd, msgs);
+ return eBasicSetContainer(otherEnd, GMFGenPackage.GEN_NODE_LABEL__NODE, msgs);
}
return super.eInverseAdd(otherEnd, featureID, msgs);
}
@@ -116,7 +82,7 @@ public class GenNodeLabelImpl extends GenLabelImpl implements GenNodeLabel {
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch (featureID) {
case GMFGenPackage.GEN_NODE_LABEL__NODE:
- return basicSetNode(null, msgs);
+ return eBasicSetContainer(null, GMFGenPackage.GEN_NODE_LABEL__NODE, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -155,36 +121,6 @@ public class GenNodeLabelImpl extends GenLabelImpl implements GenNodeLabel {
* @generated
*/
@Override
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case GMFGenPackage.GEN_NODE_LABEL__NODE:
- setNode((GenNode)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID) {
- switch (featureID) {
- case GMFGenPackage.GEN_NODE_LABEL__NODE:
- setNode((GenNode)null);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
public boolean eIsSet(int featureID) {
switch (featureID) {
case GMFGenPackage.GEN_NODE_LABEL__NODE:

Back to the top