diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/EditPart.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/EditPart.java
index 44690c40d..e4f13837e 100644
--- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/EditPart.java
+++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/EditPart.java
@@ -56,12 +56,6 @@ public EditPart getParent() {
 	//
 	////////////////////////////////////////////////////////////////////////////
 
-	/**
-	 * When existing {@link EditPart} reused for new model, this method will be invoked.
-	 */
-	protected void updateModel() {
-	}
-
 	/**
 	 * Returns a <code>List</code> containing the children model objects. If this {@link EditPart}'s
 	 * model is a container, this method should be overridden to returns its children. This is what
@@ -153,7 +147,6 @@ protected void refreshChildren() {
 					childPart.unregister();
 					childPart.setModel(model);
 					childPart.register();
-					childPart.updateModel();
 				}
 				// reorder child EditPart
 				removeChildVisual(childPart);
diff --git a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/JTabbedPaneTabEditPart.java b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/JTabbedPaneTabEditPart.java
index 2ce1281b9..a76599ac7 100644
--- a/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/JTabbedPaneTabEditPart.java
+++ b/org.eclipse.wb.swing/src/org/eclipse/wb/internal/swing/gef/part/JTabbedPaneTabEditPart.java
@@ -32,7 +32,6 @@
  * @coverage swing.gef.part
  */
 public final class JTabbedPaneTabEditPart extends DesignEditPart {
-	private JTabbedPaneTabInfo m_component;
 
 	////////////////////////////////////////////////////////////////////////////
 	//
@@ -40,8 +39,7 @@ public final class JTabbedPaneTabEditPart extends DesignEditPart {
 	//
 	////////////////////////////////////////////////////////////////////////////
 	public JTabbedPaneTabEditPart(JTabbedPaneTabInfo component) {
-		m_component = component;
-		setModel(m_component);
+		setModel(component);
 	}
 
 	////////////////////////////////////////////////////////////////////////////
@@ -50,8 +48,8 @@ public JTabbedPaneTabEditPart(JTabbedPaneTabInfo component) {
 	//
 	////////////////////////////////////////////////////////////////////////////
 	@Override
-	protected void updateModel() {
-		m_component = (JTabbedPaneTabInfo) getModel();
+	public JTabbedPaneTabInfo getModel() {
+		return (JTabbedPaneTabInfo) super.getModel();
 	}
 
 	////////////////////////////////////////////////////////////////////////////
@@ -66,7 +64,7 @@ protected IFigure createFigure() {
 
 	@Override
 	protected void refreshVisuals() {
-		Rectangle bounds = m_component.getBounds();
+		Rectangle bounds = getModel().getBounds();
 		getFigure().setBounds(bounds);
 	}
 
@@ -83,7 +81,7 @@ protected void createEditPolicies() {
 	@Override
 	public void performRequest(Request request) {
 		if (request.getType() == RequestConstants.REQ_OPEN) {
-			m_component.getPane().setActiveComponent(m_component.getComponent());
+			getModel().getPane().setActiveComponent(getModel().getComponent());
 		}
 	}
 }