rework images

author: Brian Vosburgh 2012-12-07 16:29:32 +0000
committer: Brian Vosburgh 2012-12-07 16:54:08 +0000
commit: 1e389f86244bbe4e970b7df05f27a1bcee415f13 (patch)
tree: 62f5d3bdae0deba8268f6feacdb75d48383e54e0
parent: 931700a7d41a409b97fe68d1209b8022e8504525 (diff)
download: webtools.dali-1e389f86244bbe4e970b7df05f27a1bcee415f13.tar.gz
webtools.dali-1e389f86244bbe4e970b7df05f27a1bcee415f13.tar.xz
webtools.dali-1e389f86244bbe4e970b7df05f27a1bcee415f13.zip
653 files changed, 8975 insertions, 11714 deletions
diff --git a/common/plugins/org.eclipse.jpt.common.core/schema/libraryValidators.exsd b/common/plugins/org.eclipse.jpt.common.core/schema/libraryValidators.exsd
index de22d26281..106e5f92c1 100644
--- a/common/plugins/org.eclipse.jpt.common.core/schema/libraryValidators.exsd
+++ b/common/plugins/org.eclipse.jpt.common.core/schema/libraryValidators.exsd
@@ -92,7 +92,7 @@ The following example is the included generic library validator, which is used f
    point=&quot;org.eclipse.jpt.common.core.libraryValidators&quot;&gt;
    &lt;libraryValidator
       id=&quot;genericUserLibraryValidator&quot;
-      class=&quot;org.eclipse.jpt.core.internal.libval.GenericJpaUserLibraryValidator&quot;&gt;
+      class=&quot;org.eclipse.jpt.jpa.core.internal.libval.GenericJpaUserLibraryValidator&quot;&gt;
       &lt;enablement&gt;
          &lt;with variable=&quot;libraryProvider&quot;&gt;
             &lt;test property=&quot;org.eclipse.jpt.core.extendsId&quot; value=&quot;jpa-user-library-provider&quot;/&gt;
diff --git a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/utility/command/CommandJobCommandAdapter.java b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/utility/command/CommandJobCommandAdapter.java
index 36e837913e..fd69870adb 100644
--- a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/utility/command/CommandJobCommandAdapter.java
+++ b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/utility/command/CommandJobCommandAdapter.java
@@ -18,26 +18,37 @@ import org.eclipse.jpt.common.utility.internal.ObjectTools;
 
 /**
  * Adapt a {@link Command} to the {@link JobCommand} interface.
- * Necessarily, the progress monitor is ignored and a status of
- * OK is returned.
+ * The adapter can also be configured to return a particular
+ * {@link IStatus status}, by default {@link Status#OK}.
+ * Necessarily, the progress monitor is checked only once, just
+ * before the {@link Command} is {@link Command#execute() executed}.
  */
 public class CommandJobCommandAdapter
 	implements JobCommand
 {
 	private final Command command;
+	private final IStatus status;
 
 
 	public CommandJobCommandAdapter(Command command) {
+		this(command, Status.OK_STATUS);
+	}
+
+	public CommandJobCommandAdapter(Command command, IStatus status) {
 		super();
-		if (command == null) {
+		if ((command == null) || (status == null)) {
 			throw new NullPointerException();
 		}
 		this.command = command;
+		this.status = status;
 	}
 
 	public IStatus execute(IProgressMonitor monitor) {
+		if (monitor.isCanceled()) {
+			return Status.CANCEL_STATUS;
+		}
 		this.command.execute();
-		return Status.OK_STATUS;
+		return this.status;
 	}
 
 	@Override
diff --git a/common/plugins/org.eclipse.jpt.common.ui/build.properties b/common/plugins/org.eclipse.jpt.common.ui/build.properties
index 09040302a1..60d75fdfcc 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/build.properties
+++ b/common/plugins/org.eclipse.jpt.common.ui/build.properties
@@ -13,6 +13,7 @@ output.. = bin/
 bin.includes = .,\
                META-INF/,\
                about.html,\
+               images/,\
                plugin.xml,\
                plugin.properties,\
                .options
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/add-connection.gif b/common/plugins/org.eclipse.jpt.common.ui/images/buttons/add-connection.gif
index 864034f74e..864034f74e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/add-connection.gif
+++ b/common/plugins/org.eclipse.jpt.common.ui/images/buttons/add-connection.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/add.png b/common/plugins/org.eclipse.jpt.common.ui/images/buttons/add.png
index 6bd3486b7a..6bd3486b7a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/add.png
+++ b/common/plugins/org.eclipse.jpt.common.ui/images/buttons/add.png
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/browse-mini.png b/common/plugins/org.eclipse.jpt.common.ui/images/buttons/browse-mini.png
index 1f64f24965..1f64f24965 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/browse-mini.png
+++ b/common/plugins/org.eclipse.jpt.common.ui/images/buttons/browse-mini.png
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/browse.png b/common/plugins/org.eclipse.jpt.common.ui/images/buttons/browse.png
index 8081fd9293..8081fd9293 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/browse.png
+++ b/common/plugins/org.eclipse.jpt.common.ui/images/buttons/browse.png
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/collapse-all.png b/common/plugins/org.eclipse.jpt.common.ui/images/buttons/collapse-all.png
index 3582d18d5b..3582d18d5b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/collapse-all.png
+++ b/common/plugins/org.eclipse.jpt.common.ui/images/buttons/collapse-all.png
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/delete.png b/common/plugins/org.eclipse.jpt.common.ui/images/buttons/delete.png
index afba8b4463..afba8b4463 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/delete.png
+++ b/common/plugins/org.eclipse.jpt.common.ui/images/buttons/delete.png
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/deselect-all.png b/common/plugins/org.eclipse.jpt.common.ui/images/buttons/deselect-all.png
index 49544f5703..49544f5703 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/deselect-all.png
+++ b/common/plugins/org.eclipse.jpt.common.ui/images/buttons/deselect-all.png
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/dot.gif b/common/plugins/org.eclipse.jpt.common.ui/images/buttons/dot.gif
index 57a514d649..57a514d649 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/dot.gif
+++ b/common/plugins/org.eclipse.jpt.common.ui/images/buttons/dot.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/edit.png b/common/plugins/org.eclipse.jpt.common.ui/images/buttons/edit.png
index 306d6a1c5f..306d6a1c5f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/edit.png
+++ b/common/plugins/org.eclipse.jpt.common.ui/images/buttons/edit.png
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/expand-all.png b/common/plugins/org.eclipse.jpt.common.ui/images/buttons/expand-all.png
index db729a3990..db729a3990 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/expand-all.png
+++ b/common/plugins/org.eclipse.jpt.common.ui/images/buttons/expand-all.png
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/move-down.png b/common/plugins/org.eclipse.jpt.common.ui/images/buttons/move-down.png
index f6e5281b70..f6e5281b70 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/move-down.png
+++ b/common/plugins/org.eclipse.jpt.common.ui/images/buttons/move-down.png
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/move-up.png b/common/plugins/org.eclipse.jpt.common.ui/images/buttons/move-up.png
index 7c8b1ccf79..7c8b1ccf79 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/move-up.png
+++ b/common/plugins/org.eclipse.jpt.common.ui/images/buttons/move-up.png
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/reconnect.png b/common/plugins/org.eclipse.jpt.common.ui/images/buttons/reconnect.png
index df009468ab..df009468ab 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/reconnect.png
+++ b/common/plugins/org.eclipse.jpt.common.ui/images/buttons/reconnect.png
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/refresh.gif b/common/plugins/org.eclipse.jpt.common.ui/images/buttons/refresh.gif
index 3ca04d06ff..3ca04d06ff 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/refresh.gif
+++ b/common/plugins/org.eclipse.jpt.common.ui/images/buttons/refresh.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/restore-defaults.png b/common/plugins/org.eclipse.jpt.common.ui/images/buttons/restore-defaults.png
index 2d74ae4e01..2d74ae4e01 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/restore-defaults.png
+++ b/common/plugins/org.eclipse.jpt.common.ui/images/buttons/restore-defaults.png
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/select-all.png b/common/plugins/org.eclipse.jpt.common.ui/images/buttons/select-all.png
index 4eaff2beab..4eaff2beab 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/select-all.png
+++ b/common/plugins/org.eclipse.jpt.common.ui/images/buttons/select-all.png
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/file.png b/common/plugins/org.eclipse.jpt.common.ui/images/objects/file.png
index f5c1810a63..f5c1810a63 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/file.png
+++ b/common/plugins/org.eclipse.jpt.common.ui/images/objects/file.png
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/folder.png b/common/plugins/org.eclipse.jpt.common.ui/images/objects/folder.png
index 9759da4e20..9759da4e20 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/folder.png
+++ b/common/plugins/org.eclipse.jpt.common.ui/images/objects/folder.png
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/package.png b/common/plugins/org.eclipse.jpt.common.ui/images/objects/package.png
index 471cc4367d..471cc4367d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/package.png
+++ b/common/plugins/org.eclipse.jpt.common.ui/images/objects/package.png
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/warning.gif b/common/plugins/org.eclipse.jpt.common.ui/images/objects/warning.gif
index 14009e9974..14009e9974 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/warning.gif
+++ b/common/plugins/org.eclipse.jpt.common.ui/images/objects/warning.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/overlays/error.gif b/common/plugins/org.eclipse.jpt.common.ui/images/overlays/error.gif
index 119dcccd5a..119dcccd5a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/overlays/error.gif
+++ b/common/plugins/org.eclipse.jpt.common.ui/images/overlays/error.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/overlays/warning.png b/common/plugins/org.eclipse.jpt.common.ui/images/overlays/warning.png
index 8c1e86c479..8c1e86c479 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/overlays/warning.png
+++ b/common/plugins/org.eclipse.jpt.common.ui/images/overlays/warning.png
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/JptCommonUiImages.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/JptCommonUiImages.java
new file mode 100644
index 0000000000..bb183aad2c
--- /dev/null
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/JptCommonUiImages.java
@@ -0,0 +1,126 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ *
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.common.ui;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jpt.common.ui.internal.plugin.JptCommonUiPlugin;
+import org.eclipse.swt.SWT;
+
+/**
+ * Actually, just the image descriptors....
+ * <p>
+ * Code should use these constants to acquire (and release) the images provided
+ * by Dali. The images should be managed by a
+ * {@link org.eclipse.jface.resource.ResourceManager "local" resource manager}.
+ * <p>
+ * Also, the {@link org.eclipse.ui.IWorkbench Eclipse workbench} supplies more
+ * general purpose {@link org.eclipse.ui.ISharedImages images}.
+ * 
+ * @see org.eclipse.jface.resource.ResourceManager#createImage(ImageDescriptor)
+ * @see org.eclipse.jface.resource.ResourceManager#createImageWithDefault(ImageDescriptor)
+ * @see org.eclipse.jface.resource.ResourceManager#destroyImage(ImageDescriptor)
+ * @see org.eclipse.core.runtime.FileLocator#find(org.osgi.framework.Bundle, org.eclipse.core.runtime.IPath, java.util.Map)
+ * @see org.eclipse.ui.IWorkbench#getSharedImages()
+ * @see org.eclipse.ui.ISharedImages
+ */
+@SuppressWarnings("nls")
+public final class JptCommonUiImages {
+
+	// ********** Dali standard directories **********
+
+	/**
+	 * @see org.eclipse.core.runtime.FileLocator#find(org.osgi.framework.Bundle, org.eclipse.core.runtime.IPath, java.util.Map)
+	 */
+	public static final String LOCALE = "$nl$";
+	public static final String LOCALE_ = LOCALE + '/';
+
+	public static final String IMAGES = LOCALE_ + "images";
+	public static final String IMAGES_ = IMAGES + '/';
+
+	public static final String BUTTONS = IMAGES_ + "buttons";
+	public static final String BUTTONS_ = BUTTONS + '/';
+
+	public static final String OBJECTS = IMAGES_ + "objects";
+	public static final String OBJECTS_ = OBJECTS + '/';
+
+	public static final String OVERLAYS = IMAGES_ + "overlays";
+	public static final String OVERLAYS_ = OVERLAYS + '/';
+
+	public static final String VIEWS = IMAGES_ + "views";
+	public static final String VIEWS_ = VIEWS + '/';
+
+	public static final String WIZARDS = IMAGES_ + "wizards";
+	public static final String WIZARDS_ = WIZARDS + '/';
+
+
+	// ********** buttons **********
+
+	public static final ImageDescriptor DOT_BUTTON = buildImageDescriptor(BUTTONS_ + "dot.gif");
+	public static final ImageDescriptor ADD_BUTTON = buildImageDescriptor(BUTTONS_ + "add.png");
+	public static final ImageDescriptor EDIT_BUTTON = buildImageDescriptor(BUTTONS_ + "edit.png");
+	public static final ImageDescriptor DELETE_BUTTON = buildImageDescriptor(BUTTONS_ + "delete.png");
+	public static final ImageDescriptor MOVE_UP_BUTTON = buildImageDescriptor(BUTTONS_ + "move-up.png");
+	public static final ImageDescriptor MOVE_DOWN_BUTTON = buildImageDescriptor(BUTTONS_ + "move-down.png");
+	public static final ImageDescriptor EXPAND_ALL_BUTTON = buildImageDescriptor(BUTTONS_ + "expand-all.png");
+	public static final ImageDescriptor COLLAPSE_ALL_BUTTON = buildImageDescriptor(BUTTONS_ + "collapse-all.png");
+	public static final ImageDescriptor RESTORE_DEFAULTS_BUTTON = buildImageDescriptor(BUTTONS_ + "restore-defaults.png");
+	public static final ImageDescriptor BROWSE_BUTTON = buildImageDescriptor(BUTTONS_ + "browse.png");
+	public static final ImageDescriptor MINI_BROWSE_BUTTON = buildImageDescriptor(BUTTONS_ + "browse-mini.png");
+	public static final ImageDescriptor SELECT_ALL_BUTTON = buildImageDescriptor(BUTTONS_ + "select-all.png");
+	public static final ImageDescriptor DESELECT_ALL_BUTTON = buildImageDescriptor(BUTTONS_ + "deselect-all.png");
+	public static final ImageDescriptor REFRESH_BUTTON = buildImageDescriptor(BUTTONS_ + "refresh.gif");
+	public static final ImageDescriptor ADD_CONNECTION_BUTTON = buildImageDescriptor(BUTTONS_ + "add-connection.gif");
+	public static final ImageDescriptor RECONNECT_BUTTON = buildImageDescriptor(BUTTONS_ + "reconnect.png");
+
+
+	// ********** objects **********
+
+	public static final ImageDescriptor FILE = buildImageDescriptor(OBJECTS_ + "file.png");
+	public static final ImageDescriptor FOLDER = buildImageDescriptor(OBJECTS_ + "folder.png");
+	public static final ImageDescriptor PACKAGE = buildImageDescriptor(OBJECTS_ + "package.png");
+	public static final ImageDescriptor WARNING = buildImageDescriptor(OBJECTS_ + "warning.gif");
+
+
+	// ********** overlays **********
+
+	public static final ImageDescriptor ERROR_OVERLAY = buildImageDescriptor(OVERLAYS_ + "error.gif");
+	public static final ImageDescriptor WARNING_OVERLAY = buildImageDescriptor(OVERLAYS_ + "warning.png");
+
+
+	// ********** misc **********
+
+	/**
+	 * If the specified flag is <code>true</code>, return an image descriptor
+	 * corresponding to the specified descriptor "grayed" out; otherwise return
+	 * the specified descriptor unchanged.
+	 * @see SWT#IMAGE_GRAY
+	 */
+	public static ImageDescriptor gray(ImageDescriptor descriptor, boolean gray) {
+		return gray ? gray(descriptor) : descriptor;
+	}
+
+	/**
+	 * Return an image descriptor corresponding to the specified image
+	 * descriptor "grayed" out.
+	 * @see org.eclipse.swt.graphics.Image#Image(org.eclipse.swt.graphics.Device, org.eclipse.swt.graphics.Image, int)
+	 * @see SWT#IMAGE_GRAY
+	 */
+	public static ImageDescriptor gray(ImageDescriptor descriptor) {
+		return ImageDescriptor.createWithFlags(descriptor, SWT.IMAGE_GRAY);
+	}
+
+	private static ImageDescriptor buildImageDescriptor(String path) {
+		return JptCommonUiPlugin.instance().buildImageDescriptor(path);
+	}
+
+	private JptCommonUiImages() {
+		throw new UnsupportedOperationException();
+	}
+}
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/WidgetFactory.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/WidgetFactory.java
index 6526be1374..f6cfa81e0e 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/WidgetFactory.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/WidgetFactory.java
@@ -37,179 +37,136 @@ import org.eclipse.ui.forms.widgets.Section;
  * @since 2.0
  */
 public interface WidgetFactory {
-
 	/**
-	 * Creates a new regular button.
-	 *
-	 * @param parent The parent container
-	 * @param text The button's text
-	 * @return A new <code>Button</code>
+	 * Create a new regular button with the specified parent and text.
+	 * @see #createCheckBox(Composite, String)
+	 * @see #createPushButton(Composite, String)
+	 * @see #createRadioButton(Composite, String)
 	 */
 	Button createButton(Composite parent, String text);
 
 	/**
-	 * Creates a new check box button.
-	 *
-	 * @param parent The parent container
-	 * @param text The button's text
-	 * @return A new <code>Button</code>
+	 * Create a new check box with the specified parent and text.
+	 * @see #createButton(Composite, String)
+	 * @see #createPushButton(Composite, String)
+	 * @see #createRadioButton(Composite, String)
 	 */
 	Button createCheckBox(Composite parent, String text);
 
 	/**
-	 * Creates a new non-editable <code>Combo</code>.
-	 *
-	 * @param parent The parent container
-	 * @return A new <code>Combo</code>
+	 * Create a new drop-down list box with the specified parent.
 	 */
 	Combo createCombo(Composite parent);
 
 	/**
-	 * Creates a new container.
-	 *
-	 * @param parent The parent container
-	 * @return A new <code>Composite</code>
+	 * Create a new composite with the specified parent.
 	 */
 	Composite createComposite(Composite parent);
 
 	/**
-	 * Creates a new DateTime.
-	 *
-	 * @param container The parent container
-	 * @param style The style is to tell the type of widget
-	 * (<code>SWT.DATE</code> or <code>SWT.TIME</code> or <code>SWT.CALENDAR</code>)
-	 * @return A new <code>DateTime</code>
+	 * Create a new date time widget with the specified parent and style.
+	 * @see org.eclipse.swt.SWT#DATE
+	 * @see org.eclipse.swt.SWT#TIME
+	 * @see org.eclipse.swt.SWT#CALENDAR
 	 */
 	DateTime createDateTime(Composite parent, int style);
 
 	/**
-	 * Creates a new editable <code>Combo</code>.
-	 *
-	 * @param parent The parent container
-	 * @return A new <code>Combo</code>
+	 * Create a new combo-box with the specified parent.
 	 */
 	Combo createEditableCombo(Composite parent);
 
 	/**
-	 * Creates a new titled pane (group box).
-	 *
-	 * @param parent The parent container
-	 * @param title The group pane's title
-	 * @return A new <code>Group</code>
+	 * Create a new group box with the specified parent and title.
 	 */
 	Group createGroup(Composite parent, String title);
 
 	/**
-	 * Creates a new label that is shown as a hyperlink.
-	 *
-	 * @param parent The parent container
-	 * @param text The label's text
-	 * @return A new <code>Hyperlink</code>
+	 * Create a new hyperlink label with the specified parent and
+	 * text.
 	 */
 	Hyperlink createHyperlink(Composite parent, String text);
 
 	/**
-	 * Creates a new label.
-	 *
-	 * @param container The parent container
-	 * @param labelText The label's text
-	 * @return A new <code>Label</code>
+	 * Create a new label with the specified parent and text.
 	 */
-	Label createLabel(Composite container, String labelText);
+	Label createLabel(Composite parent, String text);
 
 	/**
-	 * Creates a new list.
-	 *
-	 * @param container The parent container
-	 * @param style The style is usually to tell what type of selection
-	 * (<code>SWT.MULTI</code> or <code>SWT.SINGLE</code>)
-	 * @return A new <code>Label</code>
+	 * Create a new list box with the specified parent and style.
+	 * @see org.eclipse.swt.SWT#MULTI
+	 * @see org.eclipse.swt.SWT#SINGLE
 	 */
-	List createList(Composite container, int style);
+	List createList(Composite parent, int style);
 
 	/**
-	 * Creates a new editable text area.
-	 *
-	 * @param parent The parent container
-	 * @param parent The number of lines the text area should display
-	 * @return A new <code>Text</code>
+	 * Create a new editable multi-line text field with the specified parent.
 	 */
 	Text createMultiLineText(Composite parent);
 
 	/**
-	 * Creates a new editable text field that handles password.
-	 *
-	 * @param container The parent container
-	 * @return A new <code>Text</code>
+	 * Create a new editable password text field with the specified parent.
 	 */
-	Text createPasswordText(Composite container);
+	Text createPasswordText(Composite parent);
 
 	/**
-	 * Creates a new push button (toggle between selected and unselected).
-	 *
-	 * @param parent The parent container
-	 * @param text The button's text
-	 * @return A new <code>Button</code>
+	 * Create a new push button (i.e. a button that toggles between
+	 * <em>selected</em> and <em>unselected</em>) with the specified parent and
+	 * text.
+	 * @see #createButton(Composite, String)
+	 * @see #createCheckBox(Composite, String)
+	 * @see #createRadioButton(Composite, String)
 	 */
 	Button createPushButton(Composite parent, String text);
 
 	/**
-	 * Creates a new radio button.
-	 *
-	 * @param parent The parent container
-	 * @param text The button's text
-	 * @return A new <code>Button</code>
+	 * Create a new radio button with the specified parent and text.
+	 * @see #createButton(Composite, String)
+	 * @see #createCheckBox(Composite, String)
+	 * @see #createPushButton(Composite, String)
 	 */
 	Button createRadioButton(Composite parent, String text);
 
 	/**
-	 * Creates a new section, which is a collapsable pane with a title bar.
-	 *
-	 * @param parent The parent container
-	 * @param style The style of the title bar, which can be
-	 * <code>ExpandableComposite.TWISTIE</code> and
-	 * <code>ExpandableComposite.TITLE_BAR</code> and
-	 * <code>ExpandableComposite.EXPANDED</code>
-	 * @return A new <code>Section</code>
+	 * Create a new section (i.e. a collapsible group box) with the specified
+	 * parent and expansion style.
+	 * @see org.eclipse.ui.forms.widgets.ExpandableComposite#TWISTIE
+	 * @see org.eclipse.ui.forms.widgets.ExpandableComposite#TREE_NODE
+	 * @see org.eclipse.ui.forms.widgets.ExpandableComposite#FOCUS_TITLE
+	 * @see org.eclipse.ui.forms.widgets.ExpandableComposite#CLIENT_INDENT
+	 * @see org.eclipse.ui.forms.widgets.ExpandableComposite#COMPACT
+	 * @see org.eclipse.ui.forms.widgets.ExpandableComposite#EXPANDED
+	 * @see org.eclipse.ui.forms.widgets.ExpandableComposite#TITLE_BAR
+	 * @see org.eclipse.ui.forms.widgets.ExpandableComposite#SHORT_TITLE_BAR
+	 * @see org.eclipse.ui.forms.widgets.ExpandableComposite#NO_TITLE
+	 * @see org.eclipse.ui.forms.widgets.ExpandableComposite#LEFT_TEXT_CLIENT_ALIGNMENT
+	 * @see org.eclipse.ui.forms.widgets.ExpandableComposite#NO_TITLE_FOCUS_BOX
+	 * @see org.eclipse.ui.forms.widgets.Section#DESCRIPTION
 	 */
-	Section createSection(Composite parent, int style);
+	Section createSection(Composite parent, int expansionStyle);
 
 	/**
-	 * Creates a new spinner.
-	 *
-	 * @param parent The parent container
-	 * @return A new <code>Spinner</code>
+	 * Create a new spinner with the specified parent.
 	 */
 	Spinner createSpinner(Composite parent);
 
 	/**
-	 * Creates a new table.
-	 *
-	 * @param container The parent container
-	 * @param style The style to apply to the table
-	 * @return A new <code>Table</code>
+	 * Create a new table with the specified parent.
 	 */
 	Table createTable(Composite parent, int style);
 
 	/**
-	 * Creates a new editable text field.
-	 *
-	 * @param container The parent container
-	 * @return A new <code>Text</code>
+	 * Create a new editable text field with the specified parent.
 	 */
 	Text createText(Composite parent);
 
 	/**
-	 * Creates a new tri-state check box.
-	 *
-	 * @param parent The parent container
-	 * @param text The button's text
-	 * @return A new <code>Button</code> that has 3 selection states
+	 * Create a new tri-state check box with the specified parent and text.
 	 */
 	Button createTriStateCheckBox(Composite parent, String text);
 
 	/**
-	 * Dispose of the widget factory
+	 * Dispose the widget factory.
 	 */
 	void dispose();
-}
-\ No newline at end of file
+}
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/JptUIPlugin.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/JptUIPlugin.java
index e6de59a66d..c686e1e902 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/JptUIPlugin.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/JptUIPlugin.java
@@ -16,26 +16,19 @@ import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.draw2d.ImageUtilities;
 import org.eclipse.jface.dialogs.DialogSettings;
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.jpt.common.core.internal.utility.JptPlugin;
-import org.eclipse.jpt.common.ui.internal.util.SWTUtil;
 import org.eclipse.jpt.common.utility.internal.StringTools;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.preferences.ScopedPreferenceStore;
 import org.osgi.framework.Bundle;
 
 /**
  * Common Dali UI plug-in behavior:<ul>
  * <li>dialog settings
- * <li>image registry
+ * <li>image descriptor
  * <li>UI preference store
  * </ul>
  */
@@ -44,7 +37,6 @@ public abstract class JptUIPlugin
 {
 	// NB: the plug-in must be synchronized whenever accessing any of this state
 	private IDialogSettings dialogSettings;
-	private ImageRegistry imageRegistry;
 	private IPreferenceStore preferenceStore;
 
 
@@ -67,15 +59,11 @@ public abstract class JptUIPlugin
 	@Override
 	protected void stop_() throws Exception {
 		try {
-			if (this.imageRegistry != null) {
-				this.imageRegistry.dispose();
-			}
 			if (this.dialogSettings != null) {
 				this.saveDialogSettings();
 			}
 		} finally {
 			this.preferenceStore = null;
-			this.imageRegistry = null;
 			this.dialogSettings = null;
 			super.stop_();
 		}
@@ -177,184 +165,30 @@ public abstract class JptUIPlugin
 	protected static final String SIMPLE_DIALOG_SETTINGS_FILE_NAME = "dialog_settings.xml"; //$NON-NLS-1$
 
 
-	// ********** images **********
+	// ********** image descriptor **********
 
 	/**
-	 * Return a "normal" (as opposed to "ghost") image for the specified key.
-	 * The key will be transformed into the name of a
-	 * <code>.gif</code> file in the plug-in's <code>icons</code> folder.
-	 * This image is built, held, and disposed by the plug-in.
+	 * Build an image descriptor for the image file with the specified path
+	 * in the plug-in's bundle.
 	 * 
-	 * @see #getGhostImage(String)
-	 * @see #getImage(String, boolean)
 	 * @see org.eclipse.ui.IWorkbench#getSharedImages()
+	 * @see org.eclipse.ui.ISharedImages#getImageDescriptor(String)
+	 * @see FileLocator#find(Bundle, IPath, java.util.Map)
 	 */
-	public Image getImage(String key) {
-		return this.getImage(key, false); // false = normal (non-ghost)
-	}
-
-	/**
-	 * Return a "ghost" image for the specified key.
-	 * The key will be transformed into the name of a
-	 * <code>.gif</code> file in the plug-in's <code>icons</code> folder.
-	 * This image is built, held, and disposed by the plug-in.
-	 * 
-	 * @see #getImage(String)
-	 * @see #getImage(String, boolean)
-	 * @see org.eclipse.ui.IWorkbench#getSharedImages()
-	 */
-	public Image getGhostImage(String key) {
-		return this.getImage(key, true); // true = ghost
-	}
-
-	/**
-	 * Return an image for the specified key. "Ghost" the image if the specified
-	 * flag is <code>true</code>.
-	 * The key will be transformed into the name of a
-	 * <code>.gif</code> file in the plug-in's <code>icons</code> folder.
-	 * This image is built, held, and disposed by the plug-in.
-	 * 
-	 * @see #getGhostImage(String)
-	 * @see #getImage(String)
-	 * @see org.eclipse.ui.IWorkbench#getSharedImages()
-	 */
-	public Image getImage(String key, boolean ghost) {
-		this.checkImageKey(key);
-		ImageRegistry registry = this.getImageRegistry();
-		if (registry == null) {
-			return null;
-		}
-		// lock the registry while retrieving (and possibly building) the image
-		synchronized (registry) {
-			return ghost ? this.getGhostImage(registry, key) : this.getImage(registry, key);
-		}
-	}
-
-	/**
-	 * Pre-condition: The specified registry is <code>synchronized</code>.
-	 */
-	protected Image getGhostImage(ImageRegistry registry, String key) {
-		String ghostKey = this.buildGhostImageKey(key);
-		Image ghostImage = registry.get(ghostKey);
-		if (ghostImage == null) {
-			ghostImage = this.buildGhostImage(registry, key);
-			registry.put(ghostKey, ghostImage);
-		}
-		return ghostImage;
-	}
-
-	protected String buildGhostImageKey(String key) {
-		return key + '-' + this.getGhostImageKeySuffix();
-	}
-
-	protected String getGhostImageKeySuffix() {
-		return GHOST_IMAGE_KEY_SUFFIX;
-	}
-
-	/**
-	 * Value: <code>{@value}</code>
-	 */
-	protected static final String GHOST_IMAGE_KEY_SUFFIX = "gray"; //$NON-NLS-1$
-
-	protected Image buildGhostImage(ImageRegistry registry, String key) {
-		Image image = this.getImage(registry, key);
-		Color lightGray = new Color(image.getDevice(), 223, 223, 223);
-		Image shadedImage = new Image(image.getDevice(), ImageUtilities.createShadedImage(image, lightGray));
-		Image ghostImage = new Image(image.getDevice(), shadedImage, SWT.IMAGE_GRAY);
-		shadedImage.dispose();
-		lightGray.dispose();
-		return ghostImage;
-	}
-
-	/**
-	 * Pre-condition: The specified registry is <code>synchronized</code>.
-	 */
-	protected Image getImage(ImageRegistry registry, String key) {
-		Image image = registry.get(key);
-		if (image == null) {
-			// a bad image descriptor will result in a "default" image
-			registry.put(key, this.buildImageDescriptor_(key));
-			image = registry.get(key);
+	public ImageDescriptor buildImageDescriptor(String path) {
+		if (StringTools.isBlank(path)) {
+			throw new IllegalArgumentException("image path cannot be blank"); //$NON-NLS-1$
 		}
-		return image;
-	}
 
-	/**
-	 * Return an image descriptor for the specified key.
-	 * The key will be transformed into the name of a
-	 * <code>.gif</code> file in the plug-in's <code>icons</code> folder.
-	 */
-	public ImageDescriptor buildImageDescriptor(String key) {
-		this.checkImageKey(key);
-		return this.buildImageDescriptor_(key);
-	}
-
-	/**
-	 * Pre-condition: the specified key is not blank.
-	 */
-	protected ImageDescriptor buildImageDescriptor_(String key) {
 		Bundle bundle = this.getBundle();
 		if (bundle == null) {
 			return null;
 		}
 
-		IPath path = this.buildImageFilePath(key);
-		URL url = FileLocator.find(bundle, path, null);
+		URL url = FileLocator.find(bundle, new Path(path), null);
 		return (url == null) ? null : ImageDescriptor.createFromURL(url);
 	}
 
-	protected IPath buildImageFilePath(String key) {
-		return new Path(this.buildRelativeImageFileName(key));
-	}
-
-	protected String buildRelativeImageFileName(String key) {
-		return this.getRelativeImageDirectoryName() + '/' + key + '.' + this.getImageFileExt();
-	}
-
-	protected String getRelativeImageDirectoryName() {
-		return RELATIVE_IMAGE_DIRECTORY_NAME;
-	}
-	/**
-	 * Value: <code>{@value}</code>
-	 */
-	protected static final String RELATIVE_IMAGE_DIRECTORY_NAME = "icons"; //$NON-NLS-1$
-
-	protected String getImageFileExt() {
-		return IMAGE_FILE_EXT;
-	}
-	/**
-	 * Value: <code>{@value}</code>
-	 */
-	protected static final String IMAGE_FILE_EXT = "gif"; //$NON-NLS-1$
-
-	protected void checkImageKey(String key) {
-		if (StringTools.isBlank(key)) {
-			throw new IllegalArgumentException("image key cannot be blank"); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Return the UI plug-in's image registry.
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#getImageRegistry()
-	 */
-	protected synchronized ImageRegistry getImageRegistry() {
-		if ((this.imageRegistry == null) && this.isActive()) {
-			this.imageRegistry = this.buildImageRegistry();
-		}
-		return this.imageRegistry;
-	}
-
-	// TODO the image registry holds icons for the life of the plug-in
-	// (i.e. until the workspace is closed). This is better than before when
-	// we constantly created new images(!), but:
-	// Bug 306437 is about cleaning this up and using Local Resource Managers
-	// on our views so that closing the JPA perspective would mean the icons are disposed.
-	// But then do we have multiple versions of the same icon?
-	protected ImageRegistry buildImageRegistry() {
-		Display display = SWTUtil.getDisplay();
-		return (display == null) ? null : new ImageRegistry(display);
-	}
-
 
 	// ********** preference store **********
 
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/AbstractItemExtendedLabelProvider.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/AbstractItemExtendedLabelProvider.java
index 04e43cc468..42b0c33e77 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/AbstractItemExtendedLabelProvider.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/AbstractItemExtendedLabelProvider.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.common.ui.internal.jface;
 
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider;
 import org.eclipse.jpt.common.ui.jface.ItemLabelProvider;
 import org.eclipse.jpt.common.utility.internal.ObjectTools;
@@ -21,13 +22,13 @@ import org.eclipse.swt.graphics.Image;
 /**
  * Abstract {@link ItemLabelProvider} that provides support for listening to an
  * {@link #item} and notifying the
- * {@link org.eclipse.jpt.common.ui.jface.ItemLabelProvider.Manager manager}
+ * {@link org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider.Manager manager}
  * whenever the item changes in a significant way.
  * <p>
  * Subclasses can implement the following methods if the corresponding aspects
  * of the {@link #item} change:<ul>
- * <li>{@link #buildImageModel()}<br>
- * 	   Return a {@link PropertyValueModel} that represents the item's image
+ * <li>{@link #buildImageDescriptorModel()}<br>
+ * 	   Return a {@link PropertyValueModel} that represents the item's image descriptor
  * <li>{@link #buildTextModel()}<br>
  * 	   Return a {@link PropertyValueModel} that represents the item's text
  * <li>{@link #buildDescriptionModel()}<br>
@@ -35,35 +36,46 @@ import org.eclipse.swt.graphics.Image;
  * </ul>
  * Alternatively, subclasses can implement the following methods if the
  * corresponding aspects of the {@link #item} do <em>not</em> change:<ul>
- * <li>{@link #getImage()}<br>
- * 	   Return the item's image
+ * <li>{@link #getImageDescriptor()}<br>
+ * 	   Return the item's image descriptor
  * <li>{@link #getText()}<br>
  * 	   Return the item's text
  * <li>{@link #getDescription()}<br>
  * 	   Return the item's description
  * </ul>
- * For each aspect (image, text, and description) one and only one of the two
- * methods must be overridden.
+ * For each aspect (image descriptor, text, and description) one and only one
+ * of the two methods must be overridden.
  * 
  * @see StaticItemExtendedLabelProvider
  */
 public abstract class AbstractItemExtendedLabelProvider<I>
 	implements ItemExtendedLabelProvider
 {
-	protected final ItemLabelProvider.Manager manager;
-
 	protected final I item;
 
-	protected volatile PropertyChangeListener listener;
+	protected final ItemExtendedLabelProvider.Manager manager;
+
+	protected volatile PropertyValueModel<ImageDescriptor> imageDescriptorModel;
 
-	protected volatile PropertyValueModel<Image> imageModel;
+	protected volatile PropertyChangeListener imageDescriptorListener;
 
 	protected volatile PropertyValueModel<String> textModel;
 
+	protected volatile PropertyChangeListener textListener;
+
 	protected volatile PropertyValueModel<String> descriptionModel;
 
+	protected volatile PropertyChangeListener descriptionListener;
 
-	protected AbstractItemExtendedLabelProvider(I item, ItemLabelProvider.Manager manager) {
+
+	protected AbstractItemExtendedLabelProvider(I item, ItemExtendedLabelProvider.Manager manager) {
+		super();
+		if (item == null) {
+			throw new NullPointerException();
+		}
+		if (manager == null) {
+			throw new NullPointerException();
+		}
 		this.item = item;
 		this.manager = manager;
 	}
@@ -71,41 +83,80 @@ public abstract class AbstractItemExtendedLabelProvider<I>
 
 	// ********** image **********
 
-	public Image getImage() {
-		return this.getImageModel().getValue();
+	public final Image getImage() {
+		ImageDescriptor descriptor = this.getImageDescriptor();
+		return (descriptor == null) ? null : this.manager.getResourceManager().createImage(descriptor);
+	}
+
+	protected ImageDescriptor getImageDescriptor() {
+		return this.getImageDescriptorModel().getValue();
 	}
 
 	/**
-	 * Return the image model (lazy-initialized).
+	 * Return the image descriptor model (lazy-initialized).
 	 */
-	protected synchronized PropertyValueModel<Image> getImageModel() {
-		if (this.imageModel == null) {
-			this.imageModel = this.buildImageModel();
-			this.engageImageModel();
+	protected synchronized PropertyValueModel<ImageDescriptor> getImageDescriptorModel() {
+		if (this.imageDescriptorModel == null) {
+			this.imageDescriptorModel = this.buildImageDescriptorModel();
+			this.engageImageDescriptorModel();
 		}
-		return this.imageModel;
+		return this.imageDescriptorModel;
 	}
 
 	/**
-	 * Construct an image model.
+	 * Construct an image descriptor model.
 	 */
-	protected PropertyValueModel<Image> buildImageModel() {
+	protected PropertyValueModel<ImageDescriptor> buildImageDescriptorModel() {
 		throw new UnsupportedOperationException();
 	}
 
-	protected void engageImageModel() {
-		this.imageModel.addPropertyChangeListener(PropertyValueModel.VALUE, this.getListener());
+	protected void engageImageDescriptorModel() {
+		this.imageDescriptorModel.addPropertyChangeListener(PropertyValueModel.VALUE, this.getImageDescriptorListener());
+	}
+
+	protected void disengageImageDescriptorModel() {
+		this.imageDescriptorModel.removePropertyChangeListener(PropertyValueModel.VALUE, this.imageDescriptorListener);
 	}
 
-	protected void disengageImageModel() {
-		this.imageModel.removePropertyChangeListener(PropertyValueModel.VALUE, this.listener);
+	protected void disposeImageDescriptorModel() {
+		if (this.imageDescriptorModel != null) {
+			ImageDescriptor descriptor = this.imageDescriptorModel.getValue();
+			if (descriptor != null) {
+				this.manager.getResourceManager().destroyImage(descriptor);
+			}
+			this.disengageImageDescriptorModel();
+			this.imageDescriptorModel = null;
+		}
 	}
 
-	protected void disposeImageModel() {
-		if (this.imageModel != null) {
-			this.disengageImageModel();
-			this.imageModel = null;
+
+	// ********** image descriptor listener **********
+
+	protected synchronized PropertyChangeListener getImageDescriptorListener() {
+		if (this.imageDescriptorListener == null) {
+			this.imageDescriptorListener = this.buildImageDescriptorListener();
 		}
+		return this.imageDescriptorListener;
+	}
+
+	/**
+	 * Build a listener that will listen to the {@link #imageDescriptorModel}.
+	 */
+	protected PropertyChangeListener buildImageDescriptorListener() {
+		return new ImageDescriptorListener();
+	}
+
+	/* CU private */ class ImageDescriptorListener
+		extends PropertyChangeAdapter
+	{
+		@Override
+		public void propertyChanged(PropertyChangeEvent event) {
+			AbstractItemExtendedLabelProvider.this.imageDescriptorChanged();
+		}
+	}
+
+	/* CU private */ void imageDescriptorChanged() {
+		this.manager.updateLabel(this.item);
 	}
 
 
@@ -134,11 +185,11 @@ public abstract class AbstractItemExtendedLabelProvider<I>
 	}
 
 	protected void engageTextModel() {
-		this.textModel.addPropertyChangeListener(PropertyValueModel.VALUE, this.getListener());
+		this.textModel.addPropertyChangeListener(PropertyValueModel.VALUE, this.getTextListener());
 	}
 
 	protected void disengageTextModel() {
-		this.textModel.removePropertyChangeListener(PropertyValueModel.VALUE, this.listener);
+		this.textModel.removePropertyChangeListener(PropertyValueModel.VALUE, this.textListener);
 	}
 
 	protected void disposeTextModel() {
@@ -149,6 +200,36 @@ public abstract class AbstractItemExtendedLabelProvider<I>
 	}
 
 
+	// ********** text listener **********
+
+	protected synchronized PropertyChangeListener getTextListener() {
+		if (this.textListener == null) {
+			this.textListener = this.buildTextListener();
+		}
+		return this.textListener;
+	}
+
+	/**
+	 * Build a listener that will listen to the {@link #textModel}.
+	 */
+	protected PropertyChangeListener buildTextListener() {
+		return new TextListener();
+	}
+
+	/* CU private */ class TextListener
+		extends PropertyChangeAdapter
+	{
+		@Override
+		public void propertyChanged(PropertyChangeEvent event) {
+			AbstractItemExtendedLabelProvider.this.textChanged();
+		}
+	}
+
+	/* CU private */ void textChanged() {
+		this.manager.updateLabel(this.item);
+	}
+
+
 	// ********** description **********
 
 	public String getDescription() {
@@ -174,11 +255,11 @@ public abstract class AbstractItemExtendedLabelProvider<I>
 	}
 
 	protected void engageDescriptionModel() {
-		this.descriptionModel.addPropertyChangeListener(PropertyValueModel.VALUE, this.getListener());
+		this.descriptionModel.addPropertyChangeListener(PropertyValueModel.VALUE, this.getDescriptionListener());
 	}
 
 	protected void disengageDescriptionModel() {
-		this.descriptionModel.removePropertyChangeListener(PropertyValueModel.VALUE, this.listener);
+		this.descriptionModel.removePropertyChangeListener(PropertyValueModel.VALUE, this.descriptionListener);
 	}
 
 	protected void disposeDescriptionModel() {
@@ -189,41 +270,40 @@ public abstract class AbstractItemExtendedLabelProvider<I>
 	}
 
 
-	// ********** listener **********
+	// ********** description listener **********
 
-	protected synchronized PropertyChangeListener getListener() {
-		if (this.listener == null) {
-			this.listener = this.buildListener();
+	protected synchronized PropertyChangeListener getDescriptionListener() {
+		if (this.descriptionListener == null) {
+			this.descriptionListener = this.buildDescriptionListener();
 		}
-		return this.listener;
+		return this.descriptionListener;
 	}
 
 	/**
-	 * Build a listener that will listen to the {@link #imageModel},
-	 * {@link #textModel}, and {@link #descriptionModel}.
+	 * Build a listener that will listen to the {@link #descriptionModel}.
 	 */
-	protected PropertyChangeListener buildListener() {
-		return new Listener();
+	protected PropertyChangeListener buildDescriptionListener() {
+		return new DescriptionListener();
 	}
 
-	/* CU private */ class Listener
+	/* CU private */ class DescriptionListener
 		extends PropertyChangeAdapter
 	{
 		@Override
 		public void propertyChanged(PropertyChangeEvent event) {
-			AbstractItemExtendedLabelProvider.this.itemChanged();
+			AbstractItemExtendedLabelProvider.this.descriptionChanged();
 		}
 	}
 
-	/* CU private */ void itemChanged() {
-		this.manager.updateLabel(this.item);
+	/* CU private */ void descriptionChanged() {
+		this.manager.updateDescription(this.item);
 	}
 
 
 	// ********** dispose **********
 
 	public synchronized void dispose() {
-		this.disposeImageModel();
+		this.disposeImageDescriptorModel();
 		this.disposeTextModel();
 		this.disposeDescriptionModel();
 	}
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/AbstractItemStructuredStateProviderManager.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/AbstractItemStructuredStateProviderManager.java
index 7d856122df..aad50d2efd 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/AbstractItemStructuredStateProviderManager.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/AbstractItemStructuredStateProviderManager.java
@@ -10,6 +10,7 @@
 package org.eclipse.jpt.common.ui.internal.jface;
 
 import java.util.HashMap;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jface.viewers.BaseLabelProvider;
 import org.eclipse.jface.viewers.LabelProviderChangedEvent;
 import org.eclipse.jface.viewers.StructuredViewer;
@@ -56,12 +57,21 @@ public abstract class AbstractItemStructuredStateProviderManager<V extends Struc
 
 	protected final HashMap<Object, ItemExtendedLabelProvider> itemLabelProviders = new HashMap<Object, ItemExtendedLabelProvider>();
 
+	/**
+	 * Never <code>null</code>.
+	 */
+	protected final ResourceManager resourceManager;
+
 	protected volatile V viewer;
 
 
-	protected AbstractItemStructuredStateProviderManager(ItemExtendedLabelProviderFactory itemLabelProviderFactory) {
+	protected AbstractItemStructuredStateProviderManager(ItemExtendedLabelProviderFactory itemLabelProviderFactory, ResourceManager resourceManager) {
 		super();
 		this.itemLabelProviderFactory = itemLabelProviderFactory;
+		if (resourceManager == null) {
+			throw new NullPointerException();
+		}
+		this.resourceManager = resourceManager;
 	}
 
 
@@ -85,7 +95,7 @@ public abstract class AbstractItemStructuredStateProviderManager<V extends Struc
 
 	public Image getImage(Object element) {
 		ItemLabelProvider provider = this.getItemLabelProvider(element);
-		return (provider == null) ? null :provider.getImage();
+		return (provider == null) ? null : provider.getImage();
 	}
 
 	public String getText(Object element) {
@@ -218,13 +228,12 @@ public abstract class AbstractItemStructuredStateProviderManager<V extends Struc
 
 	// ********** misc **********
 
-	protected void execute(Runnable runnable) {
-		SWTUtil.execute(this.viewer, runnable);
+	public ResourceManager getResourceManager() {
+		return this.resourceManager;
 	}
 
-	@Override
-	public String toString() {
-		return ObjectTools.toString(this);
+	protected void execute(Runnable runnable) {
+		SWTUtil.execute(this.viewer, runnable);
 	}
 
 	protected boolean viewerIsAlive() {
@@ -232,15 +241,21 @@ public abstract class AbstractItemStructuredStateProviderManager<V extends Struc
 		return (control != null) && ! control.isDisposed();
 	}
 
+	@Override
+	public String toString() {
+		return ObjectTools.toString(this);
+	}
+
 
 	// ********** dispose **********
 
 	/**
-	 * Disposes all items
+	 * Disposes resource manager and all item providers.
 	 */
 	@Override
 	public synchronized void dispose() {
 		this.disposeProviders();
+		this.resourceManager.dispose();
 		super.dispose();
 	}
 
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/AbstractStaticItemLabelProvider.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/AbstractStaticItemLabelProvider.java
new file mode 100644
index 0000000000..3759516e36
--- /dev/null
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/AbstractStaticItemLabelProvider.java
@@ -0,0 +1,75 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.common.ui.internal.jface;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jpt.common.ui.jface.ItemLabelProvider;
+import org.eclipse.jpt.common.utility.internal.ObjectTools;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * Item label provider that contains unchanging image and text.
+ */
+public abstract class AbstractStaticItemLabelProvider<M extends ItemLabelProvider.Manager>
+	implements ItemLabelProvider
+{
+	protected final ImageDescriptor imageDescriptor;
+	protected final String text;
+	protected final M manager;
+
+	/**
+	 * Construct an item label provider that returns the specified text but
+	 * no image.
+	 */
+	protected AbstractStaticItemLabelProvider(String text) {
+		this(null, text, null);
+	}
+
+	/**
+	 * Construct an item label provider that returns the specified image
+	 * and text. The manager need only be specified if the specified image
+	 * descriptor is not <code>null</code>.
+	 */
+	protected AbstractStaticItemLabelProvider(ImageDescriptor imageDescriptor, String text, M manager) {
+		super();
+		this.imageDescriptor = imageDescriptor;
+		this.text = text;
+		if ((imageDescriptor != null) && (manager == null)) {
+			throw new NullPointerException();
+		}
+		this.manager = manager;
+	}
+
+	public Image getImage() {
+		return (this.imageDescriptor == null) ? null : this.getImage_();
+	}
+
+	/**
+	 * Pre-condition: the image descriptor is not <code>null</code>.
+	 */
+	protected Image getImage_() {
+		return this.manager.getResourceManager().createImage(this.imageDescriptor);
+	}
+
+	public String getText() {
+		return this.text;
+	}
+
+	public void dispose() {
+		if (this.imageDescriptor != null) {
+			this.manager.getResourceManager().destroyImage(this.imageDescriptor);
+		}
+	}
+
+	@Override
+	public String toString() {
+		return ObjectTools.toString(this, this.text);
+	}
+}
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/ImageImageDescriptor.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/ImageImageDescriptor.java
deleted file mode 100644
index e2079e0227..0000000000
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/ImageImageDescriptor.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.common.ui.internal.jface;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-
-/**
- * Image descriptor for an image.
- */
-public class ImageImageDescriptor extends ImageDescriptor 
-{
-	
-	private Image fImage;
-	
-	/**
-	 * Constructor for ImagImageDescriptor.
-	 */
-	public ImageImageDescriptor(Image image) {
-		super();
-		this.fImage = image;
-	}
-	
-	@Override
-	public boolean equals(Object obj) {
-		return (obj != null) && getClass().equals(obj.getClass()) && this.fImage.equals(((ImageImageDescriptor) obj).fImage);
-	}
-	
-	@Override
-	public ImageData getImageData() {
-		return this.fImage.getImageData();
-	}
-	
-	@Override
-	public int hashCode() {
-		return this.fImage.hashCode();
-	}
-}
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/ItemStructuredStateProviderManager.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/ItemStructuredStateProviderManager.java
index 677c1d526f..2d9b249774 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/ItemStructuredStateProviderManager.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/ItemStructuredStateProviderManager.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.common.ui.internal.jface;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jface.viewers.StructuredViewer;
 import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProviderFactory;
 import org.eclipse.jpt.common.ui.jface.ItemStructuredContentProvider;
@@ -26,12 +27,12 @@ public class ItemStructuredStateProviderManager
 	protected final ItemStructuredContentProviderFactory itemContentProviderFactory;
 
 
-	public ItemStructuredStateProviderManager(ItemStructuredContentProviderFactory itemContentProviderFactory) {
-		this(itemContentProviderFactory, null);
+	public ItemStructuredStateProviderManager(ItemStructuredContentProviderFactory itemContentProviderFactory, ResourceManager resourceManager) {
+		this(itemContentProviderFactory, null, resourceManager);
 	}
 
-	public ItemStructuredStateProviderManager(ItemStructuredContentProviderFactory itemContentProviderFactory, ItemExtendedLabelProviderFactory itemLabelProviderFactory) {
-		super(itemLabelProviderFactory);
+	public ItemStructuredStateProviderManager(ItemStructuredContentProviderFactory itemContentProviderFactory, ItemExtendedLabelProviderFactory itemLabelProviderFactory, ResourceManager resourceManager) {
+		super(itemLabelProviderFactory, resourceManager);
 		if (itemContentProviderFactory == null) {
 			throw new NullPointerException();
 		}
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/ItemTreeStateProviderManager.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/ItemTreeStateProviderManager.java
index cf71d489e1..46942082c2 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/ItemTreeStateProviderManager.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/ItemTreeStateProviderManager.java
@@ -9,8 +9,8 @@
  ******************************************************************************/
 package org.eclipse.jpt.common.ui.internal.jface;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jpt.common.ui.internal.util.SWTUtil;
 import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProviderFactory;
 import org.eclipse.jpt.common.ui.jface.ItemTreeContentProvider;
 import org.eclipse.jpt.common.ui.jface.ItemTreeContentProviderFactory;
@@ -32,12 +32,12 @@ public class ItemTreeStateProviderManager
 	protected final ItemTreeContentProviderFactory itemContentProviderFactory;
 
 
-	public ItemTreeStateProviderManager(ItemTreeContentProviderFactory itemContentProviderFactory) {
-		this(itemContentProviderFactory, null);
+	public ItemTreeStateProviderManager(ItemTreeContentProviderFactory itemContentProviderFactory, ResourceManager resourceManager) {
+		this(itemContentProviderFactory, null, resourceManager);
 	}
 
-	public ItemTreeStateProviderManager(ItemTreeContentProviderFactory itemContentProviderFactory, ItemExtendedLabelProviderFactory itemLabelProviderFactory) {
-		super(itemLabelProviderFactory);
+	public ItemTreeStateProviderManager(ItemTreeContentProviderFactory itemContentProviderFactory, ItemExtendedLabelProviderFactory itemLabelProviderFactory, ResourceManager resourceManager) {
+		super(itemLabelProviderFactory, resourceManager);
 		if (itemContentProviderFactory == null) {
 			throw new NullPointerException();
 		}
@@ -74,7 +74,7 @@ public class ItemTreeStateProviderManager
 	 * Dispatch to the UI thread.
 	 */
 	public void updateChildren(Object inputElement) {
-		SWTUtil.execute(this.viewer, new UpdateChildrenRunnable(inputElement));
+		this.execute(new UpdateChildrenRunnable(inputElement));
 	}
 
 	/* CU private */ class UpdateChildrenRunnable
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/NavigatorContentProvider.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/NavigatorContentProvider.java
index a0160da32e..0844615188 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/NavigatorContentProvider.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/NavigatorContentProvider.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.common.ui.internal.jface;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProviderFactory;
 import org.eclipse.jpt.common.ui.jface.ItemTreeContentProviderFactory;
@@ -28,6 +29,7 @@ import org.eclipse.ui.navigator.ICommonContentProvider;
 public abstract class NavigatorContentProvider
 	implements ICommonContentProvider
 {
+	protected final ResourceManager resourceManager;
 	protected TreeStateProvider delegate;
 
 
@@ -38,9 +40,18 @@ public abstract class NavigatorContentProvider
 	 */
 	protected NavigatorContentProvider() {
 		super();
+		this.resourceManager = this.buildResourceManager();
 	}
 
 	/**
+	 * Return a <em>local</em> resource manager to be used, typically, by the
+	 * item label providers to retrieve {@link org.eclipse.swt.graphics.Image}s.
+	 * The returned resource manager will be disposed when the provider is
+	 * {@link #dispose() disposed}.
+	 */
+	protected abstract ResourceManager buildResourceManager();
+
+	/**
 	 * The content provider is initialized first; so we build the delegate
 	 * here.
 	 */
@@ -51,7 +62,8 @@ public abstract class NavigatorContentProvider
 	protected TreeStateProvider buildDelegate() {
 		return new ItemTreeStateProviderManager(
 				this.buildItemContentProviderFactory(),
-				this.buildItemLabelProviderFactory()
+				this.buildItemLabelProviderFactory(),
+				this.resourceManager
 			);
 	}
 
@@ -124,6 +136,7 @@ public abstract class NavigatorContentProvider
 
 	public void dispose() {
 		this.delegate.dispose();
+		this.resourceManager.dispose();
 	}
 
 	/**
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/OverlayImageDescriptor.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/OverlayImageDescriptor.java
new file mode 100644
index 0000000000..9258926050
--- /dev/null
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/OverlayImageDescriptor.java
@@ -0,0 +1,198 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2008 IBM Corporation and others.
+ * Copyright (c) 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ *
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.common.ui.internal.jface;
+
+import java.util.Arrays;
+import org.eclipse.jface.resource.CompositeImageDescriptor;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.IDecoration;
+import org.eclipse.swt.graphics.ImageData;
+import org.eclipse.swt.graphics.Point;
+
+/**
+ * An overlay image descriptor is an image descriptor that can be used
+ * to overlay decoration images on to the 4 corner quadrants of a base image.
+ * The four quadrants are:<ul>
+ * <li>{@link IDecoration#TOP_LEFT}
+ * <li>{@link IDecoration#TOP_RIGHT}
+ * <li>{@link IDecoration#BOTTOM_LEFT}
+ * <li>{@link IDecoration#BOTTOM_RIGHT}
+ * </ul>
+ * Additionally, the overlay can be used to provide an underlay corresponding
+ * to {@link IDecoration#UNDERLAY}.
+ * Alternatively, the base image can be replaced by specifying an image
+ * corresponding to {@link IDecoration#REPLACE}.
+ *
+ * @see IDecoration
+ * @see org.eclipse.jface.viewers.DecorationOverlayIcon DecorationOverlayIcon
+ */
+public class OverlayImageDescriptor
+	extends CompositeImageDescriptor
+{
+	private ImageDescriptor base;
+
+	private ImageDescriptor[] overlays;
+
+	private Point size;
+
+
+	/**
+	 * Construct the overlay image descriptor for the specified base image,
+	 * overlaid by the image descriptors in the specified array.
+	 * The indices of the array correspond to the values
+	 * of the 6 overlay constants defined on {@link IDecoration}:<ol start=0>
+	 * <li>{@link IDecoration#TOP_LEFT}
+	 * <li>{@link IDecoration#TOP_RIGHT}
+	 * <li>{@link IDecoration#BOTTOM_LEFT}
+	 * <li>{@link IDecoration#BOTTOM_RIGHT}
+	 * <li>{@link IDecoration#UNDERLAY}
+	 * <li>{@link IDecoration#REPLACE}
+	 * </ol>
+	 * The resulting image will have the same size as the specified base image.
+	 */
+	public OverlayImageDescriptor(ImageDescriptor base, ImageDescriptor[] overlays) {
+		this(base, overlays, new Point(base.getImageData().width, base.getImageData().height));
+	}
+
+	/**
+	 * Construct the overlay image descriptor for the specified base image,
+	 * overlaid in the specified quadrant by the specified overlay image
+	 * descriptor.
+	 * The specified quandrant must correspond to on of the values
+	 * of the 6 overlay constants defined on {@link IDecoration}:<ol start=0>
+	 * <li>{@link IDecoration#TOP_LEFT}
+	 * <li>{@link IDecoration#TOP_RIGHT}
+	 * <li>{@link IDecoration#BOTTOM_LEFT}
+	 * <li>{@link IDecoration#BOTTOM_RIGHT}
+	 * <li>{@link IDecoration#UNDERLAY}
+	 * <li>{@link IDecoration#REPLACE}
+	 * </ol>
+	 * The resulting image will have the same size as the specified base image.
+	 */
+	public OverlayImageDescriptor(ImageDescriptor base, ImageDescriptor overlay, int quadrant) {
+		this(base, convertToArray(overlay, quadrant));
+	}
+
+	private static ImageDescriptor[] convertToArray(ImageDescriptor overlay, int quadrant) {
+		ImageDescriptor[] overlays = new ImageDescriptor[] { null, null, null, null, null, null };
+		overlays[quadrant] = overlay;
+		return overlays;
+	}
+
+	/**
+	 * Construct the overlay image descriptor for the specified base image,
+	 * overlaid by the image descriptors in the specified array.
+	 * The indices of the array correspond to the values
+	 * of the 6 overlay constants defined on {@link IDecoration}:<ol start=0>
+	 * <li>{@link IDecoration#TOP_LEFT}
+	 * <li>{@link IDecoration#TOP_RIGHT}
+	 * <li>{@link IDecoration#BOTTOM_LEFT}
+	 * <li>{@link IDecoration#BOTTOM_RIGHT}
+	 * <li>{@link IDecoration#UNDERLAY}
+	 * <li>{@link IDecoration#REPLACE}
+	 * </ol>
+	 * The resulting image will have the specified size.
+	 */
+	public OverlayImageDescriptor(ImageDescriptor base, ImageDescriptor[] overlays, Point size) {
+		super();
+		if ((base == null) || (overlays == null) || (size == null)) {
+			throw new NullPointerException();
+		}
+		this.base = base;
+		this.overlays = overlays;
+		this.size = size;
+	}
+
+	/**
+	 * Draw the underlay image first, followed by either the base image or the
+	 * replacement image, followed by the overlay images in the order indicated
+	 * by the overlay constants defined on {@link IDecoration}.
+	 */
+	@Override
+	protected void drawCompositeImage(int width, int height) {
+		if (this.overlays.length > IDecoration.UNDERLAY) {
+			ImageDescriptor underlay = this.overlays[IDecoration.UNDERLAY];
+			if (underlay != null) {
+				this.drawImage(underlay.getImageData(), 0, 0);
+			}
+		}
+
+		ImageDescriptor temp = this.base;
+		if (this.overlays.length > IDecoration.REPLACE) {
+			ImageDescriptor replace = this.overlays[IDecoration.REPLACE];
+			if (replace != null) {
+				temp = replace;
+			}
+		}
+		this.drawImage(this.convertToImageData(temp), 0, 0);
+
+		for (int i = 0; i < this.overlays.length; i++) {
+			ImageDescriptor overlay = this.overlays[i];
+			if (overlay == null) {
+				continue;
+			}
+			ImageData overlayData = this.convertToImageData(overlay);
+			switch (i) {
+				case IDecoration.TOP_LEFT:
+					this.drawImage(overlayData, 0, 0);
+					break;
+				case IDecoration.TOP_RIGHT:
+					this.drawImage(overlayData, (this.size.x - overlayData.width), 0);
+					break;
+				case IDecoration.BOTTOM_LEFT:
+					this.drawImage(overlayData, 0, (this.size.y - overlayData.height));
+					break;
+				case IDecoration.BOTTOM_RIGHT:
+					this.drawImage(overlayData, (this.size.x - overlayData.width), (this.size.y - overlayData.height));
+					break;
+				default:
+					// NOP
+			}
+		}
+	}
+
+	private ImageData convertToImageData(ImageDescriptor imageDescriptor) {
+		ImageData imageData = imageDescriptor.getImageData();
+		return (imageData != null) ? imageData : ImageDescriptor.getMissingImageDescriptor().getImageData();
+	}
+
+	@Override
+	protected Point getSize() {
+		return this.size;
+	}
+
+	@Override
+	protected int getTransparentPixel() {
+		return this.base.getImageData().transparentPixel;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if ( ! (o instanceof OverlayImageDescriptor)) {
+			return false;
+		}
+		OverlayImageDescriptor other = (OverlayImageDescriptor) o;
+		return this.base.equals(other.base)
+				&& Arrays.equals(this.overlays, other.overlays)
+				&& this.size.equals(other.size);
+	}
+
+	@Override
+	public int hashCode() {
+		int code = this.base.hashCode();
+		for (ImageDescriptor overlay : this.overlays) {
+			if (overlay != null) {
+				code ^= overlay.hashCode();
+			}
+		}
+		return code ^= this.size.hashCode();
+	}
+}
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/PluggableLabelProvider.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/PluggableLabelProvider.java
new file mode 100644
index 0000000000..6f7eca24c3
--- /dev/null
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/PluggableLabelProvider.java
@@ -0,0 +1,81 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.common.ui.internal.jface;
+
+import org.eclipse.jpt.common.utility.internal.transformer.StringObjectTransformer;
+import org.eclipse.jpt.common.utility.transformer.Transformer;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * A label provider that returns the value returned by the
+ * {@link #textTransformer text transformer} for an element's text and
+ * the value returned by the {@link #imageTransformer image transformer} for
+ * the element's image.
+ * 
+ * @parm <E> the type of the objects passed to the label provider
+ */
+public class PluggableLabelProvider<E>
+	extends PluggableTextLabelProvider<E>
+{
+	private volatile Transformer<E, Image> imageTransformer;
+
+
+	/**
+	 * Construct a label provider that returns an element's
+	 * {@link Object#toString() toString()} value for its text and
+	 * <code>null</code> for its image.
+	 * @see #setImageTransformer(Transformer)
+	 * @see org.eclipse.jface.viewers.LabelProvider LabelProvider
+	 */
+	public PluggableLabelProvider() {
+		this(Transformer.Null.<E, Image>instance(), StringObjectTransformer.<E>instance());
+	}
+
+	/**
+	 * Construct a label provider that returns the value returned by the
+	 * specified transformer for an element's text and
+	 * <code>null</code> for its image.
+	 * @see #setImageTransformer(Transformer)
+	 */
+	public PluggableLabelProvider(Transformer<E, String> textTransformer) {
+		this(Transformer.Null.<E, Image>instance(), textTransformer);
+	}
+
+	/**
+	 * Construct a label provider that returns the value returned by the
+	 * specified text transformer for an element's text and
+	 * the value returned by the specified image transformer for
+	 * the element's image.
+	 */
+	public PluggableLabelProvider(Transformer<E, Image> imageTransformer, Transformer<E, String> textTransformer) {
+		super(textTransformer);
+		if (imageTransformer == null) {
+			throw new NullPointerException();
+		}
+		this.imageTransformer = imageTransformer;
+	}
+
+	/**
+	 * @exception ClassCastException if the element is not the same type as the
+	 * image {@link Transformer transformer}'s generic type argument {@code <T1>}.
+	 */
+	@Override
+	@SuppressWarnings("unchecked")
+	public Image getImage(Object element) {
+		return this.imageTransformer.transform((E) element);
+	}
+
+	public void setImageTransformer(Transformer<E, Image> imageTransformer) {
+		if (imageTransformer == null) {
+			throw new NullPointerException();
+		}
+		this.imageTransformer = imageTransformer;
+	}
+}
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/PluggableTableLabelProvider.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/PluggableTableLabelProvider.java
new file mode 100644
index 0000000000..0054efe531
--- /dev/null
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/PluggableTableLabelProvider.java
@@ -0,0 +1,121 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.common.ui.internal.jface;
+
+import java.io.Serializable;
+import org.eclipse.jpt.common.utility.internal.ObjectTools;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * A table label provider that returns the value returned by the
+ * {@link #textTransformer text transformer} for an element's text and
+ * the value returned by the {@link #imageTransformer image transformer} for
+ * the element's image.
+ * 
+ * @parm <E> the type of the objects passed to the label provider
+ */
+public class PluggableTableLabelProvider<E>
+	extends PluggableTextTableLabelProvider<E>
+{
+	private volatile Transformer<E, Image> imageTransformer;
+
+
+	/**
+	 * Construct a label provider that returns an element's
+	 * {@link Object#toString() toString()} value for its text and
+	 * <code>null</code> for its image.
+	 * @see #setImageTransformer(ImageTransformer)
+	 */
+	public PluggableTableLabelProvider() {
+		this(DefaultImageTransformer.<E>instance(), DefaultTextTransformer.<E>instance());
+	}
+
+	/**
+	 * Construct a label provider that returns the value returned by the
+	 * specified transformer for an element's text and
+	 * <code>null</code> for its image.
+	 * @see #setImageTransformer(ImageTransformer)
+	 */
+	public PluggableTableLabelProvider(TextTransformer<E> textTransformer) {
+		this(DefaultImageTransformer.<E>instance(), textTransformer);
+	}
+
+	/**
+	 * Construct a label provider that returns the value returned by the
+	 * specified text transformer for an element's text and
+	 * the value returned by the specified image transformer for
+	 * the element's image.
+	 */
+	public PluggableTableLabelProvider(ImageTransformer<E> imageTransformer, TextTransformer<E> textTransformer) {
+		super(textTransformer);
+		if (imageTransformer == null) {
+			throw new NullPointerException();
+		}
+		this.imageTransformer = imageTransformer;
+	}
+
+	/**
+	 * @exception ClassCastException if the element is not the same type as the
+	 * {@link ImageTransformer image transformer}'s generic type argument {@code <E>}.
+	 */
+	@Override
+	@SuppressWarnings("unchecked")
+	public Image getColumnImage(Object element, int columnIndex) {
+		return this.imageTransformer.transform((E) element, columnIndex);
+	}
+
+	public void setImageTransformer(ImageTransformer<E> imageTransformer) {
+		if (imageTransformer == null) {
+			throw new NullPointerException();
+		}
+		this.imageTransformer = imageTransformer;
+	}
+
+
+	// ********** transformers **********
+
+	public interface ImageTransformer<E>
+		extends Transformer<E, Image>
+	{
+		Image transform(E element, int columnIndex);
+	}
+
+	public static class DefaultImageTransformer<E>
+		implements ImageTransformer<E>, Serializable
+	{
+		@SuppressWarnings("rawtypes")
+		public static final ImageTransformer<?> INSTANCE = new DefaultImageTransformer();
+
+		@SuppressWarnings("unchecked")
+		public static <R> ImageTransformer<R> instance() {
+			return (ImageTransformer<R>) INSTANCE;
+		}
+
+		// ensure single instance
+		private DefaultImageTransformer() {
+			super();
+		}
+
+		public Image transform(E element, int columnIndex) {
+			return null;
+		}
+
+		@Override
+		public String toString() {
+			return ObjectTools.toString(this);
+		}
+
+		private static final long serialVersionUID = 1L;
+		private Object readResolve() {
+			// replace this object with the singleton
+			return INSTANCE;
+		}
+	}
+}
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/PluggableTextLabelProvider.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/PluggableTextLabelProvider.java
new file mode 100644
index 0000000000..6290fb591d
--- /dev/null
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/PluggableTextLabelProvider.java
@@ -0,0 +1,86 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.common.ui.internal.jface;
+
+import org.eclipse.jface.viewers.BaseLabelProvider;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jpt.common.utility.internal.ObjectTools;
+import org.eclipse.jpt.common.utility.internal.transformer.StringObjectTransformer;
+import org.eclipse.jpt.common.utility.transformer.Transformer;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * A label provider that returns the value returned by the
+ * {@link #textTransformer text transformer} for an element's text and
+ * <code>null</code> for its image.
+ * 
+ * @see org.eclipse.jface.viewers.LabelProvider LabelProvider
+ * 
+ * @parm <E> the type of the objects passed to the label provider
+ */
+public class PluggableTextLabelProvider<E>
+	extends BaseLabelProvider
+	implements ILabelProvider
+{
+	private volatile Transformer<E, String> textTransformer;
+
+
+	/**
+	 * Construct a label provider that returns an element's
+	 * {@link Object#toString() toString()} value for its text and
+	 * <code>null</code> for its image.
+	 * @see #setTextTransformer(Transformer)
+	 * @see org.eclipse.jface.viewers.LabelProvider LabelProvider
+	 */
+	public PluggableTextLabelProvider() {
+		this(StringObjectTransformer.<E>instance());
+	}
+
+	/**
+	 * Construct a label provider that returns the value returned by the
+	 * specified transformer for an element's text and
+	 * <code>null</code> for its image.
+	 */
+	public PluggableTextLabelProvider(Transformer<E, String> textTransformer) {
+		super();
+		if (textTransformer == null) {
+			throw new NullPointerException();
+		}
+		this.textTransformer = textTransformer;
+	}
+
+	/**
+	 * Return <code>null</code>.
+	 */
+	public Image getImage(Object element) {
+		return null;
+	}
+
+	/**
+	 * @exception ClassCastException if the element is not the same type as the
+	 * text {@link Transformer transformer}'s generic type argument {@code <T1>}.
+	 */
+	@SuppressWarnings("unchecked")
+	public String getText(Object element) {
+		return this.textTransformer.transform((E) element);
+	}
+
+	public void setTextTransformer(Transformer<E, String> textTransformer) {
+		if (textTransformer == null) {
+			throw new NullPointerException();
+		}
+		this.textTransformer = textTransformer;
+	}
+
+	@Override
+	public String toString() {
+		return ObjectTools.toString(this);
+	}
+}
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/PluggableTextTableLabelProvider.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/PluggableTextTableLabelProvider.java
new file mode 100644
index 0000000000..cb5114142c
--- /dev/null
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/PluggableTextTableLabelProvider.java
@@ -0,0 +1,129 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.common.ui.internal.jface;
+
+import java.io.Serializable;
+import org.eclipse.jface.viewers.BaseLabelProvider;
+import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.jpt.common.utility.internal.ObjectTools;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * A table label provider that returns the value returned by the
+ * {@link #textTransformer text transformer} for an element's text and
+ * <code>null</code> for its image.
+ * 
+ * @see org.eclipse.jface.viewers.LabelProvider LabelProvider
+ * 
+ * @parm <E> the type of the objects passed to the label provider
+ */
+public class PluggableTextTableLabelProvider<E>
+	extends BaseLabelProvider
+	implements ITableLabelProvider
+{
+	private volatile TextTransformer<E> textTransformer;
+
+
+	/**
+	 * Construct a label provider that returns an element's
+	 * {@link Object#toString() toString()} value for its text and
+	 * <code>null</code> for its image.
+	 * @see #setTextTransformer(TextTransformer)
+	 */
+	public PluggableTextTableLabelProvider() {
+		this(DefaultTextTransformer.<E>instance());
+	}
+
+	/**
+	 * Construct a label provider that returns the value returned by the
+	 * specified transformer for an element's text and
+	 * <code>null</code> for its image.
+	 */
+	public PluggableTextTableLabelProvider(TextTransformer<E> textTransformer) {
+		super();
+		if (textTransformer == null) {
+			throw new NullPointerException();
+		}
+		this.textTransformer = textTransformer;
+	}
+
+	/**
+	 * Return <code>null</code>.
+	 */
+	public Image getColumnImage(Object element, int columnIndex) {
+		return null;
+	}
+
+	/**
+	 * @exception ClassCastException if the element is not the same type as the
+	 * {@link TextTransformer text transformer}'s generic type argument {@code <E>}.
+	 */
+	@SuppressWarnings("unchecked")
+	public String getColumnText(Object element, int columnIndex) {
+		return this.textTransformer.transform((E) element, columnIndex);
+	}
+
+	public void setTextTransformer(TextTransformer<E> textTransformer) {
+		if (textTransformer == null) {
+			throw new NullPointerException();
+		}
+		this.textTransformer = textTransformer;
+	}
+
+	@Override
+	public String toString() {
+		return ObjectTools.toString(this);
+	}
+
+
+	// ********** transformers **********
+
+	public interface Transformer<T1, T2> {
+		T2 transform(T1 element, int columnIndex);
+	}
+
+	public interface TextTransformer<E>
+		extends Transformer<E, String>
+	{
+		String transform(E element, int columnIndex);
+	}
+
+	public static class DefaultTextTransformer<E>
+		implements TextTransformer<E>, Serializable
+	{
+		@SuppressWarnings("rawtypes")
+		public static final TextTransformer<?> INSTANCE = new DefaultTextTransformer();
+
+		@SuppressWarnings("unchecked")
+		public static <R> TextTransformer<R> instance() {
+			return (TextTransformer<R>) INSTANCE;
+		}
+
+		// ensure single instance
+		private DefaultTextTransformer() {
+			super();
+		}
+
+		public String transform(E element, int columnIndex) {
+			return (element == null) ? null : element.toString();
+		}
+
+		@Override
+		public String toString() {
+			return ObjectTools.toString(this);
+		}
+
+		private static final long serialVersionUID = 1L;
+		private Object readResolve() {
+			// replace this object with the singleton
+			return INSTANCE;
+		}
+	}
+}
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/ResourceManagerLabelProvider.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/ResourceManagerLabelProvider.java
new file mode 100644
index 0000000000..7ca174bcae
--- /dev/null
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/ResourceManagerLabelProvider.java
@@ -0,0 +1,113 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.common.ui.internal.jface;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.resource.LocalResourceManager;
+import org.eclipse.jface.resource.ResourceManager;
+import org.eclipse.jpt.common.utility.internal.transformer.StringObjectTransformer;
+import org.eclipse.jpt.common.utility.transformer.Transformer;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * A label provider that returns the value returned by the
+ * {@link #textTransformer text transformer} for an element's text and
+ * the value returned by the
+ * {@link #imageDescriptorTransformer image descriptor transformer} to
+ * retrieve the element's image from a {@link ResourceManager resource manager}.
+ * The label provider uses a local {@link ResourceManager}
+ * to allocate the label images. This resource manager will be disposed
+ * when the label provider is disposed.
+ * 
+ * @parm <E> the type of the objects passed to the label provider
+ */
+public class ResourceManagerLabelProvider<E>
+	extends PluggableTextLabelProvider<E>
+{
+	private volatile Transformer<E, ImageDescriptor> imageDescriptorTransformer;
+	private final ResourceManager resourceManager;
+
+
+	/**
+	 * Construct a label provider that uses the
+	 * {@link JFaceResources#getResources() default JFace resource manager}
+	 * to allocate the label images.
+	 * @see #setImageDescriptorTransformer(Transformer)
+	 * @see #setTextTransformer(Transformer)
+	 */
+	public ResourceManagerLabelProvider() {
+		this(JFaceResources.getResources());
+	}
+
+	/**
+	 * Construct a label provider that uses the specified resource manager to
+	 * allocate the label images.
+	 * @see #setImageDescriptorTransformer(Transformer)
+	 * @see #setTextTransformer(Transformer)
+	 */
+	public ResourceManagerLabelProvider(ResourceManager resourceManager) {
+		this(Transformer.Null.<E, ImageDescriptor>instance(), resourceManager);
+	}
+
+	/**
+	 * Construct a label provider that returns an element's
+	 * {@link Object#toString() toString()} value for its text and
+	 * the value returned by the specified image descriptor transformer to
+	 * retrieve the element's image from the specified resource manager.
+	 * @see #setTextTransformer(Transformer)
+	 */
+	public ResourceManagerLabelProvider(Transformer<E, ImageDescriptor> imageDescriptorTransformer, ResourceManager resourceManager) {
+		this(imageDescriptorTransformer, StringObjectTransformer.<E>instance(), resourceManager);
+	}
+
+	/**
+	 * Construct a label provider that returns the value returned by the
+	 * specified text transformer for an element's text and
+	 * the value returned by the specified image descriptor transformer to
+	 * retrieve the element's image from the specified resource manager.
+	 */
+	public ResourceManagerLabelProvider(Transformer<E, ImageDescriptor> imageDescriptorTransformer, Transformer<E, String> textTransformer, ResourceManager resourceManager) {
+		super(textTransformer);
+		if ((imageDescriptorTransformer == null) || (resourceManager == null)) {
+			throw new NullPointerException();
+		}
+		this.imageDescriptorTransformer = imageDescriptorTransformer;
+		this.resourceManager = new LocalResourceManager(resourceManager);
+	}
+
+	/**
+	 * @exception ClassCastException if the element is not the same type as the
+	 * image {@link Transformer transformer}'s generic type argument {@code <T1>}.
+	 */
+	@Override
+	public Image getImage(Object element) {
+		ImageDescriptor imageDescriptor = this.getImageDescriptor(element);
+		return (imageDescriptor == null) ? null : this.resourceManager.createImage(imageDescriptor);
+	}
+
+	@SuppressWarnings("unchecked")
+	private ImageDescriptor getImageDescriptor(Object element) {
+		return this.imageDescriptorTransformer.transform((E) element);
+	}
+
+	public void setImageDescriptorTransformer(Transformer<E, ImageDescriptor> imageDescriptorTransformer) {
+		if (imageDescriptorTransformer == null) {
+			throw new NullPointerException();
+		}
+		this.imageDescriptorTransformer = imageDescriptorTransformer;
+	}
+
+	@Override
+	public void dispose() {
+		this.resourceManager.dispose();
+		super.dispose();
+	}
+}
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/ResourceManagerTableLabelProvider.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/ResourceManagerTableLabelProvider.java
new file mode 100644
index 0000000000..d7b2bebd9f
--- /dev/null
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/ResourceManagerTableLabelProvider.java
@@ -0,0 +1,155 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.common.ui.internal.jface;
+
+import java.io.Serializable;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.resource.LocalResourceManager;
+import org.eclipse.jface.resource.ResourceManager;
+import org.eclipse.jpt.common.utility.internal.ObjectTools;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * A table label provider that returns the value returned by the
+ * {@link #textTransformer text transformer} for an element's text and
+ * the value returned by the
+ * {@link #imageDescriptorTransformer image descriptor transformer} to
+ * retrieve the element's image from a {@link ResourceManager resource manager}.
+ * The label provider uses a local {@link ResourceManager}
+ * to allocate the label images. This resource manager will be disposed
+ * when the label provider is disposed.
+ * 
+ * @parm <E> the type of the objects passed to the label provider
+ */
+public class ResourceManagerTableLabelProvider<E>
+	extends PluggableTextTableLabelProvider<E>
+{
+	private volatile ImageDescriptorTransformer<E> imageDescriptorTransformer;
+	private final ResourceManager resourceManager;
+
+
+	/**
+	 * Construct a table label provider that uses the
+	 * {@link JFaceResources#getResources() default JFace resource manager}
+	 * to allocate the label images.
+	 * @see #setImageDescriptorTransformer(ImageDescriptorTransformer)
+	 * @see #setTextTransformer(TextTransformer)
+	 */
+	public ResourceManagerTableLabelProvider() {
+		this(JFaceResources.getResources());
+	}
+
+	/**
+	 * Construct a table label provider that uses the specified resource manager to
+	 * allocate the label images.
+	 * @see #setImageDescriptorTransformer(ImageDescriptorTransformer)
+	 * @see #setTextTransformer(TextTransformer)
+	 */
+	public ResourceManagerTableLabelProvider(ResourceManager resourceManager) {
+		this(DefaultImageDescriptorTransformer.<E>instance(), resourceManager);
+	}
+
+	/**
+	 * Construct a table label provider that returns an element's
+	 * {@link Object#toString() toString()} value for its text and
+	 * the value returned by the specified image descriptor transformer to
+	 * retrieve the element's image from the specified resource manager.
+	 * @see #setTextTransformer(TextTransformer)
+	 */
+	public ResourceManagerTableLabelProvider(ImageDescriptorTransformer<E> imageDescriptorTransformer, ResourceManager resourceManager) {
+		this(imageDescriptorTransformer, DefaultTextTransformer.<E>instance(), resourceManager);
+	}
+
+	/**
+	 * Construct a table label provider that returns the value returned by the
+	 * specified text transformer for an element's text and
+	 * the value returned by the specified image descriptor transformer to
+	 * retrieve the element's image from the specified resource manager.
+	 */
+	public ResourceManagerTableLabelProvider(ImageDescriptorTransformer<E> imageDescriptorTransformer, TextTransformer<E> textTransformer, ResourceManager resourceManager) {
+		super(textTransformer);
+		if ((imageDescriptorTransformer == null) || (resourceManager == null)) {
+			throw new NullPointerException();
+		}
+		this.imageDescriptorTransformer = imageDescriptorTransformer;
+		this.resourceManager = new LocalResourceManager(resourceManager);
+	}
+
+	/**
+	 * @exception ClassCastException if the element is not the same type as the
+	 * {@link ImageDescriptorTransformer image descriptor transformer}'s
+	 * generic type argument {@code <T1>}.
+	 */
+	@Override
+	public Image getColumnImage(Object element, int columnIndex) {
+		ImageDescriptor imageDescriptor = this.getColumnImageDescriptor(element, columnIndex);
+		return (imageDescriptor == null) ? null : this.resourceManager.createImage(imageDescriptor);
+	}
+
+	@SuppressWarnings("unchecked")
+	private ImageDescriptor getColumnImageDescriptor(Object element, int columnIndex) {
+		return this.imageDescriptorTransformer.transform((E) element, columnIndex);
+	}
+
+	public void setImageDescriptorTransformer(ImageDescriptorTransformer<E> imageDescriptorTransformer) {
+		if (imageDescriptorTransformer == null) {
+			throw new NullPointerException();
+		}
+		this.imageDescriptorTransformer = imageDescriptorTransformer;
+	}
+
+	@Override
+	public void dispose() {
+		this.resourceManager.dispose();
+		super.dispose();
+	}
+
+
+	// ********** transformers **********
+
+	public interface ImageDescriptorTransformer<E>
+		extends Transformer<E, ImageDescriptor>
+	{
+		ImageDescriptor transform(E element, int columnIndex);
+	}
+
+	public static class DefaultImageDescriptorTransformer<E>
+		implements ImageDescriptorTransformer<E>, Serializable
+	{
+		@SuppressWarnings("rawtypes")
+		public static final ImageDescriptorTransformer<?> INSTANCE = new DefaultImageDescriptorTransformer();
+
+		@SuppressWarnings("unchecked")
+		public static <R> ImageDescriptorTransformer<R> instance() {
+			return (ImageDescriptorTransformer<R>) INSTANCE;
+		}
+
+		// ensure single instance
+		private DefaultImageDescriptorTransformer() {
+			super();
+		}
+
+		public ImageDescriptor transform(E element, int columnIndex) {
+			return null;
+		}
+
+		@Override
+		public String toString() {
+			return ObjectTools.toString(this);
+		}
+
+		private static final long serialVersionUID = 1L;
+		private Object readResolve() {
+			// replace this object with the singleton
+			return INSTANCE;
+		}
+	}
+}
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/StaticItemExtendedLabelProvider.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/StaticItemExtendedLabelProvider.java
index 5033a00292..f58191198c 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/StaticItemExtendedLabelProvider.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/StaticItemExtendedLabelProvider.java
@@ -9,14 +9,14 @@
  ******************************************************************************/
 package org.eclipse.jpt.common.ui.internal.jface;
 
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider;
-import org.eclipse.swt.graphics.Image;
 
 /**
  * Item label provider that contains unchanging image, text, and description.
  */
 public class StaticItemExtendedLabelProvider
-	extends StaticItemLabelProvider
+	extends AbstractStaticItemLabelProvider<ItemExtendedLabelProvider.Manager>
 	implements ItemExtendedLabelProvider
 {
 	protected final String description;
@@ -27,7 +27,7 @@ public class StaticItemExtendedLabelProvider
 	 * description.
 	 */
 	public StaticItemExtendedLabelProvider(String text) {
-		this(null, text);
+		this(null, text, null);
 	}
 
 	/**
@@ -35,16 +35,16 @@ public class StaticItemExtendedLabelProvider
 	 * and text. The provider will also return the specified text as the
 	 * description.
 	 */
-	public StaticItemExtendedLabelProvider(Image image, String text) {
-		this(image, text, text);
+	public StaticItemExtendedLabelProvider(ImageDescriptor imageDescriptor, String text, ItemExtendedLabelProvider.Manager manager) {
+		this(imageDescriptor, text, text, manager);
 	}
 
 	/**
 	 * Construct an item label provider that returns the specified image, text,
 	 * and description.
 	 */
-	public StaticItemExtendedLabelProvider(Image image, String text, String description) {
-		super(image, text);
+	public StaticItemExtendedLabelProvider(ImageDescriptor imageDescriptor, String text, String description, ItemExtendedLabelProvider.Manager manager) {
+		super(imageDescriptor, text, manager);
 		this.description = description;
 	}
 
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/StaticItemLabelProvider.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/StaticItemLabelProvider.java
index d2c2aa4bee..a610675cf1 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/StaticItemLabelProvider.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/StaticItemLabelProvider.java
@@ -9,51 +9,25 @@
  ******************************************************************************/
 package org.eclipse.jpt.common.ui.internal.jface;
 
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jpt.common.ui.jface.ItemLabelProvider;
-import org.eclipse.jpt.common.utility.internal.ObjectTools;
-import org.eclipse.swt.graphics.Image;
 
-/**
- * Item label provider that contains unchanging image and text.
- */
 public class StaticItemLabelProvider
-	implements ItemLabelProvider
+	extends AbstractStaticItemLabelProvider<ItemLabelProvider.Manager>
 {
-	protected final Image image;
-	protected final String text;
-
 	/**
 	 * Construct an item label provider that returns the specified text but
 	 * no image.
 	 */
 	public StaticItemLabelProvider(String text) {
-		this(null, text);
+		super(text);
 	}
 
 	/**
 	 * Construct an item label provider that returns the specified image
 	 * and text.
 	 */
-	public StaticItemLabelProvider(Image image, String text) {
-		super();
-		this.image = image;
-		this.text = text;
-	}
-
-	public Image getImage() {
-		return this.image;
-	}
-
-	public String getText() {
-		return this.text;
-	}
-
-	public void dispose() {
-		// NOP
-	}
-
-	@Override
-	public String toString() {
-		return ObjectTools.toString(this, this.text);
+	public StaticItemLabelProvider(ImageDescriptor imageDescriptor, String text, ItemLabelProvider.Manager manager) {
+		super(imageDescriptor, text, manager);
 	}
 }
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/StructuredContentProviderAdapter.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/StructuredContentProviderAdapter.java
deleted file mode 100644
index 157413cea6..0000000000
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/StructuredContentProviderAdapter.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2012 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.common.ui.internal.jface;
-
-import org.eclipse.jface.viewers.AbstractListViewer;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jpt.common.ui.internal.listeners.SWTListChangeListenerWrapper;
-import org.eclipse.jpt.common.utility.internal.ArrayTools;
-import org.eclipse.jpt.common.utility.internal.ObjectTools;
-import org.eclipse.jpt.common.utility.internal.model.value.CollectionListValueModelAdapter;
-import org.eclipse.jpt.common.utility.model.event.ListAddEvent;
-import org.eclipse.jpt.common.utility.model.event.ListChangeEvent;
-import org.eclipse.jpt.common.utility.model.event.ListClearEvent;
-import org.eclipse.jpt.common.utility.model.event.ListMoveEvent;
-import org.eclipse.jpt.common.utility.model.event.ListRemoveEvent;
-import org.eclipse.jpt.common.utility.model.event.ListReplaceEvent;
-import org.eclipse.jpt.common.utility.model.listener.ListChangeListener;
-import org.eclipse.jpt.common.utility.model.value.CollectionValueModel;
-import org.eclipse.jpt.common.utility.model.value.ListValueModel;
-
-/**
- * This adapter can be used to keep an AbstractListViewer
- * (e.g. a ListViewer or ComboViewer) in synch with a ListValueModel
- * (or a CollectionValueModel).
- */
-public class StructuredContentProviderAdapter
-	implements IStructuredContentProvider
-{
-	/** The underlying model list. */
-	protected ListValueModel listHolder;
-
-	/** The list viewer we keep in synch with the model list. */
-	protected final AbstractListViewer listViewer;
-
-	/** A listener that allows us to forward changes made to the underlying model list. */
-	protected final ListChangeListener listChangeListener;
-
-
-	// ********** static **********
-
-	/**
-	 * Adapt the specified list viewer to the specified list holder so they
-	 * stay in synch.
-	 */
-	public static StructuredContentProviderAdapter adapt(AbstractListViewer listViewer, ListValueModel listHolder) {
-		// we need only construct the adapter and it will hook up to the list viewer etc.
-		return new StructuredContentProviderAdapter(listViewer, listHolder);
-	}
-
-	/**
-	 * Adapt the specified list viewer to the specified list holder so they
-	 * stay in synch.
-	 */
-	public static StructuredContentProviderAdapter adapt(AbstractListViewer listViewer, CollectionValueModel collectionHolder) {
-		// we need only construct the adapter and it will hook up to the list viewer etc.
-		return new StructuredContentProviderAdapter(listViewer, collectionHolder);
-	}
-
-
-	// ********** constructors **********
-
-	/**
-	 * Constructor.
-	 */
-	protected StructuredContentProviderAdapter(AbstractListViewer listViewer, ListValueModel listHolder) {
-		super();
-		this.listChangeListener = this.buildListChangeListener();
-		this.listViewer = listViewer;
-		this.listViewer.setContentProvider(this);
-		// the list viewer will call back to #inputChanged(Viewer, Object, Object)
-		this.listViewer.setInput(listHolder);
-	}
-
-	/**
-	 * Constructor.
-	 */
-	protected StructuredContentProviderAdapter(AbstractListViewer listViewer, CollectionValueModel collectionHolder) {
-		this(listViewer, new CollectionListValueModelAdapter(collectionHolder));
-	}
-
-
-	// ********** initialization **********
-
-	protected ListChangeListener buildListChangeListener() {
-		return new SWTListChangeListenerWrapper(this.buildListChangeListener_());
-	}
-
-	protected ListChangeListener buildListChangeListener_() {
-		return new ListChangeListener() {
-			public void itemsAdded(ListAddEvent e) {
-				StructuredContentProviderAdapter.this.itemsAdded(e);
-			}
-			public void itemsRemoved(ListRemoveEvent e) {
-				StructuredContentProviderAdapter.this.itemsRemoved(e);
-			}
-			public void itemsReplaced(ListReplaceEvent e) {
-				StructuredContentProviderAdapter.this.itemsReplaced(e);
-			}
-			public void itemsMoved(ListMoveEvent e) {
-				StructuredContentProviderAdapter.this.itemsMoved(e);
-			}
-			public void listCleared(ListClearEvent e) {
-				StructuredContentProviderAdapter.this.listCleared();
-			}
-			public void listChanged(ListChangeEvent e) {
-				StructuredContentProviderAdapter.this.listChanged();
-			}
-			@Override
-			public String toString() {
-				return "list listener"; //$NON-NLS-1$
-			}
-		};
-	}
-
-
-	// ********** IStructuredContentProvider implementation **********
-
-	public Object[] getElements(Object inputElement) {
-		if (inputElement != this.listHolder) {
-			throw new IllegalArgumentException("invalid input element: " + inputElement); //$NON-NLS-1$
-		}
-		return this.listHolder.toArray();
-	}
-
-	/**
-	 * This is called by the list viewer, so don't update the list viewer here.
-	 */
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		if (viewer != this.listViewer) {
-			throw new IllegalArgumentException("invalid viewer: " + viewer); //$NON-NLS-1$
-		}
-		if (oldInput != this.listHolder) {
-			throw new IllegalArgumentException("invalid old input: " + oldInput); //$NON-NLS-1$
-		}
-		this.modelChanged((ListValueModel) oldInput, (ListValueModel) newInput);
-	}
-
-	public void dispose() {
-		// do nothing - listeners should've already been removed in #inputChanged(Viewer, Object, Object)
-	}
-
-
-	// ********** internal methods **********
-
-	protected void modelChanged(ListValueModel oldModel, ListValueModel newModel) {
-		if (oldModel != null) {
-			this.listHolder.removeListChangeListener(ListValueModel.LIST_VALUES, this.listChangeListener);
-		}
-		this.listHolder = newModel;
-		if (newModel != null) {
-			this.listHolder.addListChangeListener(ListValueModel.LIST_VALUES, this.listChangeListener);
-		}
-	}
-
-
-	// ********** public API **********
-
-	/**
-	 * Return the underlying list model.
-	 */
-	public ListValueModel model() {
-		return this.listHolder;
-	}
-
-	/**
-	 * Set the underlying list model.
-	 */
-	public void setModel(ListValueModel listHolder) {
-		// the list viewer will call back to #inputChanged(Viewer, Object, Object)
-		this.listViewer.setInput(listHolder);
-	}
-
-	/**
-	 * Set the underlying collection model.
-	 */
-	public void setModel(CollectionValueModel collectionHolder) {
-		this.setModel(new CollectionListValueModelAdapter(collectionHolder));
-	}
-
-
-	// ********** list change support **********
-
-	/**
-	 * Items were added to the underlying model list.
-	 * Synchronize the list viewer.
-	 */
-	protected void itemsAdded(ListAddEvent e) {
-		int i = e.getIndex();
-		for (Object item : e.getItems()) {
-			this.listViewer.insert(item, i++);
-		}
-	}
-
-	/**
-	 * Items were removed from the underlying model list.
-	 * Synchronize the list viewer.
-	 */
-	protected void itemsRemoved(ListRemoveEvent e) {
-		this.listViewer.remove(ArrayTools.array(e.getItems(), e.getItemsSize()));
-	}
-
-	/**
-	 * Items were replaced in the underlying model list.
-	 * Synchronize the list viewer.
-	 */
-	protected void itemsReplaced(ListReplaceEvent e) {
-		this.listViewer.remove(ArrayTools.array(e.getOldItems(), e.getItemsSize()));
-		int i = e.getIndex();
-		for (Object item : e.getNewItems()) {
-			this.listViewer.insert(item, i++);
-		}
-	}
-
-	/**
-	 * Items were moved in the underlying model list.
-	 * Synchronize the list viewer.
-	 */
-	protected void itemsMoved(ListMoveEvent e) {
-		int len = e.getLength();
-		Object[] items = new Object[len];
-		int offset = e.getSourceIndex();
-		for (int i = 0; i < len; i++) {
-			items[i] = this.listHolder.get(offset + i);
-		}
-		this.listViewer.remove(items);
-
-		offset = e.getTargetIndex();
-		for (int i = 0; i < len; i++) {
-			this.listViewer.insert(items[i], offset + i);
-		}
-	}
-
-	/**
-	 * The underlying model list was cleared.
-	 * Synchronize the list viewer.
-	 */
-	protected void listCleared() {
-		this.listViewer.refresh();
-	}
-
-	/**
-	 * The underlying model list has changed "dramatically".
-	 * Synchronize the list viewer.
-	 */
-	protected void listChanged() {
-		this.listViewer.refresh();
-	}
-
-
-	// ********** Object overrides **********
-
-	@Override
-	public String toString() {
-		return ObjectTools.toString(this, this.listHolder);
-	}
-
-}
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/TableItemModelAdapter.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/TableItemModelAdapter.java
index 6c1d3aade7..48bc60ca30 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/TableItemModelAdapter.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/TableItemModelAdapter.java
@@ -3,7 +3,7 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
+ * 
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
@@ -13,9 +13,10 @@ import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jpt.common.ui.internal.listeners.SWTPropertyChangeListenerWrapper;
 import org.eclipse.jpt.common.utility.internal.ObjectTools;
 import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent;
+import org.eclipse.jpt.common.utility.model.listener.PropertyChangeAdapter;
 import org.eclipse.jpt.common.utility.model.listener.PropertyChangeListener;
-import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
+import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.DisposeEvent;
 import org.eclipse.swt.events.DisposeListener;
@@ -50,7 +51,7 @@ public class TableItemModelAdapter {
 	 * The value models used to listen to each property that are display by the
 	 * table item.
 	 */
-	private ModifiablePropertyValueModel<?>[] valueHolders;
+	private ModifiablePropertyValueModel<?>[] valueModels;
 
 	/**
 	 * The list of <code>PropertyChangeListener</code>s used to be notified when
@@ -61,7 +62,8 @@ public class TableItemModelAdapter {
 	/**
 	 * The label used to format the objects into a string representation.
 	 */
-	private ITableLabelProvider labelProvider;
+	private final ITableLabelProvider labelProvider;
+
 
 	// ********** static methods **********
 
@@ -82,7 +84,7 @@ public class TableItemModelAdapter {
 	@SuppressWarnings("unchecked")
 	protected TableItemModelAdapter(TableItem tableItem, ColumnAdapter<?> columnAdapter, ITableLabelProvider labelProvider) {
 		super();
-		if (tableItem == null || columnAdapter == null || labelProvider == null) {
+		if ((tableItem == null) || (columnAdapter == null) || (labelProvider == null)) {
 			throw new NullPointerException();
 		}
 		this.tableItem = tableItem;
@@ -92,12 +94,12 @@ public class TableItemModelAdapter {
 		this.tableItemDisposeListener = this.buildTableItemDisposeListener();
 		this.tableItem.addDisposeListener(this.tableItemDisposeListener);
 
-		this.valueHolders = this.columnAdapter.cellModels(tableItem.getData());
+		this.valueModels = this.columnAdapter.cellModels(tableItem.getData());
 		this.propertyChangeListeners = this.buildPropertyChangeListeners();
 
 		for (int index = this.columnAdapter.columnCount(); --index >= 0; ) {
-			tableItemChanged(index, tableItem.getData(), false);
-			valueHolders[index].addPropertyChangeListener(PropertyValueModel.VALUE, propertyChangeListeners[index]);
+			this.tableItemChanged(index, tableItem.getData(), false);
+			this.valueModels[index].addPropertyChangeListener(PropertyValueModel.VALUE, this.propertyChangeListeners[index]);
 		}
 	}
 
@@ -105,9 +107,9 @@ public class TableItemModelAdapter {
 	// ********** initialization **********
 
 	private PropertyChangeListener[] buildPropertyChangeListeners() {
-		PropertyChangeListener[] listeners = new PropertyChangeListener[columnAdapter.columnCount()];
-		for (int index = listeners.length; --index >= 0; ) {
-			listeners[index] = buildPropertyChangeListener(index);
+		PropertyChangeListener[] listeners = new PropertyChangeListener[this.columnAdapter.columnCount()];
+		for (int index = listeners.length; index-- > 0; ) {
+			listeners[index] = this.buildPropertyChangeListener(index);
 		}
 		return listeners;
 	}
@@ -124,23 +126,31 @@ public class TableItemModelAdapter {
 	}
 
 	protected DisposeListener buildTableItemDisposeListener() {
-		return new DisposeListener() {
-			public void widgetDisposed(DisposeEvent event) {
-				TableItemModelAdapter.this.tableItemDisposed(event);
-			}
-		    @Override
-			public String toString() {
-				return "TableItem dispose listener";
-			}
-		};
+		return new TableItemDisposeListener();
+	}
+
+	protected class TableItemDisposeListener
+		extends DisposeAdapter
+	{
+		@Override
+		public void widgetDisposed(DisposeEvent event) {
+			TableItemModelAdapter.this.tableItemDisposed();
+		}
+
 	}
 
 
 	// ********** behavior **********
 
-	protected void tableItemChanged(int index, Object subject, boolean revalidate) {
+	protected void cellModelChanged(int index) {
+		if ( ! this.tableItem.isDisposed()) {
+			Table table = this.tableItem.getParent();
+			this.tableItemChanged(index, this.tableItem.getData(), table.getColumnCount() == 0);
+		}
+	}
 
-		if (!this.tableItem.isDisposed()) {
+	protected void tableItemChanged(int index, Object subject, boolean revalidate) {
+		if ( ! this.tableItem.isDisposed()) {
 			this.updateTableItemText(index, subject);
 			this.updateTableItemImage(index, subject);
 
@@ -172,13 +182,13 @@ public class TableItemModelAdapter {
 
 	// ********** dispose **********
 
-	protected void tableItemDisposed(DisposeEvent event) {
+	protected void tableItemDisposed() {
 		// the button is not yet "disposed" when we receive this event
 		// so we can still remove our listeners
 		this.tableItem.removeDisposeListener(this.tableItemDisposeListener);
 
-		for (int index = valueHolders.length; --index >= 0; ) {
-			valueHolders[index].removePropertyChangeListener(PropertyValueModel.VALUE, propertyChangeListeners[index]);
+		for (int index = this.valueModels.length; index-- > 0; ) {
+			this.valueModels[index].removePropertyChangeListener(PropertyValueModel.VALUE, this.propertyChangeListeners[index]);
 		}
 	}
 
@@ -190,20 +200,19 @@ public class TableItemModelAdapter {
 		return ObjectTools.toString(this);
 	}
 
-   private class TableItemPropertyChangeListener implements PropertyChangeListener {
+	protected class TableItemPropertyChangeListener
+		extends PropertyChangeAdapter
+	{
+		private final int index;
 
-   	private final int index;
-
-   	TableItemPropertyChangeListener(int index) {
-   		super();
-   		this.index = index;
-   	}
+		protected TableItemPropertyChangeListener(int index) {
+			super();
+			this.index = index;
+		}
 
-   	public void propertyChanged(PropertyChangeEvent event) {
-   		if (!tableItem.isDisposed()) {
-   			Table table = tableItem.getParent();
-   			tableItemChanged(index, tableItem.getData(), table.getColumnCount() == 0);
-   		}
-   	}
-   }
-}
-\ No newline at end of file
+		@Override
+		public void propertyChanged(PropertyChangeEvent event) {
+			TableItemModelAdapter.this.cellModelChanged(this.index);
+		}
+	}
+}
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/AddRemoveListPane.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/AddRemoveListPane.java
index 991a30501d..2182f293e8 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/AddRemoveListPane.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/AddRemoveListPane.java
@@ -3,7 +3,7 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
+ * 
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
@@ -435,7 +435,7 @@ public class AddRemoveListPane<T extends Model, E extends Object> extends AddRem
 	 * @param table The main widget of this pane
 	 */
 	protected void initializeTable(Table table) {
-		table.setData("column.width", new Integer(0));
+		table.setData("column.width", Integer.valueOf(0));
 		table.setHeaderVisible(false);
 		table.setLinesVisible(false);
 
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/AddRemovePane.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/AddRemovePane.java
index a46cf7e448..53f2f53554 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/AddRemovePane.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/AddRemovePane.java
@@ -47,7 +47,6 @@ public abstract class AddRemovePane<T extends Model, E extends Object> extends P
 {
 	private Adapter<E> adapter;
 	private Button addButton;
-	private IBaseLabelProvider labelProvider;
 	private ListValueModel<?> listModel;
 	private Button optionalButton;
 	private Button removeButton;
@@ -409,10 +408,6 @@ public abstract class AddRemovePane<T extends Model, E extends Object> extends P
 		this.adapter.optionOnSelection(this.selectedItemsModel);
 	}
 
-	protected IBaseLabelProvider getLabelProvider() {
-		return this.labelProvider;
-	}
-
 	protected final ListValueModel<?> getListModel() {
 		return this.listModel;
 	}
@@ -447,7 +442,6 @@ public abstract class AddRemovePane<T extends Model, E extends Object> extends P
 	                          IBaseLabelProvider labelProvider)
 	{
 		this.listModel          = listModel;
-		this.labelProvider      = labelProvider;
 		this.adapter            = (adapter == null) ? buildAdapter() : adapter;
 		this.selectedItemsModel = selectedItemsModel;
 
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/DefaultWidgetFactory.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/DefaultWidgetFactory.java
index 9dfcf3db9d..6a75dc1951 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/DefaultWidgetFactory.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/DefaultWidgetFactory.java
@@ -25,190 +25,124 @@ import org.eclipse.ui.forms.widgets.Hyperlink;
 import org.eclipse.ui.forms.widgets.Section;
 
 /**
- * This <code>WidgetFactory</code> simply creates plain SWT widgets.
- *
- * @version 2.0
- * @since 2.0
+ * This widget factory simply creates plain SWT widgets.
+ * 
+ * @see FormWidgetFactory
  */
-public class DefaultWidgetFactory implements WidgetFactory {
+public final class DefaultWidgetFactory
+	implements WidgetFactory
+{
+	public static WidgetFactory instance() {
+		return INSTANCE;
+	}
 
-	/**
-	 * The singleton instance of this <code>IWidgetFactory</code>
-	 */
 	private static final WidgetFactory INSTANCE = new DefaultWidgetFactory();
 
 	/**
-	 * Creates a new <code>DefaultWidgetFactory</code>.
+	 * Ensure singleton.
 	 */
 	private DefaultWidgetFactory() {
 		super();
 	}
 
-	/**
-	 * Returns the singleton instance of this <code>IWidgetFactory</code>.
-	 *
-	 * @return The singleton instance of this <code>IWidgetFactory</code>
-	 */
-	public static WidgetFactory instance() {
-		return INSTANCE;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
 	public Button createButton(Composite parent, String text) {
-		return this.createButton(parent, text, SWT.NULL);
-	}
-
-	/**
-	 * Creates a new button.
-	 *
-	 * @param parent The parent container
-	 * @param text The button's text
-	 * @param style The style to apply to the button, which determines its type:
-	 * toggle, push, check box, radio
-	 * @return The newly created <code>Button</code>
-	 */
-	private Button createButton(Composite parent, String text, int style) {
-		Button button = new Button(parent, style);
-		button.setText(text);
-		return button;
+		return this.createButton(parent, text, SWT.NONE);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	public Button createCheckBox(Composite parent, String text) {
 		return this.createButton(parent, text, SWT.CHECK);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	public Combo createCombo(Composite parent) {
-		return new Combo(parent, SWT.BORDER | SWT.READ_ONLY);
+		return this.createCombo(parent, SWT.READ_ONLY);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	public Composite createComposite(Composite parent) {
-		return new Composite(parent, SWT.NULL);
+		return new Composite(parent, SWT.NONE);
 	}
 	
-	/**
-	 * {@inheritDoc}
-	 */
 	public DateTime createDateTime(Composite parent, int style) {
 		return new DateTime(parent, style);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	public Combo createEditableCombo(Composite parent) {
-		return new Combo(parent, SWT.BORDER);
+		return this.createCombo(parent, SWT.NONE);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	public Group createGroup(Composite parent, String title) {
-		Group group = new Group(parent, SWT.NULL);
+		Group group = new Group(parent, SWT.NONE);
 		group.setText(title);
 		return group;
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	public Hyperlink createHyperlink(Composite parent, String text) {
-		Hyperlink hyperlink = new Hyperlink(parent, SWT.NULL);
+		Hyperlink hyperlink = new Hyperlink(parent, SWT.NONE);
 		hyperlink.setText(text);
 		return hyperlink;
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	public Label createLabel(Composite parent, String labelText) {
 		Label label = new Label(parent, SWT.WRAP);
 		label.setText(labelText);
 		return label;
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	public List createList(Composite parent, int style) {
 		return new List(parent, SWT.BORDER | style);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	public Text createMultiLineText(Composite parent) {
-		return new Text(parent, SWT.BORDER | SWT.MULTI | SWT.V_SCROLL);
+		return this.createText(parent, SWT.MULTI | SWT.V_SCROLL);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	public Text createPasswordText(Composite parent) {
-		return new Text(parent, SWT.BORDER | SWT.PASSWORD);
+		return this.createText(parent, SWT.PASSWORD);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	public Button createPushButton(Composite parent, String text) {
 		return this.createButton(parent, text, SWT.PUSH);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	public Button createRadioButton(Composite parent, String text) {
 		return this.createButton(parent, text, SWT.RADIO);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	public Section createSection(Composite parent, int style) {
 		return new Section(parent, style);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	public Spinner createSpinner(Composite parent) {
-		return new Spinner(parent, SWT.NULL);
+		return new Spinner(parent, SWT.NONE);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	public Table createTable(Composite parent, int style) {
 		return new Table(parent, SWT.BORDER | style);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	public Text createText(Composite parent) {
-		return new Text(parent, SWT.BORDER);
+		return this.createText(parent, SWT.NONE);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	public Button createTriStateCheckBox(Composite parent, String text) {
 		TriStateCheckBox checkBox = new TriStateCheckBox(parent, text, this);
 		return checkBox.getCheckBox();
 	}
 
+	private Button createButton(Composite parent, String text, int style) {
+		Button button = new Button(parent, style);
+		button.setText(text);
+		return button;
+	}
+
+	private Combo createCombo(Composite parent, int style) {
+		return new Combo(parent, style | SWT.BORDER);
+	}
+
+	private Text createText(Composite parent, int style) {
+		return new Text(parent, style | SWT.BORDER);
+	}
+
 	public void dispose() {
-		//nothing to dispose
+		// NOP
 	}
-}
-\ No newline at end of file
+}
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/Dialog.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/Dialog.java
index cef31c6d9e..9ac6812157 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/Dialog.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/Dialog.java
@@ -10,9 +10,12 @@
 package org.eclipse.jpt.common.ui.internal.widgets;
 
 import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.jface.resource.LocalResourceManager;
+import org.eclipse.jface.resource.ResourceManager;
+import org.eclipse.jpt.common.utility.internal.StringTools;
 import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
-import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
+import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.common.utility.node.Node;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
@@ -33,14 +36,23 @@ import org.eclipse.ui.help.IWorkbenchHelpSystem;
  *
  * @see Node
  * @see DialogPane
- *
- * @version 3.3
- * @since 2.0
  */
-@SuppressWarnings("nls")
-public abstract class Dialog<T extends Node> extends TitleAreaDialog
+public abstract class Dialog<T extends Node>
+	extends TitleAreaDialog
 {
 	/**
+	 * Resource manager used to allocate images, colors, and fonts.
+	 * Passed to composite managers.
+	 */
+	protected final ResourceManager resourceManager;
+
+	/**
+	 * Cache the title until the dialog is created and the dialog's shell
+	 * needs to be configured.
+	 */
+	private final String title;
+
+	/**
 	 * The main content pane of this dialog.
 	 */
 	private DialogPane<?> pane;
@@ -50,29 +62,23 @@ public abstract class Dialog<T extends Node> extends TitleAreaDialog
 	 */
 	private ModifiablePropertyValueModel<T> subjectHolder;
 
-	/**
-	 * Caches the title text until the dialog is created and the dialog's shell
-	 * needs to be configured.
-	 */
-	private String title;
 
 	/**
-	 * Creates a new <code>Dialog</code>.
-	 *
-	 * @param parent The parent shell
+	 * Construct a dialog with the specified resource manager and no title.
 	 */
-	protected Dialog(Shell parent) {
-		this(parent, "");
+	protected Dialog(Shell parentShell, ResourceManager resourceManager) {
+		this(parentShell, resourceManager, StringTools.EMPTY_STRING);
 	}
 
 	/**
-	 * Creates a new <code>Dialog</code>.
-	 *
-	 * @param parent The parent shell
-	 * @param title The dialog's title
+	 * Construct a dialog with the specified resource manager and title.
 	 */
-	protected Dialog(Shell parent, String title) {
-		super(parent);
+	protected Dialog(Shell parentShell, ResourceManager resourceManager, String title) {
+		super(parentShell);
+		if ((resourceManager == null) || (title == null)) {
+			throw new NullPointerException();
+		}
+		this.resourceManager = new LocalResourceManager(resourceManager);
 		this.title = title;
 		initialize();
 	}
@@ -90,7 +96,7 @@ public abstract class Dialog<T extends Node> extends TitleAreaDialog
 	/**
 	 * Creates the state object (model object) that will be used to keep track
 	 * of the information entered in this dialog. The state object will be stored
-	 * in the subject holder and can be retrieved using {@link #subject()}.
+	 * in the subject holder and can be retrieved using {@link #getSubject()}.
 	 *
 	 * @return A new state object
 	 */
@@ -108,34 +114,23 @@ public abstract class Dialog<T extends Node> extends TitleAreaDialog
 		return Node.NULL_VALIDATOR;
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	protected void configureShell(Shell shell) {
 		super.configureShell(shell);
-		shell.setText(getTitle());
+		shell.setText(this.title);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public void create() {
 		super.create();
-		installSubject();
+		this.installSubject();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 */
 	@Override
 	protected Control createContents(Composite parent) {
-		if (hasTitleArea()) {
-			return super.createContents(parent);
-		}
-
-		return createDefaultContent(parent);
+		return this.hasTitleArea() ?
+				super.createContents(parent) :
+				this.createDefaultContent(parent);
 	}
 
 	/**
@@ -147,7 +142,6 @@ public abstract class Dialog<T extends Node> extends TitleAreaDialog
 	 * @return The
 	 */
 	private Composite createDefaultContent(Composite parent) {
-
 		Composite composite = new Composite(parent, SWT.NULL);
 
 		GridLayout layout      = new GridLayout(1, false);
@@ -159,15 +153,12 @@ public abstract class Dialog<T extends Node> extends TitleAreaDialog
 
 		applyDialogFont(composite);
 		initializeDialogUnits(composite);
-		dialogArea = createDialogArea(composite);
-		buttonBar  = createButtonBar(composite);
+		this.dialogArea = createDialogArea(composite);
+		this.buttonBar  = createButtonBar(composite);
 
 		return composite;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 */
 	@Override
 	protected Composite createDialogArea(Composite parent) {
 
@@ -189,7 +180,7 @@ public abstract class Dialog<T extends Node> extends TitleAreaDialog
 		container.setLayoutData(gridData);
 
 		// Initialize the content pane
-		pane = buildLayout(container);
+		this.pane = buildLayout(container);
 
 		// Initialize the UI part, which requires the widgets being created
 		initializeUI();
@@ -233,6 +224,7 @@ public abstract class Dialog<T extends Node> extends TitleAreaDialog
 	 * have been created.
 	 */
 	protected void initializeUI() {
+		// NOP
 	}
 
 	/**
@@ -248,7 +240,7 @@ public abstract class Dialog<T extends Node> extends TitleAreaDialog
 			subject.setValidator(buildValidator());
 		}
 
-		subjectHolder.setValue(subject);
+		this.subjectHolder.setValue(subject);
 	}
 
 	/**
@@ -257,7 +249,7 @@ public abstract class Dialog<T extends Node> extends TitleAreaDialog
 	 * @return The pane showing the custom widgets
 	 */
 	protected DialogPane<?> getPane() {
-		return pane;
+		return this.pane;
 	}
 
 	/**
@@ -267,7 +259,7 @@ public abstract class Dialog<T extends Node> extends TitleAreaDialog
 	 * used
 	 */
 	public T getSubject() {
-		return subjectHolder.getValue();
+		return this.subjectHolder.getValue();
 	}
 
 	/**
@@ -277,18 +269,7 @@ public abstract class Dialog<T extends Node> extends TitleAreaDialog
 	 * an instance of <code>DialogPane</code>
 	 */
 	protected final PropertyValueModel<T> getSubjectHolder() {
-		return subjectHolder;
-	}
-
-	/**
-	 * Retrieves the dialog's title. The title passed to the constructor will be
-	 * returned by default but if it wasn't specified, this method can be used
-	 * to return it.
-	 *
-	 * @return Either the title passed to the constructor or a different title
-	 */
-	protected String getTitle() {
-		return title;
+		return this.subjectHolder;
 	}
 
 	/**
@@ -310,4 +291,10 @@ public abstract class Dialog<T extends Node> extends TitleAreaDialog
 	public final boolean wasConfirmed() {
 		return getReturnCode() == OK;
 	}
-}
-\ No newline at end of file
+
+	@Override
+	public boolean close() {
+		this.resourceManager.dispose();
+		return super.close();
+	}
+}
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/DialogPane.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/DialogPane.java
index a3c536222d..cf46db7006 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/DialogPane.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/DialogPane.java
@@ -9,61 +9,52 @@
  ******************************************************************************/
 package org.eclipse.jpt.common.ui.internal.widgets;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.common.utility.node.Node;
 import org.eclipse.swt.widgets.Composite;
 
 /**
- * The abstract pane to use when the pane is shown in an <code>Dialog</code>.
- *
- * @see Dialog
- *
- * @version 2.0
- * @since 2.0
+ * The abstract pane to use when the pane is shown in a {@link Dialog}.
  */
-public abstract class DialogPane<T extends Node> extends Pane<T> {
-
+public abstract class DialogPane<T extends Node>
+	extends Pane<T>
+{
 	/**
-	 * Creates a new <code>DialogPane</code>.
-	 *
-	 * @param parentPane The parent controller of this one
-	 * @param parent The parent container
-	 *
-	 * @category Constructor
+	 * Construct a dialog pane that uses the specified parent pane's:<ul>
+	 * <li>subject model
+	 * <li><em>enabled</em> model
+	 * </ul>
 	 */
-	protected DialogPane(DialogPane<? extends T> parentPane,
-	                             Composite parent) {
-
-		super(parentPane, parent);
+	protected DialogPane(
+			DialogPane<? extends T> parent,
+			Composite parentComposite) {
+		super(parent, parentComposite);
 	}
 
 	/**
-	 * Creates a new <code>DialogPane</code>.
-	 *
-	 * @param parentPane The parent container of this one
-	 * @param subjectHolder The holder of this pane's subject
-	 * @param parent The parent container
-	 *
-	 * @category Constructor
+	 * Construct a dialog pane that uses the specified parent pane's:<ul>
+	 * <li><em>enabled</em> model
+	 * </ul>
 	 */
-	protected DialogPane(DialogPane<?> parentPane,
-	                             PropertyValueModel<? extends T> subjectHolder,
-	                             Composite parent) {
-
-		super(parentPane, subjectHolder, parent);
+	protected DialogPane(
+			DialogPane<?> parent,
+			PropertyValueModel<? extends T> subjectModel,
+			Composite parentComposite) {
+		super(parent, subjectModel, parentComposite);
 	}
 
 	/**
-	 * Creates a new <code>DialogPane</code>.
-	 *
-	 * @param subjectHolder The holder of this pane's subject
-	 * @param parent The parent container
-	 *
-	 * @category Constructor
+	 * Construct a <em>root</em> dialog pane with the specified subject model
+	 * and resource manager.
+	 * The pane will use the default (non-form) widget factory.
+	 * The pane will be <em>disabled</em> whenever the subject is
+	 * <code>null</code>.
 	 */
-	protected DialogPane(PropertyValueModel<? extends T> subjectHolder,
-	                             Composite parent) {
-
-		super(subjectHolder, parent, DefaultWidgetFactory.instance());
+	protected DialogPane(
+			PropertyValueModel<? extends T> subjectModel,
+			Composite parentComposite,
+			ResourceManager resourceManager) {
+		super(subjectModel, parentComposite, DefaultWidgetFactory.instance(), resourceManager);
 	}
-}
-\ No newline at end of file
+}
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/EnumComboViewer.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/EnumComboViewer.java
index 5eecb224b5..ca4224d732 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/EnumComboViewer.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/EnumComboViewer.java
@@ -17,7 +17,6 @@ import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.JptCommonUiMessages;
 import org.eclipse.jpt.common.utility.model.Model;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -96,21 +95,6 @@ abstract class EnumComboViewer<T extends Model, V> extends Pane<T>
 		super(parentPane, subjectHolder, enabledModel, parent);
 	}
 
-	/**
-	 * Creates a new <code>EnumComboViewer</code>.
-	 *
-	 * @param subjectHolder The holder of this pane's subject
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various widgets
-	 */
-	EnumComboViewer(PropertyValueModel<? extends T> subjectHolder,
-        					PropertyValueModel<Boolean> enabledModel,
-	                        Composite parent,
-	                        WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
-	}
-
 	@Override
 	protected boolean addsComposite() {
 		return false;
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/FormWidgetFactory.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/FormWidgetFactory.java
index ab671d1d7d..e66122bea3 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/FormWidgetFactory.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/FormWidgetFactory.java
@@ -9,7 +9,6 @@
  ******************************************************************************/
 package org.eclipse.jpt.common.ui.internal.widgets;
 
-import org.eclipse.core.runtime.Assert;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
@@ -30,251 +29,172 @@ import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.forms.widgets.Section;
 
 /**
- * This <code>WidgetFactory</code> is responsible to create the widgets
- * using the <code>FormToolkit</code> in order use the form style (flat-style)
- * look and feel. Clients that create a FormWidgetFactory must call {@link #dispose()} 
+ * This widget factory delegates its behavior to a {@link FormToolkit}.
+ * in order use the <em>form</em> style (i.e. the flat style)
+ * look and feel. Clients must call {@link #dispose()}
  * when they are finished using the widget factory.
-
  *
- * @see FormToolkit
- * @version 3.3
- * @since 2.0
+ * @see DefaultWidgetFactory
  */
-@SuppressWarnings("nls")
-public class FormWidgetFactory implements WidgetFactory {
+public class FormWidgetFactory
+	implements WidgetFactory
+{
+	private final FormToolkit formToolkit;
 
-	/**
-	 * The actual factory responsible for creating the new widgets.
-	 */
-	private final FormToolkit widgetFactory;
 
 	/**
-	 * Creates a new <code>FormWidgetFactory</code>.
+	 * Construct a widget factory that delegates to the specified
+	 * <em>form</em> toolkit.
 	 * <p>
-	 * Clients that call this method must call {@link #dispose()}
+	 * Any client that calls this constructor must call {@link #dispose()} when
+	 * it is finished using the resulting widget factory.
 	 */
-	public FormWidgetFactory(FormToolkit widgetFactory) {
+	public FormWidgetFactory(FormToolkit formToolkit) {
 		super();
-
-		Assert.isNotNull(widgetFactory, "The widget factory cannot be null");
-		this.widgetFactory = widgetFactory;
+		if (formToolkit == null) {
+			throw new NullPointerException();
+		}
+		this.formToolkit = formToolkit;
 	}
 
-	/**
-	 * Wraps the given <code>Composite</code> into a new <code>Composite</code>
-	 * in order to have the widgets' border painted. Except for <code>CCombo</code>,
-	 * the top and bottom margins have to be 2 pixel and the left and right
-	 * margins have to be 1 pixel.
-	 *
-	 * @param container The parent of the sub-pane
-	 * @return A new <code>Composite</code> that has the necessary space to paint
-	 * the border
-	 */
-	protected Composite createBorderContainer(Composite container) {
-		return createBorderContainer(container, 2, 1);
-	}
-	
-	protected Composite createBorderContainer(Composite container, int marginHeight, int marginWidth) {
-
-		GridLayout layout = new GridLayout(1, false);
-		layout.marginHeight = marginHeight;
-		layout.marginWidth  = marginWidth;
-
-		GridData gridData = new GridData();
-		gridData.horizontalAlignment       = GridData.FILL;
-		gridData.grabExcessHorizontalSpace = true;
-
-		container = this.widgetFactory.createComposite(container);
-		container.setLayoutData(gridData);
-		container.setLayout(layout);
-
-		return container;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
 	public Button createButton(Composite parent, String text) {
-		return createButton(parent, text, SWT.NULL);
-	}
-
-	/**
-	 * Creates a new button.
-	 *
-	 * @param parent The parent container
-	 * @param text The button's text
-	 * @param style The style to apply to the button, which determines its type:
-	 * toggle, push, check box, radio
-	 * @return The newly created <code>Button</code>
-	 */
-	protected Button createButton(Composite parent, String text, int style) {
-		return this.widgetFactory.createButton(parent, text, SWT.FLAT | style);
+		return this.createButton(parent, text, SWT.NULL);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	public Button createCheckBox(Composite parent, String text) {
-		return createButton(parent, text, SWT.CHECK);
+		return this.createButton(parent, text, SWT.CHECK);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	public Combo createCombo(Composite parent) {
-		return new Combo(parent, SWT.READ_ONLY | SWT.FLAT);
+		return this.createCombo(parent, SWT.READ_ONLY);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	public Composite createComposite(Composite parent) {
-		return this.widgetFactory.createComposite(parent);
+		return this.formToolkit.createComposite(parent);
 	}
-	/**
-	 * {@inheritDoc}
-	 */
+
 	public DateTime createDateTime(Composite parent, int style) {
-		parent = createBorderContainer(parent);
+		parent = this.createBorderContainer(parent);
 
 		DateTime dateTime = new DateTime(parent, style | SWT.FLAT);
 		dateTime.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TEXT_BORDER);
-		this.widgetFactory.adapt(dateTime, true, false);
+		this.formToolkit.adapt(dateTime, true, false);
 
 		return dateTime;
 	}
 
-
-	/**
-	 * {@inheritDoc}
-	 */
 	public Combo createEditableCombo(Composite parent) {
-		Combo combo = new Combo(parent, SWT.FLAT);
-		return combo;
+		return this.createCombo(parent, SWT.NONE);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	public Group createGroup(Composite parent, String title) {
 		Group group = new Group(parent, SWT.NULL);
 		group.setText(title);
 		return group;
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	public Hyperlink createHyperlink(Composite parent, String text) {
-		return this.widgetFactory.createHyperlink(parent, text, SWT.FLAT);
+		return this.formToolkit.createHyperlink(parent, text, SWT.FLAT);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	public Label createLabel(Composite container, String labelText) {
-		return this.widgetFactory.createLabel(container, labelText, SWT.WRAP);
+		return this.formToolkit.createLabel(container, labelText, SWT.WRAP);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	public List createList(Composite container, int style) {
 		List list = new List(container, SWT.FLAT | style);
 		list.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TEXT_BORDER);
 		return list;
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	public Text createMultiLineText(Composite parent) {
-		return createText(parent, SWT.MULTI | SWT.V_SCROLL);
+		return this.createText(parent, SWT.MULTI | SWT.V_SCROLL);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	public Text createPasswordText(Composite parent) {
-		return createText(parent, SWT.PASSWORD);
+		return this.createText(parent, SWT.PASSWORD);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	public Button createPushButton(Composite parent, String text) {
-		return createButton(parent, text, SWT.PUSH);
+		return this.createButton(parent, text, SWT.PUSH);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	public Button createRadioButton(Composite parent, String text) {
-		return createButton(parent, text, SWT.RADIO);
+		return this.createButton(parent, text, SWT.RADIO);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	public Section createSection(Composite parent, int style) {
-		return this.widgetFactory.createSection(parent, SWT.FLAT | style);
+		return this.formToolkit.createSection(parent, SWT.FLAT | style);
 	}
 
 	public ScrolledForm createScrolledForm(Composite parent) {
-		return this.widgetFactory.createScrolledForm(parent);
+		return this.formToolkit.createScrolledForm(parent);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	public Spinner createSpinner(Composite parent) {
-		parent = createBorderContainer(parent);
+		parent = this.createBorderContainer(parent);
 
 		Spinner spinner = new Spinner(parent, SWT.FLAT);
 		spinner.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TEXT_BORDER);
-		this.widgetFactory.adapt(spinner, true, false);
+		this.formToolkit.adapt(spinner, true, false);
 
 		return spinner;
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	public Table createTable(Composite parent, int style) {
-		Table table = this.widgetFactory.createTable(parent, SWT.BORDER | style);
+		Table table = this.formToolkit.createTable(parent, SWT.BORDER | style);
 		table.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TEXT_BORDER);
 		return table;
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	public Text createText(Composite parent) {
-		return createText(parent, SWT.NONE);
+		return this.createText(parent, SWT.NONE);
 	}
 
-	protected Text createText(Composite parent, int style) {
-		return this.widgetFactory.createText(parent, null, SWT.BORDER | SWT.FLAT | style);
+	private Text createText(Composite parent, int style) {
+		return this.formToolkit.createText(parent, null, SWT.BORDER | SWT.FLAT | style);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	public Button createTriStateCheckBox(Composite parent, String text) {
 		TriStateCheckBox checkBox = new TriStateCheckBox(parent, text, this);
 		return checkBox.getCheckBox();
 	}
 
 	/**
-	 * Returns the actual factory responsible for creating the new widgets.
-	 *
-	 * @return The factory creating the widgets with the form style (flat-style)
+	 * Wraps the given <code>Composite</code> into a new <code>Composite</code>
+	 * in order to have the widgets' border painted. Except for <code>CCombo</code>,
+	 * the top and bottom margins have to be 2 pixel and the left and right
+	 * margins have to be 1 pixel.
 	 */
-	public FormToolkit getWidgetFactory() {
-		return this.widgetFactory;
+	private Composite createBorderContainer(Composite parent) {
+		return this.createBorderContainer(parent, 2, 1);
+	}
+
+	private Composite createBorderContainer(Composite parent, int marginHeight, int marginWidth) {
+		GridLayout layout = new GridLayout(1, false);
+		layout.marginHeight = marginHeight;
+		layout.marginWidth  = marginWidth;
+
+		GridData gridData = new GridData();
+		gridData.horizontalAlignment = GridData.FILL;
+		gridData.grabExcessHorizontalSpace = true;
+
+		Composite composite = this.formToolkit.createComposite(parent);
+		composite.setLayoutData(gridData);
+		composite.setLayout(layout);
+
+		return composite;
+	}
+
+	private Button createButton(Composite parent, String text, int style) {
+		return this.formToolkit.createButton(parent, text, SWT.FLAT | style);
+	}
+
+	private Combo createCombo(Composite parent, int style) {
+		return new Combo(parent, style | SWT.FLAT);
 	}
 
 	public void dispose() {
-		this.widgetFactory.dispose();
+		this.formToolkit.dispose();
 	}
-}
-\ No newline at end of file
+}
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/NewNameDialog.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/NewNameDialog.java
index cd8ede0a9b..b5bfbbfde5 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/NewNameDialog.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/NewNameDialog.java
@@ -10,20 +10,17 @@
 package org.eclipse.jpt.common.ui.internal.widgets;
 
 import java.util.Collection;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
+import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
-/**
- * The dialog used to requests a name from the user.
- *
- * @version 2.0
- * @since 2.0
- */
-public class NewNameDialog extends ValidatingDialog<NewNameStateObject>
+public class NewNameDialog
+	extends ValidatingDialog<NewNameStateObject>
 {
 	private String description;
 	private Image descriptionImage;
@@ -32,29 +29,18 @@ public class NewNameDialog extends ValidatingDialog<NewNameStateObject>
 	private String name;
 	private Collection<String> names;
 
-	/**
-	 * Creates a new <code>NewNameDialog</code>.
-	 *
-	 * @param parentShell
-	 * @param dialogTitle
-	 * @param descriptionTitle
-	 * @param descriptionImage
-	 * @param description
-	 * @param labelText
-	 * @param name
-	 * @param names
-	 */
-	NewNameDialog(Shell parentShell,
-	              String dialogTitle,
-	              String descriptionTitle,
-	              Image descriptionImage,
-	              String description,
-	              String labelText,
-	              String name,
-	              Collection<String> names)
-	{
-		super(parentShell, dialogTitle);
 
+	NewNameDialog(
+			Shell parentShell,
+			String dialogTitle,
+			String descriptionTitle,
+			Image descriptionImage,
+			String description,
+			String labelText,
+			String name,
+			Collection<String> names,
+			ResourceManager resourceManager) {
+		super(parentShell, resourceManager, dialogTitle);
 		this.name             = name;
 		this.names            = names;
 		this.labelText        = labelText;
@@ -63,102 +49,93 @@ public class NewNameDialog extends ValidatingDialog<NewNameStateObject>
 		this.descriptionTitle = descriptionTitle;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 */
 	@Override
 	protected DialogPane<NewNameStateObject> buildLayout(Composite container) {
-		return new NewNameDialogPane(container);
+		return new NewNameDialogPane(this.labelText, this.getSubjectHolder(), container, this.resourceManager);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 */
 	@Override
 	protected NewNameStateObject buildStateObject() {
-		return new NewNameStateObject(name, names);
+		return new NewNameStateObject(this.name, this.names);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 */
 	@Override
 	public void create() {
 		super.create();
+		this.getPane().selectAll();
+		this.getButton(OK).setEnabled(false);
+	}
 
-		NewNameDialogPane pane = (NewNameDialogPane) getPane();
-		pane.selectAll();
-
-		getButton(OK).setEnabled(false);
+	@Override
+	protected NewNameDialogPane getPane() {
+		return (NewNameDialogPane) super.getPane();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 */
 	@Override
 	protected String getDescription() {
-		return description;
+		return this.description;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 */
 	@Override
 	protected Image getDescriptionImage() {
-		return descriptionImage;
+		return this.descriptionImage;
 	}
 
-	/* (non-Javadoc)
-	 */
 	@Override
 	protected String getDescriptionTitle() {
-		return descriptionTitle;
+		return this.descriptionTitle;
 	}
 
 	/**
-	 * Returns the text field's input, which is the new name the user entered.
-	 *
-	 * @return The name the user entered
+	 * Return the text field's input, which is the new name the user entered.
 	 */
 	public String getName() {
-		return getSubject().getName();
+		return this.getSubject().getName();
 	}
 
-	private class NewNameDialogPane extends DialogPane<NewNameStateObject> {
 
+	static class NewNameDialogPane
+		extends DialogPane<NewNameStateObject>
+	{
+		private final String labelText;
 		private Text text;
 
-		NewNameDialogPane(Composite parent) {
-			super(NewNameDialog.this.getSubjectHolder(), parent);
+		NewNameDialogPane(
+				String labelText,
+				PropertyValueModel<NewNameStateObject> subjectModel,
+				Composite parentComposite,
+				ResourceManager resourceManager) {
+			super(subjectModel, parentComposite, resourceManager);
+			this.labelText = labelText;
+		}
+
+		@Override
+		protected Composite addComposite(Composite container) {
+			return this.addSubPane(container, 2, 0, 0, 0, 0);
+		}
+
+		@Override
+		protected void initializeLayout(Composite container) {
+			this.addLabel(container, this.labelText);
+			this.text = this.addText(container, this.buildNameModel());
 		}
 
-		private ModifiablePropertyValueModel<String> buildNameHolder() {
+		private ModifiablePropertyValueModel<String> buildNameModel() {
 			return new PropertyAspectAdapter<NewNameStateObject, String>(getSubjectHolder(), NewNameStateObject.NAME_PROPERTY) {
 				@Override
 				protected String buildValue_() {
-					return subject.getName();
+					return this.subject.getName();
 				}
 
 				@Override
 				protected void setValue_(String value) {
-					subject.setName(value);
+					this.subject.setName(value);
 				}
 			};
 		}
 
-		@Override
-		protected Composite addComposite(Composite container) {
-			return this.addSubPane(container, 2, 0, 0, 0, 0);
-		}
-
-		@Override
-		protected void initializeLayout(Composite container) {
-			this.addLabel(container, labelText);
-			this.addText(container, buildNameHolder());
-		}
-
 		void selectAll() {
-			text.selectAll();
+			this.text.selectAll();
 		}
 	}
 }
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/NewNameDialogBuilder.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/NewNameDialogBuilder.java
index 51f87a0b8b..f06df8851d 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/NewNameDialogBuilder.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/NewNameDialogBuilder.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2012 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -12,7 +12,7 @@ package org.eclipse.jpt.common.ui.internal.widgets;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
-import org.eclipse.core.runtime.Assert;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.utility.internal.collection.CollectionTools;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Shell;
@@ -20,13 +20,7 @@ import org.eclipse.swt.widgets.Shell;
 /**
  * This builder is responsible to create a fully initialized
  * <code>NewNameDialog</code> once all the properties have been set.
- *
- * @see NewNameDialog
- *
- * @version 2.0
- * @since 2.0
  */
-@SuppressWarnings("nls")
 public final class NewNameDialogBuilder {
 
 	/**
@@ -64,7 +58,7 @@ public final class NewNameDialogBuilder {
 	 * The collection of names that can't be used or an empty collection if none
 	 * are available.
 	 */
-	private Collection<String> names;
+	private Collection<String> names = Collections.emptyList();
 
 	/**
 	 * The parent shell of the new name dialog.
@@ -72,13 +66,21 @@ public final class NewNameDialogBuilder {
 	private Shell parentShell;
 
 	/**
+	 * The new name dialog's resource manager;
+	 */
+	private ResourceManager resourceManager;
+
+	/**
 	 * Creates a new <code>NewNameDialogBuilder</code>.
 	 *
 	 * @param parentShell The parent shell of the new name dialog
 	 */
 	public NewNameDialogBuilder(Shell parentShell) {
 		super();
-		initialize(parentShell);
+		if (parentShell == null) {
+			throw new NullPointerException();
+		}
+		this.parentShell = parentShell;
 	}
 
 	/**
@@ -88,31 +90,19 @@ public final class NewNameDialogBuilder {
 	 */
 	public NewNameDialog buildDialog() {
 		return new NewNameDialog(
-			parentShell,
-			dialogTitle,
-			descriptionTitle,
-			descriptionImage,
-			description,
-			labelText,
-			name,
-			names
+			this.parentShell,
+			this.dialogTitle,
+			this.descriptionTitle,
+			this.descriptionImage,
+			this.description,
+			this.labelText,
+			this.name,
+			this.names,
+			this.resourceManager
 		);
 	}
 
 	/**
-	 * Initializes this builder.
-	 *
-	 * @param parentShell The parent shell of the new name dialog
-	 */
-	protected void initialize(Shell parentShell) {
-
-		Assert.isNotNull(parentShell, "The parent shell cannot be null");
-
-		this.parentShell = parentShell;
-		this.names       = Collections.emptyList();
-	}
-
-	/**
 	 * Sets the description to be shown in the description area under the title.
 	 *
 	 * @param description The message to show in the description area
@@ -176,4 +166,8 @@ public final class NewNameDialogBuilder {
 	public void setName(String name) {
 		this.name = name;
 	}
+
+	public void setResourceManager(ResourceManager resourceManager) {
+		this.resourceManager = resourceManager;
+	}
 }
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/NewNameStateObject.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/NewNameStateObject.java
index 1c2dbd693e..3eaa5477dd 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/NewNameStateObject.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/NewNameStateObject.java
@@ -21,11 +21,6 @@ import org.eclipse.jpt.common.utility.node.Problem;
 /**
  * This is the state object used by the <code>NewNameDialog</code>, which stores
  * the current name and validates it when it is modified.
- *
- * @see NewNameDialog
- *
- * @version 2.0
- * @since 2.0
  */
 @SuppressWarnings("nls")
 final class NewNameStateObject extends AbstractNode
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/Pane.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/Pane.java
index 12be6ef798..b9fd86db3e 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/Pane.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/Pane.java
@@ -11,9 +11,10 @@ package org.eclipse.jpt.common.ui.internal.widgets;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import org.eclipse.core.runtime.Assert;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
+import org.eclipse.jface.resource.LocalResourceManager;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IBaseLabelProvider;
 import org.eclipse.jpt.common.ui.WidgetFactory;
@@ -21,6 +22,7 @@ import org.eclipse.jpt.common.ui.internal.listeners.SWTPropertyChangeListenerWra
 import org.eclipse.jpt.common.ui.internal.plugin.JptCommonUiPlugin;
 import org.eclipse.jpt.common.ui.internal.swt.ComboModelAdapter;
 import org.eclipse.jpt.common.ui.internal.swt.DateTimeModelAdapter;
+import org.eclipse.jpt.common.ui.internal.swt.DisposeAdapter;
 import org.eclipse.jpt.common.ui.internal.swt.SpinnerModelAdapter;
 import org.eclipse.jpt.common.ui.internal.swt.TriStateCheckBoxModelAdapter;
 import org.eclipse.jpt.common.ui.internal.util.LabeledButton;
@@ -28,11 +30,14 @@ import org.eclipse.jpt.common.ui.internal.util.LabeledControlUpdater;
 import org.eclipse.jpt.common.ui.internal.utility.swt.SWTTools;
 import org.eclipse.jpt.common.utility.internal.model.value.CompositeBooleanPropertyValueModel;
 import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
+import org.eclipse.jpt.common.utility.internal.model.value.StaticPropertyValueModel;
 import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
 import org.eclipse.jpt.common.utility.internal.transformer.NonNullBooleanTransformer;
+import org.eclipse.jpt.common.utility.internal.transformer.NotNullObjectTransformer;
 import org.eclipse.jpt.common.utility.internal.transformer.StringObjectTransformer;
 import org.eclipse.jpt.common.utility.model.Model;
 import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent;
+import org.eclipse.jpt.common.utility.model.listener.PropertyChangeAdapter;
 import org.eclipse.jpt.common.utility.model.listener.PropertyChangeListener;
 import org.eclipse.jpt.common.utility.model.value.ListValueModel;
 import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
@@ -69,35 +74,35 @@ import org.eclipse.ui.help.IWorkbenchHelpSystem;
 import org.eclipse.ui.part.PageBook;
 
 /**
- * The abstract definition of a pane which holds onto a <code>PropertyValueModel</code>
- * that contains the subject of this pane.
+ * The abstract definition of a pane which holds a {@link PropertyValueModel}
+ * that contains the pane's subject.
  * <p>
- * It also contains convenience methods for building buttons, labels, check
- * boxes, and radio buttons, etc.
+ * This class contains convenience methods for building buttons, labels, check
+ * boxes, radio buttons, etc.
  * <p>
  * It is possible to easily listen to any property changes coming from the
- * subject, {@link #addPropertyNames(Collection)} is specify which properties
+ * subject, {@link #addPropertyNames(Collection)} specifies which properties
  * are of interest and {@link #propertyChanged(String)} is used to notify the
  * pane when the property has changed.
- *
- * @see FormPane
+ * 
  * @see DialogPane
- *
- * @version 2.0
- * @since 2.0
  */
 @SuppressWarnings("nls")
-public abstract class Pane<T extends Model>
-{
+public abstract class Pane<T extends Model> {
+	/**
+	 * This will be <code>null</code> for <em>root</em> panes.
+	 */
+	private final Pane<?> parent;
+
 	/**
 	 * The listener registered with the subject in order to be notified when a
 	 * property has changed, the property names are determined by
-	 * {@link #propertyNames()}.
+	 * {@link #getPropertyNames()}.
 	 */
-	private PropertyChangeListener aspectChangeListener;
+	private final PropertyChangeListener aspectChangeListener;
 
 	/**
-	 * The container of this composite.
+	 * The container of the pane's composite.
 	 */
 	private final Composite container;
 
@@ -106,34 +111,37 @@ public abstract class Pane<T extends Model>
 	 */
 	private boolean populating;
 
-
 	/**
-	 * This listener is registered with the subject holder in order to
-	 * automatically repopulate this pane with the new subject.
+	 * This listener is registered with the {@link #subjectModel} in order to
+	 * automatically repopulate this pane when the subject changes.
 	 */
-	private PropertyChangeListener subjectChangeListener;
+	private final PropertyChangeListener subjectChangeListener;
 
 	/**
-	 * The subject of this pane.
+	 * The pane's subject.
 	 */
-	private PropertyValueModel<T> subjectModel;
+	private final PropertyValueModel<? extends T> subjectModel;
 
 	/**
-	 * The collection of registered sub-panes will be automatically notified
-	 * when listeners need to be engaged or disengaged or when to populate its
-	 * widgets.
+	 * The widget factory used by the pane and all its descendant panes to
+	 * create various common widgets.
+	 * This will be <code>null</code> if the pane has a {@link #parent}.
 	 */
-	private Collection<Pane<?>> subPanes;
+	private final WidgetFactory widgetFactory;
 
 	/**
-	 * The factory used to create various common widgets.
+	 * The resource manager used by the pane and all its descendant panes to
+	 * allocate resources (images, colors, and fonts).
+	 * This will be <code>null</code> if the pane has a {@link #parent}.
 	 */
-	private WidgetFactory widgetFactory;
+	private final ResourceManager resourceManager;
 
 	/**
-	 * The "and" combination enabledModel passed in via constructor and the parent Pane's {@link #enabledModel}
+	 * The AND of the <em>enabled</em> model passed in via the constructor and
+	 * the parent pane's <em>enabled</em> model.
 	 */
-	private PropertyValueModel<Boolean> enabledModel;
+	private final PropertyValueModel<Boolean> enabledModel;
+	private final PropertyChangeListener enabledModelListener;
 
 	/**
 	 * A listener that allows us to stop listening to stuff when the control
@@ -141,254 +149,277 @@ public abstract class Pane<T extends Model>
 	 */
 	private final DisposeListener controlDisposeListener;
 
+
 	/**
-	 * Creates a new <code>Pane</code>.
-	 *
-	 * @param parentPane The parent container of this one
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various widgets
-	 * @param automaticallyAlignWidgets <code>true</code> to make the widgets
-	 * this pane aligned with the widgets of the given parent pane;
-	 * <code>false</code> to not align them
-	 *
-	 * @category Constructor
+	 * Construct a pane that uses the specified parent pane's:<ul>
+	 * <li>subject model
+	 * <li><em>enabled</em> model
+	 * </ul>
 	 */
 	protected Pane(
-			Pane<? extends T> parentPane,
-	        Composite parent) {
-
-		this(
-			parentPane,
-			parentPane.getSubjectHolder(),
-			parent);
+		Pane<? extends T> parent,
+		Composite parentComposite
+	) {
+		this(parent, parent.getSubjectHolder(), parentComposite);
 	}
 
 	/**
-	 * Creates a new <code>Pane</code>.
-	 *
-	 * @param parentPane The parent container of this one
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various widgets
-	 * @param automaticallyAlignWidgets <code>true</code> to make the widgets
-	 * this pane aligned with the widgets of the given parent pane;
-	 * <code>false</code> to not align them
-	 *
-	 * @category Constructor
+	 * Construct a pane that uses the specified parent pane's:<ul>
+	 * <li><em>enabled</em> model
+	 * </ul>
 	 */
 	protected Pane(
-			Pane<? extends T> parentPane,
-	        Composite parent,
-	        PropertyValueModel<Boolean> enabledModel) {
-
-		this(
-			parentPane,
-			parentPane.getSubjectHolder(),
-			enabledModel,
-			parent);
+		Pane<?> parent,
+		PropertyValueModel<? extends T> subjectModel,
+		Composite parentComposite
+	) {
+		this(parent, subjectModel, buildDefaultEnabledModel(), parentComposite);
 	}
 
 	/**
-	 * Creates a new <code>Pane</code>.
-	 *
-	 * @param parentPane The parent container of this one
-	 * @param subjectHolder The holder of this pane's subject
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various widgets
-	 * @param automaticallyAlignWidgets <code>true</code> to make the widgets
-	 * this pane aligned with the widgets of the given parent pane;
-	 * <code>false</code> to not align them
-	 *
-	 * @category Constructor
+	 * Construct a pane that uses the specified parent pane's:<ul>
+	 * <li>subject model
+	 * </ul>
+	 * The specified <em>enabled</em> model will be ANDed with the parent
+	 * pane's <em>enabled</em> model (i.e. the pane can be <em>enabled</em>
+	 * only if its parent pane is also <em>enabled</em>).
 	 */
 	protected Pane(
-			Pane<?> parentPane,
-			PropertyValueModel<? extends T> subjectHolder,
-			Composite parent) {
-
-		super();
-		this.initialize(subjectHolder, parentPane.getEnabledModel(), parentPane.getWidgetFactory());
-		this.initialize(parentPane);
-		if (this.addsComposite()) {
-			this.container = this.addComposite(parent);
-			this.initializeLayout(this.container);
-		}
-		else {
-			this.container = null;
-			this.initializeLayout(parent);
-		}
-		this.controlDisposeListener = this.buildControlDisposeListener();
-		this.getControl().addDisposeListener(this.controlDisposeListener);
-		this.engageSubjectHolder();
-		this.engageListeners(getSubject());
-		this.populate();
+		Pane<? extends T> parent,
+		Composite parentComposite,
+		PropertyValueModel<Boolean> enabledModel
+	) {
+		this(parent, parent.getSubjectHolder(), enabledModel, parentComposite);
 	}
 
 	/**
-	 * Creates a new <code>Pane</code>.
-	 *
-	 * @param parentPane The parent container of this one
-	 * @param subjectHolder The holder of this pane's subject
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various widgets
-	 * @param automaticallyAlignWidgets <code>true</code> to make the widgets
-	 * this pane aligned with the widgets of the given parent pane;
-	 * <code>false</code> to not align them
-	 * @param parentManagePane <code>true</code> to have the parent pane manage
-	 * the enabled state of this pane
-	 *
-	 * @category Constructor
+	 * Construct a pane that uses the specified subject model and
+	 * <em>enabled</em> model.
+	 * <p>
+	 * The specified <em>enabled</em> model will be ANDed with the parent
+	 * pane's <em>enabled</em> model (i.e. the pane can be <em>enabled</em>
+	 * only if its parent pane is also <em>enabled</em>).
 	 */
 	protected Pane(
-			Pane<?> parentPane,
-			PropertyValueModel<? extends T> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent) {
+		Pane<?> parent,
+		PropertyValueModel<? extends T> subjectModel,
+		PropertyValueModel<Boolean> enabledModel,
+		Composite parentComposite
+	) {
+		this(parent, subjectModel, enabledModel, parentComposite, null, null);
+	}
 
-		
-		super();
-		this.initialize(subjectHolder, CompositeBooleanPropertyValueModel.and(this.wrapEnabledModel(enabledModel), parentPane.getEnabledModel()), parentPane.getWidgetFactory());
-		this.initialize(parentPane);
-		if (this.addsComposite()) {
-			this.container = this.addComposite(parent);
-			this.initializeLayout(this.container);
-		}
-		else {
-			this.container = null;
-			this.initializeLayout(parent);
-		}
-		this.controlDisposeListener = this.buildControlDisposeListener();
-		this.getControl().addDisposeListener(this.controlDisposeListener);
-		this.engageSubjectHolder();
-		this.engageListeners(getSubject());
-		this.populate();
+	/**
+	 * Construct a <em>root</em> pane with the specified subject model, widget
+	 * factory, and resource manager.
+	 * The pane will be <em>disabled</em> whenever the subject is
+	 * <code>null</code>.
+	 */
+	protected Pane(
+		PropertyValueModel<? extends T> subjectModel,
+		Composite parentComposite,
+		WidgetFactory widgetFactory,
+		ResourceManager resourceManager
+	) {
+		this(subjectModel, buildNotNullModel(subjectModel), parentComposite, widgetFactory, resourceManager);
 	}
 
 	/**
-	 * Creates a new <code>Pane</code>.
-	 *
-	 * @param subjectModel The holder of this pane's subject
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 *
-	 * @category Constructor
+	 * Construct a <em>root</em> pane with the specified subject model,
+	 * <em>enabled</em> model, widget factory, and resource manager.
+	 * <p>
+	 * The specified <em>enabled</em> model will be ANDed with the parent
+	 * pane's <em>enabled</em> model (i.e. the pane can be <em>enabled</em>
+	 * only if its parent pane is also <em>enabled</em>).
 	 */
 	protected Pane(
 		PropertyValueModel<? extends T> subjectModel,
-		Composite parent,
-		WidgetFactory widgetFactory) {
+		PropertyValueModel<Boolean> enabledModel,
+		Composite parentComposite,
+		WidgetFactory widgetFactory,
+		ResourceManager resourceManager
+	) {
+		this(null, subjectModel, enabledModel, parentComposite, widgetFactory, resourceManager);
+	}
 
+	/**
+	 * This constructor is <code>private</code> so we can enable, but also
+	 * require, <em>root</em> panes (i.e. panes without parents) to specify the
+	 * following:<ul>
+	 * <li>subject model
+	 * <li>widget factory
+	 * </ul>
+	 */
+	private Pane(
+		Pane<?> parent,
+		PropertyValueModel<? extends T> subjectModel,
+		PropertyValueModel<Boolean> enabledModel,
+		Composite parentComposite,
+		WidgetFactory widgetFactory,
+		ResourceManager resourceManager
+	) {
 		super();
-		this.initialize(subjectModel, this.buildNonNullEnabledModel(subjectModel), widgetFactory);
-		if (this.addsComposite()) {
-			this.container = this.addComposite(parent);
-			this.initializeLayout(this.container);
+		if ((subjectModel == null) || (enabledModel == null) || (parentComposite == null)) {
+			throw new NullPointerException();
 		}
-		else {
-			this.container = null;
-			this.initializeLayout(parent);
+		if (parent == null) {
+			if ((widgetFactory == null) || (resourceManager == null)) {
+				throw new NullPointerException();
+			}
 		}
-		this.controlDisposeListener = this.buildControlDisposeListener();
-		this.getControl().addDisposeListener(this.controlDisposeListener);
-		this.engageSubjectHolder();
-		this.engageListeners(getSubject());
-		this.populate();
-	}
-	
-	protected Pane(
-		PropertyValueModel<? extends T> subjectHolder,
-		PropertyValueModel<Boolean> enabledModel,
-		Composite parent,
-		WidgetFactory widgetFactory) {
+		this.parent = parent;
+		this.subjectModel = subjectModel;
+
+		this.enabledModel = andEnabledModel(parent, enabledModel);
+		this.enabledModelListener = this.buildEnabledModelListener();
+		this.enabledModel.addPropertyChangeListener(PropertyValueModel.VALUE, this.enabledModelListener);
+
+		this.widgetFactory = widgetFactory;
+		this.resourceManager = (resourceManager == null) ? null : new LocalResourceManager(resourceManager);
+
+		this.aspectChangeListener = this.buildAspectChangeListener();
+
+		this.initialize();
 
-		super();
-		this.initialize(subjectHolder, this.wrapEnabledModel(enabledModel), widgetFactory);
 		if (this.addsComposite()) {
-			this.container = this.addComposite(parent);
+			this.container = this.addComposite(parentComposite);
 			this.initializeLayout(this.container);
-		}
-		else {
+		} else {
 			this.container = null;
-			this.initializeLayout(parent);
+			this.initializeLayout(parentComposite);
 		}
 		this.controlDisposeListener = this.buildControlDisposeListener();
 		this.getControl().addDisposeListener(this.controlDisposeListener);
-		this.engageSubjectHolder();
+
+		this.subjectChangeListener = this.buildSubjectChangeListener();
+		this.subjectModel.addPropertyChangeListener(PropertyValueModel.VALUE, this.subjectChangeListener);
+
 		this.engageListeners(getSubject());
 		this.populate();
 	}
 
-	protected PropertyValueModel<Boolean> buildNonNullEnabledModel(PropertyValueModel<? extends T> subjectModel) {
-		return new TransformationPropertyValueModel<T, Boolean>(subjectModel) {
-			@Override
-			protected Boolean transform(T value) {
-				return Boolean.valueOf(value != null);
-			}
-		};
+
+	// ********** enabled model **********
+
+	/**
+	 * Return an <em>enabled</em> model that will result in the pane's
+	 * <em>enabled</em> state always matching that of its parent pane.
+	 */
+	private static PropertyValueModel<Boolean> buildDefaultEnabledModel() {
+		return new StaticPropertyValueModel<Boolean>(Boolean.TRUE);
 	}
-	
 
-	// ********** initialization **********
+	/**
+	 * Return a {@link Boolean} value model that will return
+	 * {@link Boolean#TRUE} if the value of the specified value model is
+	 * <em>not</em> <code>null</code>;
+	 * {@link Boolean#FALSE} if the value <em>is</em> <code>null</code>.
+	 */
+	protected static PropertyValueModel<Boolean> buildNotNullModel(PropertyValueModel<?> valueModel) {
+		return new TransformationPropertyValueModel<Object, Boolean>(valueModel, NotNullObjectTransformer.instance());
+	}
+
+	/**
+	 * Convenience method for sub-classes.
+	 * Wrap the pane's {@link #subjectModel} in a {@link #buildNotNullModel(PropertyValueModel)};
+	 * i.e. a model that returns whether the subject is <code>null</code>.
+	 */
+	protected PropertyValueModel<Boolean> buildNotNullSubjectModel() {
+		return buildNotNullModel(this.subjectModel);
+	}
 
+	/**
+	 * Return a {@link Boolean} value model that will return the AND of the
+	 * value of the <em>enabled</em> model of the specified (typically parent) pane
+	 * and the value of the specified <em>enabled</em> model.
+	 * <p>
+	 * This is useful for a pane that is <em>enabled</em> when both its parent
+	 * pane is <em>enabled</em> <em>and</em> the pane's model indicates the
+	 * pane should be <em>enabled</em>.
+	 */
 	@SuppressWarnings("unchecked")
-	private void initialize(
-			PropertyValueModel<? extends T> subjectModel,
-			PropertyValueModel<Boolean> enabledModel,
-	        WidgetFactory widgetFactory) {
+	private static PropertyValueModel<Boolean> andEnabledModel(Pane<?> pane, PropertyValueModel<Boolean> enabledModel) {
+		enabledModel = buildNonNullModel(enabledModel);
+		// NB: we fetch private state from the pane
+		return (pane == null) ? enabledModel : CompositeBooleanPropertyValueModel.and(pane.enabledModel, enabledModel);
+	}
+
+	/**
+	 * Return a {@link Boolean} value model that will return the value of the
+	 * specified {@link Boolean} value model if it is <em>not</em>
+	 * <code>null</code>;
+	 * {@link Boolean#FALSE} if the value is <code>null</code>.
+	 * <p>
+	 * This is useful for <em>enabled</em> models that might return <code>null</code>
+	 * (which is typical with aspect adapters etc.).
+	 */
+	private static PropertyValueModel<Boolean> buildNonNullModel(PropertyValueModel<Boolean> booleanModel) {
+		return new TransformationPropertyValueModel<Boolean, Boolean>(booleanModel, NonNullBooleanTransformer.FALSE);
+	}
 
-		Assert.isNotNull(subjectModel, "The subject model cannot be null");
 
-		this.subjectModel         = (PropertyValueModel<T>) subjectModel;
-		this.widgetFactory         = widgetFactory;
-		this.enabledModel 		   = enabledModel;
-		this.subPanes              = new ArrayList<Pane<?>>();
-		this.subjectChangeListener = this.buildSubjectChangeListener();
-		this.aspectChangeListener  = this.buildAspectChangeListener();
+	// ********** initialization **********
 
-		this.initialize();
+	private PropertyChangeListener buildEnabledModelListener() {
+		return new EnabledModelListener();
 	}
 
-	protected void initialize() {
-		// do nothing by default
+	/* CU private */ class EnabledModelListener
+		extends PropertyChangeAdapter
+	{
+		@Override
+		public void propertyChanged(PropertyChangeEvent event) {
+			Pane.this.enabledModelChanged(((Boolean) event.getOldValue()).booleanValue(), ((Boolean) event.getNewValue()).booleanValue());
+		}
+	}
+
+	protected void enabledModelChanged(@SuppressWarnings("unused") boolean oldEnabled, @SuppressWarnings("unused") boolean newEnabled) {
+		// NOP
+	}
+
+	private PropertyChangeListener buildSubjectChangeListener() {
+		return new SWTPropertyChangeListenerWrapper(this.buildSubjectChangeListener_());
+	}
+
+	private PropertyChangeListener buildSubjectChangeListener_() {
+		return new SubjectChangeListener();
+	}
+
+	/* CU private */ class SubjectChangeListener
+		extends PropertyChangeAdapter
+	{
+		@Override
+		@SuppressWarnings("unchecked")
+		public void propertyChanged(PropertyChangeEvent e) {
+			Pane.this.subjectChanged((T) e.getOldValue(), (T) e.getNewValue());
+		}
 	}
 
 	/**
-	 * Registers this pane with the parent pane.
-	 *
-	 * @param parentPane The parent pane
-	 * @param automaticallyAlignWidgets <code>true</code> to make the widgets
-	 * this pane aligned with the widgets of the given parent pane;
-	 * <code>false</code> to not align them
-	 * @param parentManagePane <code>true</code> to have the parent pane manage
-	 * the enabled state of this pane
-	 *
-	 * @category Initialization
+	 * Initialize the pane's models. This method is called before the pane's
+	 * UI widget is built in {@link #initializeLayout(Composite)}.
 	 */
-	private void initialize(Pane<?> parentPane) {
-		// Register this pane with the parent pane, it will call the methods
-		// automatically (engageListeners(), disengageListeners(), populate(),
-		// dispose(), etc)
-		parentPane.registerSubPane(this);
+	protected void initialize() {
+		// do nothing by default
 	}
 
 	/**
-	 * Initializes the layout of this pane.
-	 *
-	 * @param container The parent container
-	 *
-	 * @category Layout
+	 * Build the pane's UI widget in the specified composite, using
+	 * the models built in {@link #initialize()}.
 	 */
-	protected abstract void initializeLayout(Composite container);
+	protected abstract void initializeLayout(Composite parentComposite);
 
 	private DisposeListener buildControlDisposeListener() {
-		return new DisposeListener() {
-			public void widgetDisposed(DisposeEvent event) {
-				Pane.this.controlDisposed();
-			}
-		    @Override
-			public String toString() {
-				return "control dispose listener";
-			}
-		};
+		return new ControlDisposeListener();
+	}
+
+	/* CU private */ class ControlDisposeListener
+		extends DisposeAdapter
+	{
+		@Override
+		public void widgetDisposed(DisposeEvent event) {
+			Pane.this.controlDisposed();
+		}
 	}
 
 
@@ -514,7 +545,7 @@ public abstract class Pane<T extends Model>
 	                                   String helpId,
 	                                   final Runnable buttonAction) {
 
-		Button button = this.widgetFactory.createButton(container, text);
+		Button button = this.getWidgetFactory().createButton(container, text);
 		button.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -629,7 +660,7 @@ public abstract class Pane<T extends Model>
 	 * @category Layout
 	 */
 	private Combo addUnmanagedCombo(Composite container) {
-		Combo combo = this.widgetFactory.createCombo(container);
+		Combo combo = this.getWidgetFactory().createCombo(container);
 		combo.setLayoutData(getFieldGridData());
 		return combo;
 	}
@@ -752,7 +783,6 @@ public abstract class Pane<T extends Model>
 	 * to reduce the number of SWT Controls (USER handles in windows) created.
 	 * Typically you would return false if the Pane is for only 1 widget. In this case
 	 * you need to override {@link #getControl()} to return the appropriate Control
-	 * @return
 	 */
 	protected boolean addsComposite() {
 		return true;
@@ -786,7 +816,7 @@ public abstract class Pane<T extends Model>
 	}
 
 	protected final Combo addEditableCombo(Composite container, String helpId) {
-		Combo combo = this.widgetFactory.createEditableCombo(container);
+		Combo combo = this.getWidgetFactory().createEditableCombo(container);
 
 		if (helpId != null) {
 			getHelpSystem().setHelp(combo, helpId);
@@ -874,7 +904,7 @@ public abstract class Pane<T extends Model>
 	                                         String text,
 	                                         final Runnable hyperLinkAction) {
 
-		Hyperlink link = this.widgetFactory.createHyperlink(parent, text);
+		Hyperlink link = this.getWidgetFactory().createHyperlink(parent, text);
 		this.controlEnabledState(link);
 
 		link.addMouseListener(new MouseAdapter() {
@@ -895,7 +925,7 @@ public abstract class Pane<T extends Model>
 	protected final Hyperlink addHyperlink(Composite parent,
 											String text) {
 
-		Hyperlink link = this.widgetFactory.createHyperlink(parent, text);
+		Hyperlink link = this.getWidgetFactory().createHyperlink(parent, text);
 		this.controlEnabledState(link);
 		
 		return link;
@@ -940,7 +970,7 @@ public abstract class Pane<T extends Model>
 	private Label addUnmanagedLabel(Composite container,
 	                                 String labelText) {
 
-		return this.widgetFactory.createLabel(container, labelText);
+		return this.getWidgetFactory().createLabel(container, labelText);
 	}
 
 	/**
@@ -991,7 +1021,7 @@ public abstract class Pane<T extends Model>
 	                                     int maximumValue,
 	                                     String helpId) {
 
-		Spinner spinner = this.widgetFactory.createSpinner(parent);
+		Spinner spinner = this.getWidgetFactory().createSpinner(parent);
 		spinner.setMinimum(minimumValue);
 		spinner.setMaximum(maximumValue);
 		GridData gridData = getFieldGridData();
@@ -1065,7 +1095,7 @@ public abstract class Pane<T extends Model>
 											ModifiablePropertyValueModel<Integer> secondsHolder,
 											String helpId) {
 
-		DateTime dateTime = this.widgetFactory.createDateTime(parent, SWT.TIME);
+		DateTime dateTime = this.getWidgetFactory().createDateTime(parent, SWT.TIME);
 
 		DateTimeModelAdapter.adapt(hoursHolder, minutesHolder, secondsHolder, dateTime);
 
@@ -1117,7 +1147,7 @@ public abstract class Pane<T extends Model>
 	private Combo addUnmanagedEditableCombo(Composite container,
 												String helpId) {
 
-		Combo combo = this.widgetFactory.createEditableCombo(container);
+		Combo combo = this.getWidgetFactory().createEditableCombo(container);
 		combo.setLayoutData(getFieldGridData());
 		
 
@@ -1188,7 +1218,7 @@ public abstract class Pane<T extends Model>
 	                               ModifiablePropertyValueModel<String> selectionHolder,
 	                               String helpId) {
 
-		List list = this.widgetFactory.createList(
+		List list = this.getWidgetFactory().createList(
 			container,
 			SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL | SWT.MULTI
 		);
@@ -1212,7 +1242,7 @@ public abstract class Pane<T extends Model>
 	 */
 	protected final Text addMultiLineText(Composite container) {
 
-		Text text = this.widgetFactory.createMultiLineText(container);
+		Text text = this.getWidgetFactory().createMultiLineText(container);
 		text.setLayoutData(getFieldGridData());
 		this.controlEnabledState(text);
 
@@ -1321,7 +1351,7 @@ public abstract class Pane<T extends Model>
 	 * @category Layout
 	 */
 	protected final Composite addPane(Composite parent) {
-		return this.widgetFactory.createComposite(parent);
+		return this.getWidgetFactory().createComposite(parent);
 	}
 
 	/**
@@ -1369,7 +1399,7 @@ public abstract class Pane<T extends Model>
 	 */
 	protected final Text addPasswordText(Composite container) {
 
-		Text text = this.widgetFactory.createPasswordText(container);
+		Text text = this.getWidgetFactory().createPasswordText(container);
 		text.setLayoutData(getFieldGridData());
 
 		this.controlEnabledState(text);
@@ -1409,7 +1439,7 @@ public abstract class Pane<T extends Model>
 	                                       String helpId,
 	                                       final Runnable buttonAction) {
 
-		Button button = this.widgetFactory.createPushButton(parent, buttonText);
+		Button button = this.getWidgetFactory().createPushButton(parent, buttonText);
 		controlEnabledState(button);
 		button.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -1494,7 +1524,7 @@ public abstract class Pane<T extends Model>
 	                               String description,
 	                               int type) {
 
-		Section section = this.widgetFactory.createSection(container, type | ((description != null) ? Section.DESCRIPTION : SWT.NULL));
+		Section section = this.getWidgetFactory().createSection(container, type | ((description != null) ? Section.DESCRIPTION : SWT.NULL));
 		section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		section.setText(sectionText);
 
@@ -1524,19 +1554,6 @@ public abstract class Pane<T extends Model>
 		};
 	}
 
-	private PropertyChangeListener buildSubjectChangeListener() {
-		return new SWTPropertyChangeListenerWrapper(this.buildSubjectChangeListener_());
-	}
-
-	private PropertyChangeListener buildSubjectChangeListener_() {
-		return new PropertyChangeListener() {
-			@SuppressWarnings("unchecked")
-			public void propertyChanged(PropertyChangeEvent e) {
-				Pane.this.subjectChanged((T) e.getOldValue(), (T) e.getNewValue());
-			}
-		};
-	}
-
 	/**
 	 * Creates a new <code>Composite</code> used as a sub-pane.
 	 *
@@ -1679,7 +1696,7 @@ public abstract class Pane<T extends Model>
 	                                 int style,
 	                                 String helpId) {
 
-		Table table = this.widgetFactory.createTable(container, style);
+		Table table = this.getWidgetFactory().createTable(container, style);
 		table.setHeaderVisible(true);
 		table.setLinesVisible(true);
 
@@ -1759,7 +1776,7 @@ public abstract class Pane<T extends Model>
 	 * @category Layout
 	 */
 	private Text addUnmanagedText(Composite container) {
-		Text text = this.widgetFactory.createText(container);
+		Text text = this.getWidgetFactory().createText(container);
 		text.setLayoutData(getFieldGridData());
 		return text;
 	}
@@ -1919,7 +1936,7 @@ public abstract class Pane<T extends Model>
 	                                      int columnCount,
 	                                      String helpId) {
 
-		Group group = this.widgetFactory.createGroup(container, title);
+		Group group = this.getWidgetFactory().createGroup(container, title);
 		//manageWidget(group); TODO unsure if I want to manage groups,
 		//also should probably rename this addUnmanagedTitledPane
 		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -1964,16 +1981,16 @@ public abstract class Pane<T extends Model>
 		Button button;
 
 		if (toggleButtonType == SWT.PUSH) {
-			button = this.widgetFactory.createPushButton(parent, buttonText);
+			button = this.getWidgetFactory().createPushButton(parent, buttonText);
 		}
 		else if (toggleButtonType == SWT.RADIO) {
-			button = this.widgetFactory.createRadioButton(parent, buttonText);
+			button = this.getWidgetFactory().createRadioButton(parent, buttonText);
 		}
 		else if (toggleButtonType == SWT.CHECK) {
-			button = this.widgetFactory.createCheckBox(parent, buttonText);
+			button = this.getWidgetFactory().createCheckBox(parent, buttonText);
 		}
 		else {
-			button = this.widgetFactory.createButton(parent, buttonText);
+			button = this.getWidgetFactory().createButton(parent, buttonText);
 		}
 
 		button.setLayoutData(new GridData());
@@ -2127,50 +2144,60 @@ public abstract class Pane<T extends Model>
 		JptCommonUiPlugin.instance().trace(TRACE_OPTION, "doPopulate");
 	}
 
-	private void controlEnabledState(Control... controls) {
-		SWTTools.controlEnabledState(getEnabledModel(), controls);
-	}
 
-	private void controlEnabledState(PropertyValueModel<Boolean> booleanModel, Control... controls) {
-		this.controlEnabledState_(this.wrapEnabledModel(booleanModel), controls);
+	// ********** enabled models **********
+
+	protected boolean isEnabled() {
+		return this.enabledModel.getValue().booleanValue();
 	}
 
 	/**
-	 * Assume the "enabled" models can return null (which is typical with aspect
-	 * adapters etc.).
+	 * Control the <em>enabled</em> state of the specified controls with the
+	 * pane's {@link #enabledModel}.
+	 * <p>
+	 * Use {@link #controlEnabledState(PropertyValueModel, Control...)} if the
+	 * controls might be disabled when the pane is enabled.
 	 */
-	private PropertyValueModel<Boolean> wrapEnabledModel(PropertyValueModel<Boolean> booleanModel) {
-		return new TransformationPropertyValueModel<Boolean, Boolean>(booleanModel, NonNullBooleanTransformer.FALSE);
+	protected void controlEnabledState(Control... controls) {
+		SWTTools.controlEnabledState(this.enabledModel, controls);
 	}
 
-	private void controlEnabledState_(PropertyValueModel<Boolean> booleanModel, Control... controls) {
-		SWTTools.controlEnabledState(this.andEnabledModel(booleanModel), controls);
-	}
-
-	protected PropertyValueModel<Boolean> getEnabledModel() {
-		return this.enabledModel;
+	/**
+	 * Use the specified boolean model to determine the <em>enabled</em>
+	 * state of the specified controls (i.e. when the <em>pane</em> is enabled).
+	 * If the specified boolean model returns <code>null</code> (which is
+	 * typical of aspect adapters), the controls will be disabled.
+	 * <p>
+	 * Use {@link #controlEnabledState(Control...)} if the
+	 * controls are only enabled when the pane is enabled.
+	 */
+	protected void controlEnabledState(PropertyValueModel<Boolean> controlsEnabledModel, Control... controls) {
+		SWTTools.controlEnabledState(this.andEnabledModel(controlsEnabledModel), controls);
 	}
 
-	@SuppressWarnings("unchecked")
+	/**
+	 * AND the specified boolean model with the pane's {@link #enabledModel},
+	 * resulting in an <em>enabled</em> model that can only be <code>true</code>
+	 * when the pane as a whole is enabled.
+	 */
 	private PropertyValueModel<Boolean> andEnabledModel(PropertyValueModel<Boolean> booleanModel) {
-		return CompositeBooleanPropertyValueModel.and(getEnabledModel(), booleanModel);
+		return andEnabledModel(this, booleanModel);
 	}
 
-	private void engageSubjectHolder() {
-		this.subjectModel.addPropertyChangeListener(PropertyValueModel.VALUE, this.subjectChangeListener);
-	}
+
+	// ********** subject listeners **********
 
 	/**
-	 * engage the specified subject
+	 * Engage the specified subject
 	 */
-	protected void engageListeners(T subject) {
+	private void engageListeners(T subject) {
 		if (subject != null) {
 			this.engageListeners_(subject);
 		}
 	}
 
 	/**
-	 * specified subject is not null
+	 * Pre-condition: the specified subject is not <code>null</code>
 	 */
 	protected void engageListeners_(T subject) {
 		JptCommonUiPlugin.instance().trace(TRACE_OPTION, "engageListeners_({0})", subject);
@@ -2181,16 +2208,16 @@ public abstract class Pane<T extends Model>
 	}
 
 	/**
-	 * disengage the specified subject
+	 * Disengage the specified subject
 	 */
-	protected void disengageListeners(T subject) {
+	private void disengageListeners(T subject) {
 		if (subject != null) {
 			this.disengageListeners_(subject);
 		}
 	}
 
 	/**
-	 * specified subject is not null
+	 * Pre-condition: the specified subject is not <code>null</code>
 	 */
 	protected void disengageListeners_(T subject) {
 		JptCommonUiPlugin.instance().trace(TRACE_OPTION, "disengageListeners_({0})", subject);
@@ -2200,10 +2227,6 @@ public abstract class Pane<T extends Model>
 		}
 	}
 
-	private void disengageSubjectHolder() {
-		this.subjectModel.removePropertyChangeListener(PropertyValueModel.VALUE, this.subjectChangeListener);
-	}
-
 	/**
 	 * Returns the main <code>Composite</code> of this pane.
 	 *
@@ -2225,40 +2248,30 @@ public abstract class Pane<T extends Model>
 	 *
 	 * @category Populate
 	 */
-	protected final PropertyValueModel<T> getSubjectHolder() {
+	protected final PropertyValueModel<? extends T> getSubjectHolder() {
 		return this.subjectModel;
 	}
 
 	/**
-	 * Returns the factory responsible for creating the widgets.
-	 *
-	 * @return The factory used by this pane to create the widgets
-	 *
-	 * @category Layout
+	 * If the pane is a <em>root</em> pane, return its widget factory;
+	 * otherwise return the pane's parent's widget factory.
 	 */
 	protected final WidgetFactory getWidgetFactory() {
-		return this.widgetFactory;
+		return (this.parent == null) ? this.widgetFactory : this.parent.getWidgetFactory();
 	}
 
 	/**
-	 * Returns the helps system.
-	 *
-	 * @return The platform's help system
-	 *
-	 * @category Helper
+	 * If the pane is a <em>root</em> pane, return its resource manager;
+	 * otherwise return the pane's parent's resource manager.
 	 */
+	public final ResourceManager getResourceManager() {
+		return (this.parent == null) ? this.resourceManager : this.parent.getResourceManager();
+	}
+
 	protected final IWorkbenchHelpSystem getHelpSystem() {
 		return PlatformUI.getWorkbench().getHelpSystem();
 	}
 
-
-	/**
-	 * Determines whether
-	 *
-	 * @return
-	 *
-	 * @category Populate
-	 */
 	protected final boolean isPopulating() {
 		return this.populating;
 	}
@@ -2276,51 +2289,34 @@ public abstract class Pane<T extends Model>
 	}
 
 	/**
-	 * Notifies the subject's property associated with the given property name
-	 * has changed.
-	 *
-	 * @param propertyName The property name associated with the property change
-	 *
-	 * @category Populate
+	 * The subject's specified property has changed.
 	 */
-	protected void propertyChanged(String propertyName) {
+	protected void propertyChanged(@SuppressWarnings("unused") String propertyName) {
+		// NOP
 	}
 
 	/**
-	 * Returns the list of names to listen for properties changing from the
-	 * subject.
-	 *
-	 * @return A non-<code>null</code> list of property names
-	 *
-	 * @category Populate
+	 * Return the names of the subject's properties we listen to here and notify
+	 * via calls to {@link #propertyChanged(String)}.
 	 */
-	protected Collection<String> getPropertyNames() {
+	private Collection<String> getPropertyNames() {
 		ArrayList<String> propertyNames = new ArrayList<String>();
-		addPropertyNames(propertyNames);
+		this.addPropertyNames(propertyNames);
 		return propertyNames;
 	}
 
 	/**
 	 * This method is called (perhaps internally) when this needs to repopulate
 	 * but the object of interest has not changed.
-	 *
-	 * @category Populate
 	 */
 	protected final void repopulate() {
 		JptCommonUiPlugin.instance().trace(TRACE_OPTION, "repopulate");
 
-		// Populate this pane
 		try {
-			setPopulating(true);
-			doPopulate();
-		}
-		finally {
-			setPopulating(false);
-		}
-
-		// Ask the sub-panes to repopulate themselves
-		for (Pane<?> subPane : this.subPanes) {
-			subPane.repopulate();
+			this.setPopulating(true);
+			this.doPopulate();
+		} finally {
+			this.setPopulating(false);
 		}
 	}
 
@@ -2329,10 +2325,6 @@ public abstract class Pane<T extends Model>
 	 * populated or not. During population, it is required to not update the
 	 * widgets when the model is updated nor to update the model when the widgets
 	 * are being synchronized with the model's values.
-	 *
-	 * @param populating
-	 *
-	 * @category Populate
 	 */
 	protected final void setPopulating(boolean populating) {
 		this.populating = populating;
@@ -2340,8 +2332,6 @@ public abstract class Pane<T extends Model>
 
 	/**
 	 * Either show or hides this pane.
-	 *
-	 * @param visible The new visibility state
 	 */
 	public void setVisible(boolean visible) {
 		if (this.container != null && !this.container.isDisposed()) {
@@ -2350,76 +2340,32 @@ public abstract class Pane<T extends Model>
 	}
 
 	/**
-	 * Returns the nearest <code>Shell</code> displaying the main widget of this
-	 * pane.
-	 *
-	 * @return The nearest window displaying this pane
+	 * @see Control#getShell()
 	 */
 	public final Shell getShell() {
 		return this.getControl().getShell();
 	}
 
 	/**
-	 * Returns the subject of this pane.
-	 *
-	 * @return The subject if this pane was not disposed; <code>null</code>
-	 * if it was
-	 *
-	 * @category Populate
+	 * Return the pane's subject.
 	 */
 	public T getSubject() {
 		return this.subjectModel.getValue();
 	}
 
 	/**
-	 * The subject has changed, disconnects any listeners from the old subject
-	 * and connects those listeners onto the new subject.
-	 *
-	 * @param oldsubject The old subject or <code>null</code> if none was set
-	 * @param newSubject The new subject or <code>null</code> if none needs to be
-	 * set
-	 *
-	 * @category Populate
+	 * The pane's subject has changed. Disconnect any listeners from the old
+	 * subject and connect those listeners to the new subject.
 	 */
-	protected final void subjectChanged(T oldSubject, T newSubject) {
-		if (!this.getControl().isDisposed()) {
-
+	/* CU private */ final void subjectChanged(T oldSubject, T newSubject) {
+		if ( ! this.getControl().isDisposed()) {
 			JptCommonUiPlugin.instance().trace(TRACE_OPTION, "subjectChanged({0}, {1})", oldSubject, newSubject);
 			this.disengageListeners(oldSubject);
-
 			this.repopulate();
-
 			this.engageListeners(newSubject);
 		}
 	}
 
-
-	/**
-	 * Registers another <code>Pane</code> with this one so it can
-	 * be automatically notified about certain events such as engaging or
-	 * disengaging the listeners, etc.
-	 *
-	 * @param subPane The sub-pane to register
-	 *
-	 * @category Controller
-	 */
-	protected final void registerSubPane(Pane<?> subPane) {
-		this.subPanes.add(subPane);
-	}
-
-	/**
-	 * Unregisters the given <code>Pane</code> from this one so it
-	 * can no longer be automatically notified about certain events such as
-	 * engaging or disengaging the listeners, etc.
-	 *
-	 * @param subPane The sub-pane to unregister
-	 *
-	 * @category Controller
-	 */
-	protected final void unregisterSubPane(Pane<?> subPane) {
-		this.subPanes.remove(subPane);
-	}
-
 	private void updatePane(String propertyName) {
 		if (!isPopulating() && !this.getControl().isDisposed()) {
 			this.populating = true;
@@ -2436,13 +2382,17 @@ public abstract class Pane<T extends Model>
 	protected void controlDisposed() {
 		// the control is not yet "disposed" when we receive this event
 		// so we can still remove our listeners
-		JptCommonUiPlugin.instance().trace(TRACE_OPTION, "dispose");
+		JptCommonUiPlugin.instance().trace(TRACE_OPTION, "control disposed");
 
-		// Dispose this pane
 		this.disengageListeners(getSubject());
-		this.disengageSubjectHolder();
 
+		this.subjectModel.removePropertyChangeListener(PropertyValueModel.VALUE, this.subjectChangeListener);
+
+		this.enabledModel.removePropertyChangeListener(PropertyValueModel.VALUE, this.enabledModelListener);
 		this.getControl().removeDisposeListener(this.controlDisposeListener);
+		if (this.parent == null) {
+			this.resourceManager.dispose();
+		}
 	}
 
 	private static final String TRACE_OPTION = Pane.class.getSimpleName();
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/ValidatingDialog.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/ValidatingDialog.java
index 5e0ba91310..2ff4a83a2c 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/ValidatingDialog.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/ValidatingDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2012 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -11,6 +11,7 @@ package org.eclipse.jpt.common.ui.internal.widgets;
 
 import java.util.ListIterator;
 import org.eclipse.jface.dialogs.IMessageProvider;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.utility.node.Node;
 import org.eclipse.jpt.common.utility.node.Problem;
 import org.eclipse.osgi.util.NLS;
@@ -20,7 +21,7 @@ import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.widgets.Shell;
 
 /**
- * This dialog is similar to it superclass, <code>Dialog</code>, with
+ * This dialog is similar to its superclass, {@link Dialog}, with
  * the added value of an error message label below the main panel. A subclass
  * can set this error message as needed so that it can inform the user something
  * incorrect has been entered.
@@ -28,41 +29,33 @@ import org.eclipse.swt.widgets.Shell;
  * If there is an error message, it will be shown. If there is a warning
  * message, it will only be shown if there is no error message. Warning messages
  * have a different icon than error messages.
- *
- * @version 2.0
- * @since 2.0
  */
-public abstract class ValidatingDialog<T extends Node> extends Dialog<T> {
-
+public abstract class ValidatingDialog<T extends Node>
+	extends Dialog<T>
+{
 	/**
-	 * Creates a new <code>ValidatingDialog</code>.
-	 *
-	 * @param parent The parent shell
+	 * Construct a dialog with the specified resource manager and no title.
 	 */
-	public ValidatingDialog(Shell parent) {
-		super(parent);
+	public ValidatingDialog(Shell parentShell, ResourceManager resourceManager) {
+		super(parentShell, resourceManager);
 	}
 
 	/**
-	 * Creates a new <code>ValidatingDialog</code>.
-	 *
-	 * @param parent The parent shell
-	 * @param title The dialog's title
+	 * Construct a dialog with the specified resource manager and title.
 	 */
-	public ValidatingDialog(Shell parent, String title) {
-		super(parent, title);
+	public ValidatingDialog(Shell parentShell, ResourceManager resourceManager, String title) {
+		super(parentShell, resourceManager, title);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 */
 	@Override
 	final Node.Validator buildValidator() {
 		return new Node.Validator() {
 			public void pause() {
+				// NOP
 			}
 
 			public void resume() {
+				// NOP
 			}
 
 			public void validate() {
@@ -225,9 +218,9 @@ public abstract class ValidatingDialog<T extends Node> extends Dialog<T> {
 	 * pane to show the first error if any exists and update the enablement of
 	 * the OK button.
 	 */
-	private void validate() {
+	/* CU private */ void validate() {
 		getSubject().validateBranch();
 		updateMessage();
 		getButton(OK).setEnabled(!containsErrorMessage());
 	}
-}
-\ No newline at end of file
+}
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/jface/ItemLabelProvider.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/jface/ItemLabelProvider.java
index 921a8e5712..1043b9f6da 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/jface/ItemLabelProvider.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/jface/ItemLabelProvider.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.common.ui.jface;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.swt.graphics.Image;
 
 /**
@@ -53,6 +54,15 @@ public interface ItemLabelProvider {
 	 */
 	interface Manager {
 		/**
+		 * Return a resource manager that can be used by the item label
+		 * provider to retrieve {@link Image}s. The provider manager will
+		 * dispose the resource manager;
+		 * but, to minimize resource usage, the item label provider should
+		 * dispose its own image(s) as appropriate.
+		 */
+		ResourceManager getResourceManager();
+
+		/**
 		 * The label (image and/or text) for the specified item has changed.
 		 * Update appropriately.
 		 */
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/ComparatorAdapter.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/ComparatorAdapter.java
new file mode 100644
index 0000000000..abee48cc16
--- /dev/null
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/ComparatorAdapter.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.common.utility.internal;
+
+import java.util.Comparator;
+
+/**
+ * Convenience comparator that always returns 0;
+ * 
+ * @param <T> the type of objects to be compared
+ */
+public class ComparatorAdapter<T>
+	implements Comparator<T>
+{
+	public int compare(T o1, T o2) {
+		return 0;
+	}
+
+	@Override
+	public String toString() {
+		return ObjectTools.toString(this);
+	}
+}
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/CompositeCollectionValueModel.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/CompositeCollectionValueModel.java
index 9b7e497f0c..372ad0300b 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/CompositeCollectionValueModel.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/CompositeCollectionValueModel.java
@@ -118,7 +118,7 @@ public class CompositeCollectionValueModel<E1, E2>
 	 * model already contains other collection value models.
 	 */
 	public static <E1 extends CollectionValueModel<? extends E2>, E2> CompositeCollectionValueModel<E1, E2> forModels(CollectionValueModel<E1> collectionModel) {
-		return new CompositeCollectionValueModel<E1, E2>(collectionModel, Transformer.Null.<E1>instance());
+		return new CompositeCollectionValueModel<E1, E2>(collectionModel, Transformer.Non.<E1>instance());
 	}
 
 	/**
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/CompositeListValueModel.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/CompositeListValueModel.java
index 878b6a2000..0c65faf173 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/CompositeListValueModel.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/CompositeListValueModel.java
@@ -126,7 +126,7 @@ public class CompositeListValueModel<E1, E2>
 	 * model already contains other list value models.
 	 */
 	public static <E1 extends ListValueModel<? extends E2>, E2> CompositeListValueModel<E1, E2> forModels(ListValueModel<E1> listModel) {
-		return new CompositeListValueModel<E1, E2>(listModel, Transformer.Null.<E1>instance());
+		return new CompositeListValueModel<E1, E2>(listModel, Transformer.Non.<E1>instance());
 	}
 
 	/**
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/prefs/PreferencePropertyValueModel.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/prefs/PreferencePropertyValueModel.java
index acb926451b..420b29278e 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/prefs/PreferencePropertyValueModel.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/prefs/PreferencePropertyValueModel.java
@@ -94,7 +94,7 @@ public class PreferencePropertyValueModel<P>
 				preferences,
 				key,
 				defaultValue,
-				Transformer.Null.<String>instance()
+				Transformer.Non.<String>instance()
 			);
 	}
 
@@ -107,7 +107,7 @@ public class PreferencePropertyValueModel<P>
 				preferencesModel,
 				key,
 				defaultValue,
-				Transformer.Null.<String>instance()
+				Transformer.Non.<String>instance()
 			);
 	}
 
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/transformer/NonNullBooleanTransformer.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/transformer/NonNullBooleanTransformer.java
index 4687c956bf..c2d44ad3af 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/transformer/NonNullBooleanTransformer.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/transformer/NonNullBooleanTransformer.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.common.utility.internal.transformer;
 
+import java.io.Serializable;
 import org.eclipse.jpt.common.utility.internal.ObjectTools;
 import org.eclipse.jpt.common.utility.transformer.Transformer;
 
@@ -23,7 +24,7 @@ import org.eclipse.jpt.common.utility.transformer.Transformer;
  * </ul>
  */
 public final class NonNullBooleanTransformer
-	implements Transformer<Boolean, Boolean>
+	implements Transformer<Boolean, Boolean>, Serializable
 {
 	// not null
 	private final Boolean nullValue;
@@ -47,7 +48,7 @@ public final class NonNullBooleanTransformer
 	 * value is <code>null</code>. Throw a {@link NullPointerException} if the
 	 * specified value is <code>null</code>.
 	 */
-	public Transformer<Boolean, Boolean> valueOf(Boolean b) {
+	public static Transformer<Boolean, Boolean> valueOf(Boolean b) {
 		return valueOf(b.booleanValue());
 	}
 
@@ -55,7 +56,7 @@ public final class NonNullBooleanTransformer
 	 * Return a transformer that will return the {@link Boolean} corresponding
 	 * to the specified value if the original value is <code>null</code>.
 	 */
-	public Transformer<Boolean, Boolean> valueOf(boolean b) {
+	public static Transformer<Boolean, Boolean> valueOf(boolean b) {
 		return b ? TRUE : FALSE;
 	}
 
@@ -79,4 +80,9 @@ public final class NonNullBooleanTransformer
 		return ObjectTools.toString(this, this.nullValue);
 	}
 
+	private static final long serialVersionUID = 1L;
+	private Object readResolve() {
+		// replace this object with the appropriate constant
+		return valueOf(this.nullValue);
+	}
 }
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/transformer/NonNullStaticTransformer.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/transformer/NonNullStaticTransformer.java
new file mode 100644
index 0000000000..6c8941f9b9
--- /dev/null
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/transformer/NonNullStaticTransformer.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.common.utility.internal.transformer;
+
+import org.eclipse.jpt.common.utility.internal.ObjectTools;
+import org.eclipse.jpt.common.utility.transformer.Transformer;
+
+/**
+ * Transform any object into a single client-specified
+ * non-<code>null</code> object.
+ * 
+ * @param <T1> the type of the object passed to the transformer
+ * @param <T2> the type of the object returned by the transformer
+ */
+public class NonNullStaticTransformer<T1, T2>
+	implements Transformer<T1, T2>
+{
+	private final T2 object;
+
+	public NonNullStaticTransformer(T2 object) {
+		super();
+		if (object == null) {
+			throw new NullPointerException();
+		}
+		this.object = object;
+	}
+
+	public T2 transform(T1 o) {
+		return this.object;
+	}
+
+	@Override
+	public String toString() {
+		return ObjectTools.toString(this, this.object);
+	}
+}
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/transformer/NonNullStringObjectTransformer.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/transformer/NonNullStringObjectTransformer.java
new file mode 100644
index 0000000000..53cd1de021
--- /dev/null
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/transformer/NonNullStringObjectTransformer.java
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.common.utility.internal.transformer;
+
+import java.io.Serializable;
+import org.eclipse.jpt.common.utility.internal.ObjectTools;
+import org.eclipse.jpt.common.utility.transformer.Transformer;
+
+/**
+ * Transform an object into the string returned by its {@link Object#toString()}
+ * method. A <code>null</code> object is transformed into a client-configured
+ * non-<code>null</code> string (<code>"null"</code> by default).
+ * 
+ * @param <T> the type of the object passed to the transformer
+ */
+public class NonNullStringObjectTransformer<T>
+	implements Transformer<T, String>, Serializable
+{
+	// not null
+	private String nullString;
+
+	private static final long serialVersionUID = 1L;
+
+	public NonNullStringObjectTransformer() {
+		this(String.valueOf((Object) null));
+	}
+
+	public NonNullStringObjectTransformer(String nullString) {
+		super();
+		if (nullString == null) {
+			throw new NullPointerException();
+		}
+		this.nullString = nullString;
+	}
+
+	public String transform(T o) {
+		return (o == null) ? this.nullString : o.toString();
+	}
+
+	@Override
+	public String toString() {
+		return ObjectTools.toString(this, this.nullString);
+	}
+}
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/transformer/NotBooleanTransformer.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/transformer/NotBooleanTransformer.java
index 2e68a130e3..50e64af16e 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/transformer/NotBooleanTransformer.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/transformer/NotBooleanTransformer.java
@@ -23,6 +23,8 @@ import org.eclipse.jpt.common.utility.transformer.Transformer;
  * <li>If the original {@link Boolean} is <code>null</code>,
  * the transformer will return <code>null</code>.
  * </ul>
+ * Use a {@link NonNullBooleanTransformer} to specify a value for when a
+ * {@link Boolean} is <code>null</code>
  */
 public class NotBooleanTransformer
 	implements Transformer<Boolean, Boolean>, Serializable
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/transformer/NotNullObjectTransformer.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/transformer/NotNullObjectTransformer.java
new file mode 100644
index 0000000000..a43eeaf8ed
--- /dev/null
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/transformer/NotNullObjectTransformer.java
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.common.utility.internal.transformer;
+
+import java.io.Serializable;
+import org.eclipse.jpt.common.utility.transformer.Transformer;
+
+/**
+ * A {@link NotNullObjectTransformer} will transform an object to a
+ * {@link Boolean}:<ul>
+ * <li>If the object is <code>null</code>,
+ * the transformer will return {@link Boolean#FALSE}.
+ * <li>If the object is <em>not</em> <code>null</code>,
+ * the transformer will return {@link Boolean#TRUE}.
+ * </ul>
+ * 
+ * @param <T> the type of the object passed to the transformer
+ */
+public class NotNullObjectTransformer<T>
+	implements Transformer<T, Boolean>, Serializable
+{
+	@SuppressWarnings("rawtypes")
+	public static final Transformer INSTANCE = new NotNullObjectTransformer();
+
+	@SuppressWarnings("unchecked")
+	public static <S> Transformer<S, Boolean> instance() {
+		return INSTANCE;
+	}
+
+	// ensure single instance
+	private NotNullObjectTransformer() {
+		super();
+	}
+
+	public Boolean transform(T o) {
+		return Boolean.valueOf(o != null);
+	}
+
+	@Override
+	public String toString() {
+		return this.getClass().getSimpleName();
+	}
+
+	private static final long serialVersionUID = 1L;
+	private Object readResolve() {
+		// replace this object with the singleton
+		return INSTANCE;
+	}
+}
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/transformer/NullObjectTransformer.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/transformer/NullObjectTransformer.java
new file mode 100644
index 0000000000..27e107802b
--- /dev/null
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/transformer/NullObjectTransformer.java
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.common.utility.internal.transformer;
+
+import java.io.Serializable;
+import org.eclipse.jpt.common.utility.transformer.Transformer;
+
+/**
+ * A {@link NullObjectTransformer} will transform an object to a
+ * {@link Boolean}:<ul>
+ * <li>If the object is <code>null</code>,
+ * the transformer will return {@link Boolean#TRUE}.
+ * <li>If the object is <em>not</em> <code>null</code>,
+ * the transformer will return {@link Boolean#FALSE}.
+ * </ul>
+ * 
+ * @param <T> the type of the object passed to the transformer
+ */
+public class NullObjectTransformer<T>
+	implements Transformer<T, Boolean>, Serializable
+{
+	@SuppressWarnings("rawtypes")
+	public static final Transformer INSTANCE = new NullObjectTransformer();
+
+	@SuppressWarnings("unchecked")
+	public static <S> Transformer<S, Boolean> instance() {
+		return INSTANCE;
+	}
+
+	// ensure single instance
+	private NullObjectTransformer() {
+		super();
+	}
+
+	public Boolean transform(T o) {
+		return Boolean.valueOf(o == null);
+	}
+
+	@Override
+	public String toString() {
+		return this.getClass().getSimpleName();
+	}
+
+	private static final long serialVersionUID = 1L;
+	private Object readResolve() {
+		// replace this object with the singleton
+		return INSTANCE;
+	}
+}
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/transformer/StaticTransformer.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/transformer/StaticTransformer.java
new file mode 100644
index 0000000000..4f248a0f51
--- /dev/null
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/transformer/StaticTransformer.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.common.utility.internal.transformer;
+
+/**
+ * Transform any object, except <code>null</code>, into a single
+ * client-specified object. Any <code>null</code> object will be
+ * transformed into <code>null</code>.
+ * 
+ * @param <T1> the type of the object passed to the transformer
+ * @param <T2> the type of the object returned by the transformer
+ */
+public class StaticTransformer<T1, T2>
+	extends AbstractTransformer<T1, T2>
+{
+	private final T2 object;
+
+	public StaticTransformer() {
+		this(null);
+	}
+
+	public StaticTransformer(T2 object) {
+		super();
+		this.object = object;
+	}
+
+	@Override
+	protected T2 transform_(T1 o) {
+		return this.object;
+	}
+}
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/transformer/Transformer.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/transformer/Transformer.java
index 0a0706ec06..834fc2c810 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/transformer/Transformer.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/transformer/Transformer.java
@@ -37,20 +37,20 @@ public interface Transformer<T1, T2> {
 
 
 	/**
-	 * A "null" transformer will perform no transformation at all;
+	 * A "non" transformer will perform no transformation at all;
 	 * it will simply return the object "untransformed".
 	 */
-	final class Null<S>
+	final class Non<S>
 		implements Transformer<S, S>, Serializable
 	{
 		@SuppressWarnings("rawtypes")
-		public static final Transformer INSTANCE = new Null();
+		public static final Transformer INSTANCE = new Non();
 		@SuppressWarnings("unchecked")
 		public static <R> Transformer<R, R> instance() {
 			return INSTANCE;
 		}
 		// ensure single instance
-		private Null() {
+		private Non() {
 			super();
 		}
 		// simply return the object, unchanged
@@ -69,6 +69,37 @@ public interface Transformer<T1, T2> {
 	}
 
 	/**
+	 * A "null" transformer will always return <code>null</code>.
+	 */
+	final class Null<S1, S2>
+		implements Transformer<S1, S2>, Serializable
+	{
+		@SuppressWarnings("rawtypes")
+		public static final Transformer INSTANCE = new Null();
+		@SuppressWarnings("unchecked")
+		public static <R1, R2> Transformer<R1, R2> instance() {
+			return INSTANCE;
+		}
+		// ensure single instance
+		private Null() {
+			super();
+		}
+		// simply return null
+		public S2 transform(S1 o) {
+			return null;
+		}
+		@Override
+		public String toString() {
+			return ObjectTools.singletonToString(this);
+		}
+		private static final long serialVersionUID = 1L;
+		private Object readResolve() {
+			// replace this object with the singleton
+			return INSTANCE;
+		}
+	}
+
+	/**
 	 * A "disabled" transformer will throw an exception if
 	 * {@link #transform(Object)} is called. This is useful in situations
 	 * where a transformer is optional and the default transformer should
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/ImageDescriptorTest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/ImageDescriptorTest.java
new file mode 100644
index 0000000000..7cb3388f5d
--- /dev/null
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/ImageDescriptorTest.java
@@ -0,0 +1,81 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.common.ui.tests;
+
+import java.lang.reflect.Field;
+import junit.framework.TestCase;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.resource.LocalResourceManager;
+import org.eclipse.jface.resource.ResourceManager;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * This test case will verify that a class's constants
+ * <p>
+ * Construct the test case with the class that defines the image descriptors.
+ */
+@SuppressWarnings("nls")
+public class ImageDescriptorTest
+	extends TestCase
+{
+	private final Class<?> clazz;
+
+
+	public ImageDescriptorTest(Class<?> clazz) {
+		super(buildName(clazz));
+		this.clazz = clazz;
+	}
+
+	private static String buildName(Class<?> clazz) {
+		return ImageDescriptorTest.class.getSimpleName() + ": " + clazz.getName();
+	}
+
+	@Override
+	protected void runTest() throws Throwable {
+		ResourceManager resourceManager = this.buildResourceManager();
+		try {
+			this.runTest(resourceManager);
+		} finally {
+			resourceManager.dispose();
+		}
+	}
+
+	protected void runTest(ResourceManager resourceManager) throws Throwable {
+		for (Field field : this.clazz.getFields()) {
+			Object value = field.get(null);
+			if (value instanceof ImageDescriptor) {
+				ImageDescriptor descriptor = (ImageDescriptor) value;
+				try {
+					Image image = resourceManager.createImage(descriptor);
+					assertNotNull(image);
+				} catch (RuntimeException ex) {
+					fail("Problem loading image for ImageDescriptor defined in static field '"
+							+ this.clazz.getSimpleName() + '.' + field.getName() + "': " + descriptor + " - " + ex);
+				}
+			} else {
+				// ignore non-image descriptors (e.g. strings);
+				// fields should probably not be null...
+				if (value == null) {
+					fail("The static field '"
+							+ this.clazz.getSimpleName() + '.' + field.getName() + "' is null.");
+				}
+			}
+		}
+	}
+
+	protected ResourceManager buildResourceManager() {
+		return new LocalResourceManager(this.getParentResourceManager());
+	}
+
+	private ResourceManager getParentResourceManager() {
+		return JFaceResources.getResources();
+	}
+}
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/JptCommonUiTests.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/JptCommonUiTests.java
index 0deaf5b069..c1d1fcb33c 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/JptCommonUiTests.java
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/JptCommonUiTests.java
@@ -12,6 +12,7 @@ package org.eclipse.jpt.common.ui.tests;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.eclipse.jpt.common.core.tests.BundleActivatorTest;
+import org.eclipse.jpt.common.ui.JptCommonUiImages;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.tests.internal.swt.JptUiSWTTests;
 import org.eclipse.jpt.common.ui.tests.internal.util.JptUiUtilTests;
@@ -23,6 +24,7 @@ public class JptCommonUiTests {
 		suite.addTest(JptUiSWTTests.suite());
 		suite.addTest(JptUiUtilTests.suite());
 		suite.addTest(new BundleActivatorTest(WidgetFactory.class));
+		suite.addTest(new ImageDescriptorTest(JptCommonUiImages.class));
 		return suite;
 	}
 
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/jface/DelegatingLabelProviderUiTest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/jface/DelegatingLabelProviderUiTest.java
index f068c3024d..d04a2e05ad 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/jface/DelegatingLabelProviderUiTest.java
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/jface/DelegatingLabelProviderUiTest.java
@@ -12,6 +12,8 @@ package org.eclipse.jpt.common.ui.tests.internal.jface;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.ActionContributionItem;
 import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.BaseLabelProvider;
 import org.eclipse.jface.viewers.ComboViewer;
@@ -28,7 +30,6 @@ import org.eclipse.jpt.common.ui.internal.jface.ItemTreeStateProviderManager;
 import org.eclipse.jpt.common.ui.internal.jface.StaticItemTreeContentProvider;
 import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider;
 import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProviderFactory;
-import org.eclipse.jpt.common.ui.jface.ItemLabelProvider;
 import org.eclipse.jpt.common.ui.jface.ItemTreeContentProvider;
 import org.eclipse.jpt.common.ui.jface.ItemTreeContentProviderFactory;
 import org.eclipse.jpt.common.ui.jface.TreeStateProvider;
@@ -37,8 +38,8 @@ import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter
 import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
 import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent;
 import org.eclipse.jpt.common.utility.model.listener.PropertyChangeListener;
-import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
+import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -56,28 +57,29 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 
 @SuppressWarnings("nls")
-public class DelegatingLabelProviderUiTest extends ApplicationWindow
+public class DelegatingLabelProviderUiTest
+	extends ApplicationWindow
 {
 	private TreeViewer tree;
-	
-	private ModifiablePropertyValueModel<Vehicle> selectedVehicle;
-	
-	
+
+	/* CU private */ ModifiablePropertyValueModel<Vehicle> selectedVehicleModel = new SimplePropertyValueModel<Vehicle>();
+
+
 	public static void main(String[] args) {
-		Window window = new DelegatingLabelProviderUiTest(args);
+		Window window = new DelegatingLabelProviderUiTest();
 		window.setBlockOnOpen(true);
 		window.open();
+
 		Display.getCurrent().dispose();
 		System.exit(0);
 	}
-	
-	
-	private DelegatingLabelProviderUiTest(String[] args) {
+
+
+	private DelegatingLabelProviderUiTest() {
 		super(null);
-		this.selectedVehicle = new SimplePropertyValueModel<Vehicle>();
 	}
-	
-	
+
+
 	@Override
 	protected Control createContents(Composite parent) {
 		((Shell) parent).setText(this.getClass().getSimpleName());
@@ -86,56 +88,57 @@ public class DelegatingLabelProviderUiTest extends ApplicationWindow
 		Composite mainPanel = new Composite(parent, SWT.NONE);
 		mainPanel.setLayoutData(new GridData(GridData.FILL_BOTH));
 		mainPanel.setLayout(new GridLayout());
-		buildTreePanel(mainPanel);
-		buildControlPanel(mainPanel);
+		this.buildTreePanel(mainPanel);
+		this.buildControlPanel(mainPanel);
 		return mainPanel;
 	}
-	
+
 	private void buildTreePanel(Composite parent) {
 		Composite panel = new Composite(parent, SWT.NONE);
 		panel.setLayoutData(new GridData(GridData.FILL_BOTH));
 		panel.setLayout(new GridLayout());
-		
+
 		Label label = new Label(panel, SWT.NONE);
 		label.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false));
 		label.setText("My Vehicles");
-		
-		tree = new TreeViewer(panel, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
-		tree.getTree().setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true));
-		TreeStateProvider contentAndLabelProvider = 
+
+		this.tree = new TreeViewer(panel, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
+		this.tree.getTree().setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true));
+		TreeStateProvider contentAndLabelProvider =
 			new ItemTreeStateProviderManager(
 				new VehicleContentProviderFactory(),
-				new VehicleLabelProviderFactory());
-		tree.setContentProvider(contentAndLabelProvider);
-		tree.setLabelProvider(contentAndLabelProvider);
-		tree.setInput(new Root());
-		tree.addSelectionChangedListener(buildTreeSelectionChangedListener());
+				new VehicleLabelProviderFactory(),
+				JFaceResources.getResources());
+		this.tree.setContentProvider(contentAndLabelProvider);
+		this.tree.setLabelProvider(contentAndLabelProvider);
+		this.tree.setInput(new Root());
+		this.tree.addSelectionChangedListener(this.buildTreeSelectionChangedListener());
 	}
-	
+
 	private ISelectionChangedListener buildTreeSelectionChangedListener() {
 		return new ISelectionChangedListener() {
 			public void selectionChanged(SelectionChangedEvent event) {
-				selectedVehicle.setValue((Vehicle) ((IStructuredSelection) event.getSelection()).getFirstElement());
+				DelegatingLabelProviderUiTest.this.selectedVehicleModel.setValue((Vehicle) ((IStructuredSelection) event.getSelection()).getFirstElement());
 			}
 		};
 	}
-	
+
 	private void buildControlPanel(Composite parent) {
 		Composite panel = new Composite(parent, SWT.NONE);
 		panel.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		panel.setLayout(new GridLayout());
-		buildUpperControlPanel(panel);
-		buildLowerControlPanel(panel);
+		this.buildUpperControlPanel(panel);
+		this.buildLowerControlPanel(panel);
 	}
-	
+
 	private void buildUpperControlPanel(Composite parent) {
 		Composite panel = new Composite(parent, SWT.NONE);
 		panel.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		panel.setLayout(new GridLayout(2, true));
-		buildVehicleCombo(panel);
-		buildColorCombo(panel);
+		this.buildVehicleCombo(panel);
+		this.buildColorCombo(panel);
 	}
-	
+
 	private void buildVehicleCombo(Composite parent) {
 		final ComboViewer combo = new ComboViewer(parent, SWT.READ_ONLY);
 		combo.getCombo().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
@@ -143,89 +146,89 @@ public class DelegatingLabelProviderUiTest extends ApplicationWindow
 		combo.setLabelProvider(new VehicleTypeLabelProvider());
 		combo.setInput(
 			new VehicleType[] {
-				VehicleType.BICYCLE, VehicleType.CAR, 
+				VehicleType.BICYCLE, VehicleType.CAR,
 				VehicleType.TRUCK, VehicleType.BOAT
 			});
 		combo.getCombo().setEnabled(false);
 		combo.addSelectionChangedListener(
 			new ISelectionChangedListener() {
 				public void selectionChanged(SelectionChangedEvent event) {
-					selectedVehicle().setVehicleType((VehicleType) ((StructuredSelection) event.getSelection()).getFirstElement()); 
+					DelegatingLabelProviderUiTest.this.getSelectedVehicle().setVehicleType((VehicleType) ((StructuredSelection) event.getSelection()).getFirstElement());
 				}
 			});
-		selectedVehicle.addPropertyChangeListener(
-			PropertyValueModel.VALUE, 
+		this.selectedVehicleModel.addPropertyChangeListener(
+			PropertyValueModel.VALUE,
 			new PropertyChangeListener() {
 				public void propertyChanged(PropertyChangeEvent event) {
-					Vehicle vehicle = selectedVehicle();
+					Vehicle vehicle = DelegatingLabelProviderUiTest.this.getSelectedVehicle();
 					combo.getCombo().setEnabled(vehicle != null);
-					combo.setSelection(new StructuredSelection((vehicle == null) ? null : vehicle.vehicleType()));
+					combo.setSelection(new StructuredSelection((vehicle == null) ? null : vehicle.getVehicleType()));
 				}
 			});
 	}
-	
+
 	private void buildColorCombo(Composite parent) {
 		final ComboViewer combo = new ComboViewer(parent, SWT.READ_ONLY);
 		combo.getCombo().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		combo.setContentProvider(new ArrayContentProvider());
 		combo.setLabelProvider(new ColorLabelProvider());
-		combo.setInput(new Color[] {Color.RED, Color.BLUE, Color.YELLOW, Color.GREEN});
+		combo.setInput(new VehicleColor[] {VehicleColor.RED, VehicleColor.BLUE, VehicleColor.YELLOW, VehicleColor.GREEN});
 		combo.addSelectionChangedListener(
 			new ISelectionChangedListener() {
 				public void selectionChanged(SelectionChangedEvent event) {
-					selectedVehicle().setColor((Color) ((StructuredSelection) event.getSelection()).getFirstElement()); 
+					DelegatingLabelProviderUiTest.this.getSelectedVehicle().setColor((VehicleColor) ((StructuredSelection) event.getSelection()).getFirstElement());
 				}
 			});
-		selectedVehicle.addPropertyChangeListener(
-			PropertyValueModel.VALUE, 
+		this.selectedVehicleModel.addPropertyChangeListener(
+			PropertyValueModel.VALUE,
 			new PropertyChangeListener() {
 				public void propertyChanged(PropertyChangeEvent event) {
-					Vehicle vehicle = selectedVehicle();
+					Vehicle vehicle = DelegatingLabelProviderUiTest.this.getSelectedVehicle();
 					combo.getCombo().setEnabled(vehicle != null);
-					combo.setSelection(new StructuredSelection((vehicle == null) ? null : vehicle.color()));
+					combo.setSelection(new StructuredSelection((vehicle == null) ? null : vehicle.getColor()));
 				}
 			});
 	}
-	
+
 	private void buildLowerControlPanel(Composite parent) {
 		Composite panel = new Composite(parent, SWT.NONE);
 		panel.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		panel.setLayout(new GridLayout(3, false));
-		buildEffectsLabel(panel);
-		buildGreyedCheckBox(panel);
-		buildTranslucentCheckBox(panel);
-		buildActionPanel(panel);
+		this.buildEffectsLabel(panel);
+		this.buildGrayedCheckBox(panel);
+		this.buildTranslucentCheckBox(panel);
+		this.buildActionPanel(panel);
 	}
-	
+
 	private void buildEffectsLabel(Composite parent) {
 		Label label = new Label(parent, SWT.LEFT);
 		label.setText("Color effects: ");
 		label.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 3, 1));
 	}
-	
-	private void buildGreyedCheckBox(Composite parent) {
+
+	private void buildGrayedCheckBox(Composite parent) {
 		final Button button = new Button(parent, SWT.CHECK);
 		button.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false));
-		button.setText("greyed");
+		button.setText("grayed");
 		button.setEnabled(false);
 		button.addSelectionListener(
 			new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					selectedVehicle().setGreyed(button.getSelection());
+					DelegatingLabelProviderUiTest.this.getSelectedVehicle().setGrayed(button.getSelection());
 				}
 			});
-		selectedVehicle.addPropertyChangeListener(
-			PropertyValueModel.VALUE, 
+		this.selectedVehicleModel.addPropertyChangeListener(
+			PropertyValueModel.VALUE,
 			new PropertyChangeListener() {
 				public void propertyChanged(PropertyChangeEvent event) {
-					Vehicle vehicle = selectedVehicle();
+					Vehicle vehicle = DelegatingLabelProviderUiTest.this.getSelectedVehicle();
 					button.setEnabled(vehicle != null);
-					button.setSelection(vehicle != null && vehicle.isGreyed());
+					button.setSelection((vehicle != null) && vehicle.isGrayed());
 				}
 			});
 	}
-	
+
 	private void buildTranslucentCheckBox(Composite parent) {
 		final Button button = new Button(parent, SWT.CHECK);
 		button.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, true, false));
@@ -235,74 +238,76 @@ public class DelegatingLabelProviderUiTest extends ApplicationWindow
 			new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					selectedVehicle().setTranslucent(button.getSelection());
+					DelegatingLabelProviderUiTest.this.getSelectedVehicle().setTranslucent(button.getSelection());
 				}
 			});
-		selectedVehicle.addPropertyChangeListener(
-			PropertyValueModel.VALUE, 
+		this.selectedVehicleModel.addPropertyChangeListener(
+			PropertyValueModel.VALUE,
 			new PropertyChangeListener() {
 				public void propertyChanged(PropertyChangeEvent event) {
-					Vehicle vehicle = selectedVehicle();
+					Vehicle vehicle = DelegatingLabelProviderUiTest.this.getSelectedVehicle();
 					button.setEnabled(vehicle != null);
-					button.setSelection(vehicle != null && vehicle.isTranslucent());
+					button.setSelection((vehicle != null) && vehicle.isTranslucent());
 				}
 			});
 	}
-	
+
 	private void buildActionPanel(Composite parent) {
 		Composite panel = new Composite(parent, SWT.NONE);
 		panel.setLayoutData(new GridData(GridData.END, GridData.FILL, false, false));
 		panel.setLayout(new GridLayout());
-		buildRefreshTreeACI().fill(panel);
+		this.buildRefreshTreeACI().fill(panel);
 	}
-	
+
 	private ActionContributionItem buildRefreshTreeACI() {
 		Action action = new Action("Refresh tree", IAction.AS_PUSH_BUTTON) {
 			@Override
 			public void run() {
-				refreshTree();
+				DelegatingLabelProviderUiTest.this.refreshTree();
 			}
 		};
 		action.setToolTipText("Refresh the tree's labels");
 		return new ActionContributionItem(action);
 	}
-	
+
 	void refreshTree() {
-		tree.refresh();
+		this.tree.refresh();
 	}
-	
-	private Vehicle selectedVehicle() {
-		return selectedVehicle.getValue();
+
+	Vehicle getSelectedVehicle() {
+		return this.selectedVehicleModel.getValue();
 	}
-	
-	
-	private static class VehicleTypeLabelProvider extends BaseLabelProvider
+
+
+	/* CU private */ static class VehicleTypeLabelProvider
+		extends BaseLabelProvider
 		implements ILabelProvider
 	{
 		public Image getImage(Object element) {
 			return null;
 		}
-		
+
 		public String getText(Object element) {
-			return ((VehicleType) element).description();
+			return ((VehicleType) element).getDescription();
 		}
 	}
-	
-	
-	private static class ColorLabelProvider extends BaseLabelProvider
+
+
+	/* CU private */ static class ColorLabelProvider
+		extends BaseLabelProvider
 		implements ILabelProvider
 	{
 		public Image getImage(Object element) {
 			return null;
 		}
-		
+
 		public String getText(Object element) {
-			return ((Color) element).description();
+			return ((VehicleColor) element).getDescription();
 		}
 	}
-	
-	
-	private static class VehicleContentProviderFactory
+
+
+	/* CU private */ static class VehicleContentProviderFactory
 		implements ItemTreeContentProviderFactory
 	{
 		public ItemTreeContentProvider buildProvider(Object item, ItemTreeContentProvider.Manager manager) {
@@ -312,52 +317,52 @@ public class DelegatingLabelProviderUiTest extends ApplicationWindow
 			return this.buildVehicleProvider((Vehicle) item);
 		}
 		protected ItemTreeContentProvider buildRootProvider(Root item) {
-			return new StaticItemTreeContentProvider(null, item.vehicles());
+			return new StaticItemTreeContentProvider(null, item.getVehicles());
 		}
 		protected ItemTreeContentProvider buildVehicleProvider(Vehicle item) {
 			return new StaticItemTreeContentProvider(item.parent());
 		}
 	}
-	
-	
-	private static class VehicleLabelProviderFactory
+
+
+	/* CU private */ static class VehicleLabelProviderFactory
 		implements ItemExtendedLabelProviderFactory
 	{
 		public ItemExtendedLabelProvider buildProvider(Object item, ItemExtendedLabelProvider.Manager manager) {
 			return new VehicleLabelProvider((Vehicle) item, manager);
 		}
 	}
-	
-	
-	private static class VehicleLabelProvider
+
+
+	/* CU private */ static class VehicleLabelProvider
 		extends AbstractItemExtendedLabelProvider<Vehicle>
 	{
-		public VehicleLabelProvider(Vehicle vehicle, ItemLabelProvider.Manager manager) {
+		public VehicleLabelProvider(Vehicle vehicle, ItemExtendedLabelProvider.Manager manager) {
 			super(vehicle, manager);
 		}
-		
+
 		@Override
-		protected PropertyValueModel<Image> buildImageModel() {
-			return new PropertyAspectAdapter<Vehicle, Image>(IMAGE_ASPECT_NAMES, this.item) {
+		protected PropertyValueModel<ImageDescriptor> buildImageDescriptorModel() {
+			return new PropertyAspectAdapter<Vehicle, ImageDescriptor>(IMAGE_ASPECT_NAMES, this.item) {
 				@Override
-				protected Image buildValue_() {
-					return subject.image();
+				protected ImageDescriptor buildValue_() {
+					return this.subject.getImageDescriptor();
 				}
 			};
 		}
 		private static final String[] IMAGE_ASPECT_NAMES =
 				new String[] {
 					Vehicle.COLOR_PROPERTY,
-					Vehicle.GREYED_PROPERTY,
+					Vehicle.GRAYED_PROPERTY,
 					Vehicle.TRANSLUCENT_PROPERTY
 				};
-		
+
 		@Override
 		protected PropertyValueModel<String> buildTextModel() {
 			return new PropertyAspectAdapter<Vehicle, String>(TEXT_ASPECT_NAMES, this.item) {
 				@Override
 				protected String buildValue_() {
-					return subject.color().description() + ' ' + subject.vehicleType().description();
+					return this.subject.getColor().getDescription() + ' ' + this.subject.getVehicleType().getDescription();
 				}
 			};
 		}
@@ -366,201 +371,198 @@ public class DelegatingLabelProviderUiTest extends ApplicationWindow
 					Vehicle.VEHICLE_TYPE_PROPERTY,
 					Vehicle.COLOR_PROPERTY
 				};
-		
+
 		@Override
 		protected PropertyValueModel<String> buildDescriptionModel() {
-			return buildTextModel();
+			return this.buildTextModel();
 		}
 	}
-	
-	
-	private static abstract class TreeNode extends AbstractModel
+
+
+	private static abstract class TreeNode
+		extends AbstractModel
 	{
 		private TreeNode parent;
-		
-		
+
 		public TreeNode(TreeNode parent) {
 			this.parent = parent;
 		}
-		
-		
+
 		public TreeNode parent() {
-			return parent;
+			return this.parent;
 		}
 	}
-	
-	
-	private static class Root extends TreeNode
+
+
+	private static class Root
+		extends TreeNode
 	{
 		protected final Vehicle[] vehicles;
-		
-		
+
 		public Root() {
 			super(null);
-			vehicles = new Vehicle[] {
-				new Vehicle(this, VehicleType.BICYCLE, Color.BLUE),
-				new Vehicle(this, VehicleType.CAR, Color.YELLOW),
-				new Vehicle(this, VehicleType.TRUCK, Color.RED),
-				new Vehicle(this, VehicleType.BOAT, Color.GREEN)};
+			this.vehicles = this.buildVehicles();
+		}
+
+		private Vehicle[] buildVehicles() {
+			return new Vehicle[] {
+					new Vehicle(this, VehicleType.BICYCLE, VehicleColor.BLUE),
+					new Vehicle(this, VehicleType.CAR, VehicleColor.YELLOW),
+					new Vehicle(this, VehicleType.TRUCK, VehicleColor.RED),
+					new Vehicle(this, VehicleType.BOAT, VehicleColor.GREEN)
+				};
 		}
-		
-		public Vehicle[] vehicles() {
-			return vehicles;
+
+		public Vehicle[] getVehicles() {
+			return this.vehicles;
 		}
 	}
-	
-	
-	private static class Vehicle extends TreeNode
+
+
+	/* CU private */ static class Vehicle
+		extends TreeNode
 	{
 		private VehicleType vehicleType;
 		public final static String VEHICLE_TYPE_PROPERTY = "vehicleType";
-		
-		private Color color;
+
+		private VehicleColor color;
 		public final static String COLOR_PROPERTY = "color";
-		
-		private boolean greyed = false;
-		public final static String GREYED_PROPERTY = "greyed";
-		
+
+		private boolean grayed = false;
+		public final static String GRAYED_PROPERTY = "grayed";
+
 		private boolean translucent = false;
 		public final static String TRANSLUCENT_PROPERTY = "translucent";
-		
-		private Image image;
-		
-			
-		public Vehicle(TreeNode parent, VehicleType vehicleType, Color color) {
+
+
+		Vehicle(TreeNode parent, VehicleType vehicleType, VehicleColor color) {
 			super(parent);
 			this.vehicleType = vehicleType;
 			this.color = color;
 		}
-		
-		public VehicleType vehicleType() {
-			return vehicleType;
-		}
-		
-		public void setVehicleType(VehicleType newVehicleType) {
-			VehicleType oldVehicleType = vehicleType;
-			vehicleType = newVehicleType;
-			firePropertyChanged(VEHICLE_TYPE_PROPERTY, oldVehicleType, newVehicleType);
-		}
-		
-		public Color color() {
-			return color;
-		}
-		
-		public void setColor(Color newColor) {
-			Color oldColor = color;
-			color = newColor;
-			firePropertyChanged(COLOR_PROPERTY, oldColor, newColor);
-		}
-		
-		public boolean isGreyed() {
-			return greyed;
-		}
-		
-		public void setGreyed(boolean newGreyed) {
-			boolean oldGreyed = greyed;
-			greyed = newGreyed;
-			firePropertyChanged(GREYED_PROPERTY, oldGreyed, newGreyed);
-		}
-		
+
+		public VehicleType getVehicleType() {
+			return this.vehicleType;
+		}
+
+		public void setVehicleType(VehicleType vehicleType) {
+			VehicleType old = this.vehicleType;
+			this.vehicleType = vehicleType;
+			this.firePropertyChanged(VEHICLE_TYPE_PROPERTY, old, vehicleType);
+		}
+
+		public VehicleColor getColor() {
+			return this.color;
+		}
+
+		public void setColor(VehicleColor color) {
+			VehicleColor old = this.color;
+			this.color = color;
+			this.firePropertyChanged(COLOR_PROPERTY, old, color);
+		}
+
+		public boolean isGrayed() {
+			return this.grayed;
+		}
+
+		public void setGrayed(boolean grayed) {
+			boolean old = this.grayed;
+			this.grayed = grayed;
+			this.firePropertyChanged(GRAYED_PROPERTY, old, grayed);
+		}
+
 		public boolean isTranslucent() {
-			return translucent;
-		}
-		
-		public void setTranslucent(boolean newTranslucent) {
-			boolean oldTranslucent = translucent;
-			translucent = newTranslucent;
-			firePropertyChanged(TRANSLUCENT_PROPERTY, oldTranslucent, newTranslucent);
-		}
-		
-		public Image image() {
-			if (image != null) {
-				image.dispose();
-			}
-			
-			return ImageFactory.image(color(), greyed, translucent);
+			return this.translucent;
+		}
+
+		public void setTranslucent(boolean translucent) {
+			boolean old = this.translucent;
+			this.translucent = translucent;
+			this.firePropertyChanged(TRANSLUCENT_PROPERTY, old, translucent);
+		}
+
+		public ImageDescriptor getImageDescriptor() {
+			return VehicleImageDescriptorFactory.buildImageDescriptor(this.color, this.grayed, this.translucent);
 		}
 	}
-	
-	
-	private static enum VehicleType
-	{
+
+
+	/* CU private */ static enum VehicleType {
 		BICYCLE("bicycle"),
 		CAR("car"),
 		TRUCK("truck"),
 		BOAT("boat");
-		
+
 		private final String description;
-		
+
 		private VehicleType(String description) {
 			this.description = description;
 		}
-		
-		public String description() {
-			return description;
+
+		public String getDescription() {
+			return this.description;
 		}
-		
+
 		@Override
 		public String toString() {
-			return description();
+			return this.description;
 		}
 	}
-	
-	
-	private static enum Color
-	{
+
+
+	/* CU private */ static enum VehicleColor {
 		RED("red", new RGB(255, 0, 0)),
 		BLUE("blue", new RGB(0, 0, 255)),
 		YELLOW("yellow", new RGB(255, 255, 0)),
 		GREEN("green", new RGB(0, 255, 0));
-		
+
 		private final String description;
-		
+
 		private final RGB rgb;
-		
-		private Color(String description, RGB rgb) {
+
+		private VehicleColor(String description, RGB rgb) {
 			this.description = description;
 			this.rgb = rgb;
 		}
-		
-		public String description() {
-			return description;
+
+		public String getDescription() {
+			return this.description;
 		}
-		
+
 		public RGB rgb() {
-			return rgb;
+			return this.rgb;
 		}
-		
+
 		@Override
 		public String toString() {
-			return description();
+			return this.description;
 		}
 	}
-	
-	
-	private static class ImageFactory
-	{
-		private static RGB rgb(Color color, boolean greyed, boolean translucent) {
-			RGB rgb = (greyed) ? new RGB(127, 127, 127) : color.rgb();
+
+
+	/* CU private */ static class VehicleImageDescriptorFactory {
+		static ImageDescriptor buildImageDescriptor(VehicleColor color, boolean grayed, boolean translucent) {
+			PaletteData pd = new PaletteData(new RGB[] { buildRGB(color, grayed, translucent) });
+			ImageData imageData = new ImageData(20, 20, 1, pd);
+			for (int x = 0; x < 20; x ++) {
+				for (int y = 0; y < 20; y ++) {
+					imageData.setPixel(x, y, 0);
+				}
+			}
+			return ImageDescriptor.createFromImageData(imageData);
+		}
+
+		private static RGB buildRGB(VehicleColor color, boolean grayed, boolean translucent) {
+			RGB rgb = (grayed) ? GRAY : color.rgb();
 			if (translucent) {
 				rgb = new RGB(translucify(rgb.red), translucify(rgb.green), translucify(rgb.blue));
 			}
 			return rgb;
 		}
-		
-		private static int translucify(int color) {
-			return 255 - (int) ((255 - color) * 0.3);
-		}
-		
-		public static Image image(Color color, boolean greyed, boolean translucent) {
-			PaletteData pd = new PaletteData(new RGB[] {rgb(color, greyed, translucent)});
-			ImageData id = new ImageData(20, 20, 1, pd);
-			for (int x = 0; x < 20; x ++) {
-				for (int y = 0; y < 20; y ++) {
-					id.setPixel(x, y, 0);
-				}
-			}
-			return new Image(Display.getCurrent(), id);
+		private static final RGB GRAY = new RGB(127, 127, 127);
+
+		private static int translucify(int colorComponent) {
+			return 255 - (int) ((255 - colorComponent) * 0.3);
 		}
 	}
 }
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/jface/DelegatingTreeContentProviderUiTest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/jface/DelegatingTreeContentProviderUiTest.java
index 347ff9aff2..a5832fc4e8 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/jface/DelegatingTreeContentProviderUiTest.java
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/jface/DelegatingTreeContentProviderUiTest.java
@@ -3,19 +3,17 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
+ *
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
 package org.eclipse.jpt.common.ui.tests.internal.jface;
 
 import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.ActionContributionItem;
 import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.viewers.BaseLabelProvider;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -31,10 +29,8 @@ import org.eclipse.jpt.common.ui.internal.jface.ItemTreeStateProviderManager;
 import org.eclipse.jpt.common.ui.jface.ItemTreeContentProvider;
 import org.eclipse.jpt.common.ui.jface.ItemTreeContentProviderFactory;
 import org.eclipse.jpt.common.utility.internal.collection.CollectionTools;
-import org.eclipse.jpt.common.utility.internal.filter.NotNullFilter;
-import org.eclipse.jpt.common.utility.internal.iterator.FilteringIterator;
-import org.eclipse.jpt.common.utility.internal.iterator.ReadOnlyListIterator;
-import org.eclipse.jpt.common.utility.internal.iterator.TransformationIterator;
+import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable;
+import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable;
 import org.eclipse.jpt.common.utility.internal.model.AbstractModel;
 import org.eclipse.jpt.common.utility.internal.model.value.CompositeCollectionValueModel;
 import org.eclipse.jpt.common.utility.internal.model.value.ListAspectAdapter;
@@ -42,11 +38,13 @@ import org.eclipse.jpt.common.utility.internal.model.value.ListCollectionValueMo
 import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
 import org.eclipse.jpt.common.utility.internal.model.value.StaticCollectionValueModel;
 import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter;
+import org.eclipse.jpt.common.utility.iterable.ListIterable;
 import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent;
 import org.eclipse.jpt.common.utility.model.listener.PropertyChangeListener;
 import org.eclipse.jpt.common.utility.model.value.CollectionValueModel;
 import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
+import org.eclipse.jpt.common.utility.transformer.Transformer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
@@ -59,13 +57,14 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
 @SuppressWarnings("nls")
-public class DelegatingTreeContentProviderUiTest extends ApplicationWindow
+public class DelegatingTreeContentProviderUiTest
+	extends ApplicationWindow
 {
-	private final Root root;
+	/* CU private */ final Root root;
 
-	private ModifiablePropertyValueModel<TreeNode> selectedNode;
+	/* CU private */ ModifiablePropertyValueModel<TreeNode> selectedNodeModel;
 
-	private TreeViewer controlTree;
+	/* CU private */ TreeViewer controlTree;
 
 	private TreeViewer viewTree;
 
@@ -73,18 +72,19 @@ public class DelegatingTreeContentProviderUiTest extends ApplicationWindow
 
 
 	public static void main(String[] args) {
-		Window window = new DelegatingTreeContentProviderUiTest(args);
+		Window window = new DelegatingTreeContentProviderUiTest();
 		window.setBlockOnOpen(true);
 		window.open();
+
 		Display.getCurrent().dispose();
 		System.exit(0);
 	}
 
-	private DelegatingTreeContentProviderUiTest(String[] args) {
+	private DelegatingTreeContentProviderUiTest() {
 		super(null);
 		this.root = new Root();
 		this.root.addChild("Parent_1");
-		this.selectedNode = new SimplePropertyValueModel<TreeNode>(this.root);
+		this.selectedNodeModel = new SimplePropertyValueModel<TreeNode>(this.root);
 	}
 
 	@Override
@@ -95,8 +95,8 @@ public class DelegatingTreeContentProviderUiTest extends ApplicationWindow
 		Composite mainPanel = new Composite(parent, SWT.NONE);
 		mainPanel.setLayoutData(new GridData(GridData.FILL_BOTH));
 		mainPanel.setLayout(new GridLayout());
-		buildTreePanel(mainPanel);
-		buildControlPanel(mainPanel);
+		this.buildTreePanel(mainPanel);
+		this.buildControlPanel(mainPanel);
 		return mainPanel;
 	}
 
@@ -104,30 +104,30 @@ public class DelegatingTreeContentProviderUiTest extends ApplicationWindow
 		Composite panel = new Composite(parent, SWT.NONE);
 		panel.setLayoutData(new GridData(GridData.FILL_BOTH));
 		panel.setLayout(new GridLayout(2, true));
-		buildControlTreePanel(panel);
-		buildViewTreePanel(panel);
+		this.buildControlTreePanel(panel);
+		this.buildViewTreePanel(panel);
 	}
 
 	private void buildControlTreePanel(Composite parent) {
-		controlTree = buildTreePanel(
+		this.controlTree = this.buildTreePanel(
 				parent, "Control tree",
-				new ItemTreeStateProviderManager(new ControlTreeItemContentProviderFactory()),
+				new ItemTreeStateProviderManager(new ControlTreeItemContentProviderFactory(), JFaceResources.getResources()),
 				new LabelProvider());
-		controlTree.addSelectionChangedListener(buildTreeSelectionChangedListener());
-		selectedNode.addPropertyChangeListener(
+		this.controlTree.addSelectionChangedListener(this.buildTreeSelectionChangedListener());
+		this.selectedNodeModel.addPropertyChangeListener(
 				PropertyValueModel.VALUE,
 				new PropertyChangeListener() {
 					public void propertyChanged(PropertyChangeEvent event) {
-						controlTree.setSelection(new StructuredSelection(event.getNewValue()));
+						DelegatingTreeContentProviderUiTest.this.controlTree.setSelection(new StructuredSelection(event.getNewValue()));
 					}
 				}
 			);
 	}
 
 	private void buildViewTreePanel(Composite parent) {
-		viewTree = buildTreePanel(
+		this.viewTree = this.buildTreePanel(
 				parent, "View tree",
-				new ItemTreeStateProviderManager(new ViewItemTreeContentProviderFactory()),
+				new ItemTreeStateProviderManager(new ViewItemTreeContentProviderFactory(), JFaceResources.getResources()),
 				new LabelProvider());
 	}
 
@@ -144,7 +144,7 @@ public class DelegatingTreeContentProviderUiTest extends ApplicationWindow
 		tree.getTree().setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true));
 		tree.setContentProvider(contentProvider);
 		tree.setLabelProvider(labelProvider);
-		tree.setInput(root);
+		tree.setInput(this.root);
 
 		return tree;
 	}
@@ -153,7 +153,7 @@ public class DelegatingTreeContentProviderUiTest extends ApplicationWindow
 		return new ISelectionChangedListener() {
 			public void selectionChanged(SelectionChangedEvent event) {
 				TreeNode selection = (TreeNode) ((IStructuredSelection) event.getSelection()).getFirstElement();
-				selectedNode.setValue((selection == null) ? root : selection);
+				DelegatingTreeContentProviderUiTest.this.selectedNodeModel.setValue((selection == null) ? DelegatingTreeContentProviderUiTest.this.root : selection);
 			}
 		};
 	}
@@ -162,28 +162,28 @@ public class DelegatingTreeContentProviderUiTest extends ApplicationWindow
 		Composite panel = new Composite(parent, SWT.NONE);
 		panel.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
 		panel.setLayout(new GridLayout(6, false));
-		buildNodeNameText(panel);
-		buildAddChildACI().fill(panel);
-		buildAddNestedChildACI().fill(panel);
-		buildRemoveACI().fill(panel);
-		buildClearModelACI().fill(panel);
-		buildRestoreModelACI().fill(panel);
+		this.buildNodeNameText(panel);
+		this.buildAddChildACI().fill(panel);
+		this.buildAddNestedChildACI().fill(panel);
+		this.buildRemoveACI().fill(panel);
+		this.buildClearModelACI().fill(panel);
+		this.buildRestoreModelACI().fill(panel);
 	}
 
 	private void buildNodeNameText(Composite parent) {
-		nodeNameText = new Text(parent, SWT.SINGLE | SWT.BORDER);
-		nodeNameText.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		this.nodeNameText = new Text(parent, SWT.SINGLE | SWT.BORDER);
+		this.nodeNameText.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 	}
 
 	private ActionContributionItem buildAddChildACI() {
 		final Action action = new Action("Add child", IAction.AS_PUSH_BUTTON) {
 			@Override
 			public void run() {
-				addChild();
+				DelegatingTreeContentProviderUiTest.this.addChild();
 			}
 		};
 		action.setToolTipText("Add a child with the given name");
-		selectedNode.addPropertyChangeListener(
+		this.selectedNodeModel.addPropertyChangeListener(
 				PropertyValueModel.VALUE,
 				new PropertyChangeListener() {
 					public void propertyChanged(PropertyChangeEvent event) {
@@ -198,12 +198,12 @@ public class DelegatingTreeContentProviderUiTest extends ApplicationWindow
 		final Action action = new Action("Add nested child", IAction.AS_PUSH_BUTTON) {
 			@Override
 			public void run() {
-				addNestedChild();
+				DelegatingTreeContentProviderUiTest.this.addNestedChild();
 			}
 		};
 		action.setToolTipText("Add a nested child with the given name");
 		action.setEnabled(false);
-		selectedNode.addPropertyChangeListener(
+		this.selectedNodeModel.addPropertyChangeListener(
 				PropertyValueModel.VALUE,
 				new PropertyChangeListener() {
 					public void propertyChanged(PropertyChangeEvent event) {
@@ -218,16 +218,16 @@ public class DelegatingTreeContentProviderUiTest extends ApplicationWindow
 		final Action action = new Action("Remove", IAction.AS_PUSH_BUTTON) {
 			@Override
 			public void run() {
-				remove();
+				DelegatingTreeContentProviderUiTest.this.remove();
 			}
 		};
 		action.setToolTipText("Remove the selected node");
 		action.setEnabled(false);
-		selectedNode.addPropertyChangeListener(
+		this.selectedNodeModel.addPropertyChangeListener(
 				PropertyValueModel.VALUE,
 				new PropertyChangeListener() {
 					public void propertyChanged(PropertyChangeEvent event) {
-						action.setEnabled(event.getNewValue() != root);
+						action.setEnabled(event.getNewValue() != DelegatingTreeContentProviderUiTest.this.root);
 					}
 				}
 			);
@@ -238,7 +238,7 @@ public class DelegatingTreeContentProviderUiTest extends ApplicationWindow
 		Action action = new Action("Clear model", IAction.AS_PUSH_BUTTON) {
 			@Override
 			public void run() {
-				clearModel();
+				DelegatingTreeContentProviderUiTest.this.clearModel();
 			}
 		};
 		action.setToolTipText("Clear the model");
@@ -249,7 +249,7 @@ public class DelegatingTreeContentProviderUiTest extends ApplicationWindow
 		Action action = new Action("Restore model", IAction.AS_PUSH_BUTTON) {
 			@Override
 			public void run() {
-				restoreModel();
+				DelegatingTreeContentProviderUiTest.this.restoreModel();
 			}
 		};
 		action.setToolTipText("Restore the model");
@@ -257,36 +257,36 @@ public class DelegatingTreeContentProviderUiTest extends ApplicationWindow
 	}
 
 	void addChild() {
-		String nodeName = nodeNameText.getText();
+		String nodeName = this.nodeNameText.getText();
 		if (nodeName.length() != 0) {
-			selectedNode.getValue().addChild(nodeName);
+			this.selectedNodeModel.getValue().addChild(nodeName);
 		}
 	}
 
 	void addNestedChild() {
-		String nodeName = nodeNameText.getText();
+		String nodeName = this.nodeNameText.getText();
 		if (nodeName.length() != 0) {
-			selectedNode.getValue().addNestedChild(nodeName);
+			this.selectedNodeModel.getValue().addNestedChild(nodeName);
 		}
 	}
 
 	void remove() {
-		TreeNode node = selectedNode.getValue();
+		TreeNode node = this.selectedNodeModel.getValue();
 		node.parent().removeChild(node);
 	}
 
 	void clearModel() {
-		controlTree.setInput(null);
-		viewTree.setInput(null);
+		this.controlTree.setInput(null);
+		this.viewTree.setInput(null);
 	}
 
 	void restoreModel() {
-		controlTree.setInput(root);
-		viewTree.setInput(root);
+		this.controlTree.setInput(this.root);
+		this.viewTree.setInput(this.root);
 	}
 
 
-	static abstract class AbstractTreeItemContentProviderFactory
+	/* CU private */ static abstract class AbstractTreeItemContentProviderFactory
 		implements ItemTreeContentProviderFactory
 	{
 		public ItemTreeContentProvider buildProvider(Object item, ItemTreeContentProvider.Manager manager) {
@@ -295,14 +295,14 @@ public class DelegatingTreeContentProviderUiTest extends ApplicationWindow
 	}
 
 
-	static class ControlTreeItemContentProviderFactory
+	/* CU private */ static class ControlTreeItemContentProviderFactory
 		extends AbstractTreeItemContentProviderFactory
 	{
 		// nothing
 	}
 
 
-	static class ViewItemTreeContentProviderFactory
+	/* CU private */ static class ViewItemTreeContentProviderFactory
 		extends AbstractTreeItemContentProviderFactory
 	{
 		@Override
@@ -315,10 +315,10 @@ public class DelegatingTreeContentProviderUiTest extends ApplicationWindow
 	}
 
 
-	static class GenericItemTreeContentProvider
+	/* CU private */ static class GenericItemTreeContentProvider
 		extends AbstractItemTreeContentProvider<TreeNode, TreeNode>
 	{
-		public GenericItemTreeContentProvider(TreeNode treeNode, ItemTreeContentProvider.Manager manager) {
+		GenericItemTreeContentProvider(TreeNode treeNode, ItemTreeContentProvider.Manager manager) {
 			super(treeNode, manager);
 		}
 
@@ -329,19 +329,20 @@ public class DelegatingTreeContentProviderUiTest extends ApplicationWindow
 		@Override
 		protected CollectionValueModel<TreeNode> buildChildrenModel() {
 			return new ListCollectionValueModelAdapter<TreeNode>(
-			new ListAspectAdapter<TreeNode, TreeNode>(TreeNode.CHILDREN_LIST, this.item) {
-				@Override
-				protected ListIterator<TreeNode> listIterator_() {
-					return this.subject.children();
-				}
-			});
+					new ListAspectAdapter<TreeNode, TreeNode>(TreeNode.CHILDREN_LIST, this.item) {
+						@Override
+						protected ListIterable<TreeNode> getListIterable() {
+							return this.subject.getChildren();
+						}
+					}
+				);
 		}
 	}
 
-	static class ViewParentItemTreeContentProvider
+	/* CU private */ static class ViewParentItemTreeContentProvider
 		extends GenericItemTreeContentProvider
 	{
-		public ViewParentItemTreeContentProvider(TreeNode treeNode, ItemTreeContentProvider.Manager manager) {
+		ViewParentItemTreeContentProvider(TreeNode treeNode, ItemTreeContentProvider.Manager manager) {
 			super(treeNode, manager);
 		}
 
@@ -356,32 +357,36 @@ public class DelegatingTreeContentProviderUiTest extends ApplicationWindow
 
 		@Override
 		protected CollectionValueModel<TreeNode> buildChildrenModel() {
-				return new CompositeCollectionValueModel<TreeNode, TreeNode>(super.buildChildrenModel(), new TreeNodeTransformer());
+			return new CompositeCollectionValueModel<TreeNode, TreeNode>(super.buildChildrenModel(), TREE_NODE_TRANSFORMER);
 		}
 	}
 
-	static class TreeNodeTransformer
+	/* CU private */ static Transformer<TreeNode, CollectionValueModel<TreeNode>> TREE_NODE_TRANSFORMER = new TreeNodeTransformer();
+	/* CU private */ static class TreeNodeTransformer
 		extends TransformerAdapter<TreeNode, CollectionValueModel<TreeNode>>
 	{
 		@Override
 		public CollectionValueModel<TreeNode> transform(TreeNode value) {
-			if (value instanceof Nest) {
-				final Nest nest = (Nest) value;
-				return new ListCollectionValueModelAdapter<TreeNode>(
-						new ListAspectAdapter<TreeNode, TreeNode>(TreeNode.CHILDREN_LIST, nest) {
-							@Override
-							protected ListIterator<TreeNode> listIterator_() {
-								return nest.children();
-							}
+			return (value instanceof Nest) ?
+						this.transform((Nest) value) :
+						new StaticCollectionValueModel<TreeNode>(CollectionTools.collection(value));
+		}
+
+		private CollectionValueModel<TreeNode> transform(final Nest nest) {
+			return new ListCollectionValueModelAdapter<TreeNode>(
+					new ListAspectAdapter<TreeNode, TreeNode>(TreeNode.CHILDREN_LIST, nest) {
+						@Override
+						protected ListIterable<TreeNode> getListIterable() {
+							return this.subject.getChildren();
 						}
-					);
-			}
-			return new StaticCollectionValueModel<TreeNode>(CollectionTools.collection(value));
+					}
+				);
 		}
 	}
 
 
-	static class LabelProvider extends BaseLabelProvider
+	/* CU private */ static class LabelProvider
+		extends BaseLabelProvider
 		implements ILabelProvider
 	{
 		public Image getImage(Object element) {
@@ -394,58 +399,58 @@ public class DelegatingTreeContentProviderUiTest extends ApplicationWindow
 	}
 
 
-	static abstract class TreeNode extends AbstractModel
+	/* CU private */ static abstract class TreeNode
+		extends AbstractModel
 	{
 		private TreeNode parent;
 
-		protected final List<TreeNode> children;
+		protected final ArrayList<TreeNode> children = new ArrayList<TreeNode>();
 		public final static String CHILDREN_LIST = "children";
 
 		protected String name;
 		public final static String NAME_PROPERTY = "name";
 
 
-		public TreeNode(TreeNode parent, String name) {
+		TreeNode(TreeNode parent, String name) {
 			this.parent = parent;
-			this.children = new ArrayList<TreeNode>();
 			this.name = name;
 		}
 
 		public TreeNode parent() {
-			return parent;
+			return this.parent;
 		}
 
-		public ListIterator<TreeNode> children() {
-			return new ReadOnlyListIterator<TreeNode>(children);
+		public ListIterable<TreeNode> getChildren() {
+			return new LiveCloneListIterable<TreeNode>(this.children);
 		}
 
 		protected void addChild(TreeNode child) {
-			addItemToList(child, children, CHILDREN_LIST);
+			this.addItemToList(child, this.children, CHILDREN_LIST);
 		}
 
 		public void removeChild(TreeNode child) {
-			removeItemFromList(child, children, CHILDREN_LIST);
+			this.removeItemFromList(child, this.children, CHILDREN_LIST);
 		}
 
 		public void removeChild(int index) {
-			removeItemFromList(index, children, CHILDREN_LIST);
+			this.removeItemFromList(index, this.children, CHILDREN_LIST);
 		}
 
 		public String getName() {
-			return name;
+			return this.name;
 		}
 
-		public void setName(String newName) {
-			String oldName = name;
-			name = newName;
-			firePropertyChanged(NAME_PROPERTY, oldName, newName);
+		public void setName(String name) {
+			String old = this.name;
+			this.name = name;
+			this.firePropertyChanged(NAME_PROPERTY, old, name);
 		}
 
 		public boolean canHaveChildren() {
 			return false;
 		}
 
-		public void addChild(String name) {
+		public void addChild(@SuppressWarnings("unused") String childName) {
 			throw new UnsupportedOperationException();
 		}
 
@@ -453,20 +458,21 @@ public class DelegatingTreeContentProviderUiTest extends ApplicationWindow
 			return false;
 		}
 
-		public void addNestedChild(String name) {
+		public void addNestedChild(@SuppressWarnings("unused") String childName) {
 			throw new UnsupportedOperationException();
 		}
 
 		@Override
 		public void toString(StringBuilder sb) {
-			sb.append(getName());
+			sb.append(this.name);
 		}
 	}
 
 
-	static class Root extends TreeNode
+	/* CU private */ static class Root
+		extends TreeNode
 	{
-		public Root() {
+		Root() {
 			super(null, null);
 		}
 
@@ -476,15 +482,16 @@ public class DelegatingTreeContentProviderUiTest extends ApplicationWindow
 		}
 
 		@Override
-		public void addChild(String name) {
-			addChild(new Parent(this, name));
+		public void addChild(String childName) {
+			this.addChild(new Parent(this, childName));
 		}
 	}
 
 
-	static class Parent extends TreeNode
+	/* CU private */ static class Parent
+		extends TreeNode
 	{
-		public Parent(TreeNode parent, String name) {
+		Parent(TreeNode parent, String name) {
 			super(parent, name);
 		}
 
@@ -494,8 +501,8 @@ public class DelegatingTreeContentProviderUiTest extends ApplicationWindow
 		}
 
 		@Override
-		public void addChild(String name) {
-			addChild(new Child(this, name));
+		public void addChild(String childName) {
+			this.addChild(new Child(this, childName));
 		}
 
 		@Override
@@ -504,55 +511,54 @@ public class DelegatingTreeContentProviderUiTest extends ApplicationWindow
 		}
 
 		@Override
-		public void addNestedChild(String name) {
+		public void addNestedChild(String childName) {
 			TreeNode nest = new Nest(this);
-			addChild(nest);
-			nest.addChild(name);
+			this.addChild(nest);
+			nest.addChild(childName);
 		}
 
-		public Iterator<Child> nestlessChildren() {
-			return new FilteringIterator<Child>(
-					new TransformationIterator<TreeNode, Child>(children()) {
+		public Iterable<Child> getNestlessChildren() {
+			return new TransformationIterable<TreeNode, Child>(this.getChildren()) {
 						@Override
 						protected Child transform(TreeNode next) {
 							if (next instanceof Nest) {
-								return ((Nest) next).child();
+								return ((Nest) next).getChild();
 							}
 							return (Child) next;
 						}
-					},
-					NotNullFilter.<Child>instance()
-				);
+					};
 		}
 	}
 
 
-	static class Nest extends TreeNode
+	/* CU private */ static class Nest
+		extends TreeNode
 	{
-		public Nest(TreeNode parent) {
+		Nest(TreeNode parent) {
 			super(parent, "nest");
 		}
 
 		@Override
 		public boolean canHaveChildren() {
-			return children.size() == 0;
+			return this.children.size() == 0;
 		}
 
 		@Override
-		public void addChild(String name) {
-			addChild(new Child(this, name));
+		public void addChild(String childName) {
+			this.addChild(new Child(this, childName));
 		}
 
 		/* can only have one child */
-		public Child child() {
-			return (children.isEmpty()) ? null : (Child) children.get(0);
+		public Child getChild() {
+			return (this.children.isEmpty()) ? null : (Child) this.children.get(0);
 		}
 	}
 
 
-	static class Child extends TreeNode
+	/* CU private */ static class Child
+		extends TreeNode
 	{
-		public Child(TreeNode parent, String name) {
+		Child(TreeNode parent, String name) {
 			super(parent, name);
 		}
 	}
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/util/PaneVisibilityEnablerTest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/util/PaneVisibilityEnablerTest.java
index 8c984913c9..76be47818f 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/util/PaneVisibilityEnablerTest.java
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/util/PaneVisibilityEnablerTest.java
@@ -11,6 +11,7 @@ package org.eclipse.jpt.common.ui.tests.internal.util;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jpt.common.ui.internal.util.PaneVisibilityEnabler;
 import org.eclipse.jpt.common.ui.internal.util.SWTUtil;
 import org.eclipse.jpt.common.ui.internal.widgets.DialogPane;
@@ -29,29 +30,30 @@ public final class PaneVisibilityEnablerTest {
 
 	@Before
 	public void setUp() {
-		parent = new Composite(SWTUtil.getShell(), SWT.NONE);
-		parent.setLayout(new GridLayout());
+		this.parent = new Composite(SWTUtil.getShell(), SWT.NONE);
+		this.parent.setLayout(new GridLayout());
 	}
 
 	@After
 	public void tearDown() {
-		if (parent != null) {
-			parent.dispose();
+		if (this.parent != null) {
+			this.parent.dispose();
 		}
 	}
 
 	@Test
 	public void testSwitchState() {
 
-		SimplePropertyValueModel<Boolean> booleanHolder =
-			new SimplePropertyValueModel<Boolean>(true);
+		SimplePropertyValueModel<Boolean> booleanHolder = new SimplePropertyValueModel<Boolean>(Boolean.TRUE);
 
 		DialogPane<Node> pane = new DialogPane<Node>(
 			new SimplePropertyValueModel<Node>(),
-			parent)
-		{
+			this.parent,
+			JFaceResources.getResources()
+		) {
 			@Override
 			protected void initializeLayout(Composite container) {
+				// NOP
 			}
 		};
 
@@ -71,7 +73,7 @@ public final class PaneVisibilityEnablerTest {
 		);
 
 		// Change state (true)
-		booleanHolder.setValue(true);
+		booleanHolder.setValue(Boolean.TRUE);
 
 		assertTrue(
 			"The pane should be visible",
@@ -79,7 +81,7 @@ public final class PaneVisibilityEnablerTest {
 		);
 
 		// Change state (false)
-		booleanHolder.setValue(false);
+		booleanHolder.setValue(Boolean.FALSE);
 
 		assertFalse(
 			"The pane should not be visible",
@@ -87,6 +89,6 @@ public final class PaneVisibilityEnablerTest {
 		);
 
 		// Dispose
-		booleanHolder.setValue(true);
+		booleanHolder.setValue(Boolean.TRUE);
 	}
 }
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/prefs/PreferencePropertyValueModelTests.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/prefs/PreferencePropertyValueModelTests.java
index f3252a2be7..120bf50816 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/prefs/PreferencePropertyValueModelTests.java
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/prefs/PreferencePropertyValueModelTests.java
@@ -390,7 +390,7 @@ public class PreferencePropertyValueModelTests extends PreferencesTestCase {
 					preferencesModel,
 					key,
 					defaultValue,
-					Transformer.Null.<String>instance()
+					Transformer.Non.<String>instance()
 				);
 		}
 
diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/META-INF/MANIFEST.MF b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/META-INF/MANIFEST.MF
index ce3523fb16..59063a4ed6 100644
--- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/META-INF/MANIFEST.MF
+++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/META-INF/MANIFEST.MF
@@ -24,6 +24,7 @@ Require-Bundle: org.eclipse.debug.core;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.wst.common.uriresolver;bundle-version="[1.1.401,2.0.0)",
  org.eclipse.wst.xml.core;bundle-version="[1.1.500,2.0.0)"
 Export-Package: org.eclipse.jpt.dbws.eclipselink.core.internal.gen;x-internal:=true,
+ org.eclipse.jpt.dbws.eclipselink.ui,
  org.eclipse.jpt.dbws.eclipselink.ui.internal;x-internal:=true,
  org.eclipse.jpt.dbws.eclipselink.ui.internal.actions;x-internal:=true,
  org.eclipse.jpt.dbws.eclipselink.ui.internal.wizards.gen;x-internal:=true
diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/build.properties b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/build.properties
index b7b9c1420e..8d02a56abd 100644
--- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/build.properties
+++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/build.properties
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2011 Oracle. All rights reserved.
+# Copyright (c) 2010, 2012 Oracle. All rights reserved.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License v1.0, which accompanies this distribution
 # and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -13,7 +13,7 @@ output.. = bin/
 bin.includes = .,\
                META-INF/,\
                about.html,\
-               icons/,\
+               images/,\
                plugin.xml,\
                plugin.properties
 jars.compile.order = .
diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/icons/full/obj16/text.gif b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/icons/full/obj16/text.gif
deleted file mode 100644
index efa7a38014..0000000000
--- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/icons/full/obj16/text.gif
+++ /dev/null
diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/icons/full/ovr16/error_ovr.gif b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/icons/full/ovr16/error_ovr.gif
deleted file mode 100644
index 119dcccd5a..0000000000
--- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/icons/full/ovr16/error_ovr.gif
+++ /dev/null
diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/icons/full/etool16/newclient_webserv_wiz.gif b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/images/buttons/new-web-services-client.gif
index 1ee05fa2e5..1ee05fa2e5 100644
--- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/icons/full/etool16/newclient_webserv_wiz.gif
+++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/images/buttons/new-web-services-client.gif
diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/icons/full/obj16/dtdfile.gif b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/images/objects/dtd-file.gif
index 3c0acadd2d..3c0acadd2d 100644
--- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/icons/full/obj16/dtdfile.gif
+++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/images/objects/dtd-file.gif
diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/icons/full/obj16/XSDFile.gif b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/images/objects/xsd-file.gif
index cc0eeb7196..cc0eeb7196 100644
--- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/icons/full/obj16/XSDFile.gif
+++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/images/objects/xsd-file.gif
diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/icons/full/wizban/webservicesclient_wiz.gif b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/images/wizards/new-web-services-client.gif
index 77c16a0f87..77c16a0f87 100644
--- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/icons/full/wizban/webservicesclient_wiz.gif
+++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/images/wizards/new-web-services-client.gif
diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/plugin.xml b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/plugin.xml
index 5c52d864fe..462d1ad6cc 100644
--- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/plugin.xml
+++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/plugin.xml
@@ -40,7 +40,7 @@
 			name="%generateDbwsFromXmlName"
  			category="org.eclipse.jpt.dbws"
  			class="org.eclipse.jpt.dbws.eclipselink.ui.internal.wizards.gen.DbwsGeneratorWizard"
-			icon="icons/full/etool16/newclient_webserv_wiz.gif">
+			icon="$nl$/images/buttons/new-web-services-client.gif">
 				<description>%generateDbwsFromXmlDesc</description>
 		</wizard>
 
@@ -52,7 +52,7 @@
 
 		<!-- contributions to the "Generate" submenu -->
 		<objectContribution
-			id="org.eclipse.jpt.ui.xsdFileActions"
+			id="org.eclipse.jpt.dbws.eclipelink.ui.xsdFileActions"
 			objectClass="org.eclipse.core.resources.IFile"
 			nameFilter="*builder.xml">
 			
diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/JptDbwsEclipseLinkUiImages.java b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/JptDbwsEclipseLinkUiImages.java
new file mode 100644
index 0000000000..773cc697e3
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/JptDbwsEclipseLinkUiImages.java
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2011, 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.dbws.eclipselink.ui;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jpt.common.ui.JptCommonUiImages;
+import org.eclipse.jpt.dbws.eclipselink.ui.internal.plugin.JptDbwsEclipseLinkUiPlugin;
+
+/**
+ * Actually, just the image descriptors....
+ * <p>
+ * Code should use these constants to acquire (and release) the images provided
+ * by Dali. The images should be managed by a
+ * {@link org.eclipse.jface.resource.ResourceManager "local" resource manager}.
+ * <p>
+ * Also, the {@link org.eclipse.ui.IWorkbench Eclipse workbench} supplies more
+ * general purpose {@link org.eclipse.ui.ISharedImages images}.
+ * 
+ * @see JptCommonUiImages
+ */
+// TODO add corresponding ImageDescriptorTest...
+@SuppressWarnings("nls")
+public final class JptDbwsEclipseLinkUiImages {
+
+	// ********** directories **********
+
+	private static final String BUTTONS_ = JptCommonUiImages.BUTTONS_;
+	private static final String OBJECTS_ = JptCommonUiImages.OBJECTS_;
+	private static final String WIZARDS_ = JptCommonUiImages.WIZARDS_;
+
+
+	// ********** buttons **********
+
+	public static final ImageDescriptor NEW_WEB_SERVICES_CLIENT = buildImageDescriptor(BUTTONS_ + "new-web-services-client.gif");
+
+
+	// ********** objects **********
+
+	public static final ImageDescriptor DTD_FILE = buildImageDescriptor(OBJECTS_ + "dtd-file.gif");
+	public static final ImageDescriptor XSD_FILE = buildImageDescriptor(OBJECTS_ + "xsd-file.gif");
+
+
+	// ********** wizard banners **********
+
+	public static final ImageDescriptor NEW_WEB_SERVICES_CLIENT_BANNER = buildImageDescriptor(WIZARDS_ + "new-web-services-client.gif");
+
+
+	// ********** misc **********
+
+	private static ImageDescriptor buildImageDescriptor(String path) {
+		return JptDbwsEclipseLinkUiPlugin.instance().buildImageDescriptor(path);
+	}
+
+	private JptDbwsEclipseLinkUiImages() {
+		throw new UnsupportedOperationException();
+	}
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/JptDbwsUiIcons.java b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/JptDbwsUiIcons.java
deleted file mode 100644
index 38beda8da7..0000000000
--- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/JptDbwsUiIcons.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2011 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.dbws.eclipselink.ui.internal;
-
-@SuppressWarnings("nls")
-public class JptDbwsUiIcons
-{
-	// **************** Wizard icons *******************************************
-
-	public static final String DBWS_GEN_WIZ_BANNER = "full/wizban/webservicesclient_wiz";
-}
diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/wizards/gen/BuilderXmlWizardPage.java b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/wizards/gen/BuilderXmlWizardPage.java
index 5eb23fc72e..cd5b9dbfa9 100644
--- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/wizards/gen/BuilderXmlWizardPage.java
+++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/wizards/gen/BuilderXmlWizardPage.java
@@ -14,6 +14,7 @@ import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.wizard.IWizardPage;
@@ -32,6 +33,7 @@ import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
 public class BuilderXmlWizardPage extends WizardPage {
 	
 	private final IStructuredSelection initialSelection;
+	private final ResourceManager resourceManager;
 	private IProject targetProject;
 	
 	protected SelectFileOrXMLCatalogIdPanel selectSourcePanel;
@@ -55,10 +57,11 @@ public class BuilderXmlWizardPage extends WizardPage {
 
 	// ********** constructor **********
     
-	BuilderXmlWizardPage(IStructuredSelection selection) {
+	BuilderXmlWizardPage(IStructuredSelection selection, ResourceManager resourceManager) {
 		super("BuilderXmlWizardPage"); //$NON-NLS-1$
 		
 		this.initialSelection = selection;
+		this.resourceManager = resourceManager;
 	}
 	
 	// ********** IDialogPage implementation  **********
@@ -70,7 +73,7 @@ public class BuilderXmlWizardPage extends WizardPage {
 		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
 		this.setControl(composite);
 
-		this.selectSourcePanel = new SelectFileOrXMLCatalogIdPanel(composite, this.initialSelection);
+		this.selectSourcePanel = new SelectFileOrXMLCatalogIdPanel(composite, this.initialSelection, this.resourceManager);
 		this.selectSourcePanel.setLayoutData(new GridData(GridData.FILL_BOTH));
 		
 		SelectFileOrXMLCatalogIdPanel.PanelListener listener = new SelectFileOrXMLCatalogIdPanel.PanelListener() {
@@ -178,7 +181,7 @@ public class BuilderXmlWizardPage extends WizardPage {
 		return errorMessage;
 	}
 
-	private void selectFileOrXMLCatalogIdPanelChanged() {
+	void selectFileOrXMLCatalogIdPanelChanged() {
 		String errorMessage = this.computeErrorMessage();
 		this.setErrorMessage(errorMessage);
 		this.setPageComplete(this.isPageComplete());
diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/wizards/gen/DbwsGeneratorWizard.java b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/wizards/gen/DbwsGeneratorWizard.java
index 34d678a020..bb1499c84c 100644
--- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/wizards/gen/DbwsGeneratorWizard.java
+++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/wizards/gen/DbwsGeneratorWizard.java
@@ -16,11 +16,14 @@ import org.eclipse.core.resources.WorkspaceJob;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.resource.LocalResourceManager;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.jpt.dbws.eclipselink.ui.JptDbwsEclipseLinkUiImages;
 import org.eclipse.jpt.dbws.eclipselink.ui.internal.DbwsGeneratorUi;
-import org.eclipse.jpt.dbws.eclipselink.ui.internal.JptDbwsUiIcons;
 import org.eclipse.jpt.dbws.eclipselink.ui.internal.JptDbwsUiMessages;
 import org.eclipse.jpt.dbws.eclipselink.ui.internal.plugin.JptDbwsEclipseLinkUiPlugin;
 import org.eclipse.ui.IWorkbench;
@@ -33,6 +36,7 @@ public class DbwsGeneratorWizard extends Wizard implements IWorkbenchWizard {
 
 	private IJavaProject javaProject;
 	private String builderXmlFile;
+	private ResourceManager resourceManager;
 	private IStructuredSelection selection;
 	
 	private WebDynamicProjectWizardPage projectWizardPage;
@@ -69,12 +73,13 @@ public class DbwsGeneratorWizard extends Wizard implements IWorkbenchWizard {
 
 	// ********** IWorkbenchWizard implementation  **********
 
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		this.selection = selection;
+	public void init(IWorkbench workbench, IStructuredSelection sel) {
+		this.resourceManager = new LocalResourceManager(JFaceResources.getResources(workbench.getDisplay()));
+		this.selection = sel;
 
 		this.setWindowTitle(JptDbwsUiMessages.DbwsGeneratorWizard_title);
 
-		this.setDefaultPageImageDescriptor(JptDbwsEclipseLinkUiPlugin.instance().buildImageDescriptor(JptDbwsUiIcons.DBWS_GEN_WIZ_BANNER));
+		this.setDefaultPageImageDescriptor(JptDbwsEclipseLinkUiImages.NEW_WEB_SERVICES_CLIENT_BANNER);
 		this.setNeedsProgressMonitor(true);
 	}
 
@@ -86,15 +91,15 @@ public class DbwsGeneratorWizard extends Wizard implements IWorkbenchWizard {
 
 		if(this.selection != null) {
 			// WebDynamicProjectWizardPage
-			this.javaProject = this.getJavaProjectFromSelection(this.selection);
+			this.javaProject = this.getJavaProjectFromSelection();
 
-			this.projectWizardPage = this.buildWebDynamicProjectPage(this.javaProject);
+			this.projectWizardPage = this.buildWebDynamicProjectPage();
 			this.addPage(this.projectWizardPage);
 
 			// BuilderXmlWizardPage
 			IFile builderXmlSelected = BuilderXmlWizardPage.getBuilderXmlFromSelection(this.selection);
 			if(builderXmlSelected == null) {
-				this.builderXmlWizardPage = this.buildBuilderXmlPage(this.selection);
+				this.builderXmlWizardPage = this.buildBuilderXmlPage();
 				this.addPage(this.builderXmlWizardPage);
 			}
 			else {
@@ -140,27 +145,25 @@ public class DbwsGeneratorWizard extends Wizard implements IWorkbenchWizard {
 			if(xmlFile != null) {
 				return this.makeRelativeToProjectPath(xmlFile.getFullPath());
 			}
-			else {
-				return this.builderXmlWizardPage.getSourceURI();
-			}
+			return this.builderXmlWizardPage.getSourceURI();
 		}
 		return this.builderXmlFile;
 	}
 	
 	// ********** internal methods **********
 
-	private WebDynamicProjectWizardPage buildWebDynamicProjectPage(IJavaProject javaProject) {
+	private WebDynamicProjectWizardPage buildWebDynamicProjectPage() {
 		
-		WebDynamicProjectWizardPage projectWizardPage = new WebDynamicProjectWizardPage(javaProject);
-		projectWizardPage.setTitle(JptDbwsUiMessages.WebDynamicProjectWizardPage_title);
-		projectWizardPage.setDescription(JptDbwsUiMessages.WebDynamicProjectWizardPage_desc);
-		projectWizardPage.setDestinationLabel(JptDbwsUiMessages.WebDynamicProjectWizardPage_destinationProject);
+		WebDynamicProjectWizardPage page = new WebDynamicProjectWizardPage(this.javaProject);
+		page.setTitle(JptDbwsUiMessages.WebDynamicProjectWizardPage_title);
+		page.setDescription(JptDbwsUiMessages.WebDynamicProjectWizardPage_desc);
+		page.setDestinationLabel(JptDbwsUiMessages.WebDynamicProjectWizardPage_destinationProject);
 
-		return projectWizardPage;
+		return page;
 	}
 
-	private BuilderXmlWizardPage buildBuilderXmlPage(IStructuredSelection selection) {
-		return new BuilderXmlWizardPage(selection);
+	private BuilderXmlWizardPage buildBuilderXmlPage() {
+		return new BuilderXmlWizardPage(this.selection, this.resourceManager);
 	}
 	
 	private JdbcDriverWizardPage buildJdbcDriversPage() {
@@ -185,11 +188,11 @@ public class DbwsGeneratorWizard extends Wizard implements IWorkbenchWizard {
 		generateJob.schedule();
 	}
 
-	private IJavaProject getJavaProjectFromSelection(IStructuredSelection selection) {
-    	if(selection == null) {
+	private IJavaProject getJavaProjectFromSelection() {
+    	if(this.selection == null) {
     		return null;
     	}
-		Object firstElement = selection.getFirstElement();
+		Object firstElement = this.selection.getFirstElement();
 		if(firstElement instanceof IJavaProject) {
 			return (IJavaProject)firstElement;
 		}
@@ -206,4 +209,10 @@ public class DbwsGeneratorWizard extends Wizard implements IWorkbenchWizard {
 	private IJavaProject getJavaProjectFrom(IProject project) {
     	return ((IJavaElement) project.getAdapter(IJavaElement.class)).getJavaProject();
     }
+
+	@Override
+	public void dispose() {
+		this.resourceManager.dispose();
+		super.dispose();
+	}
 }
diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/wizards/gen/JdbcDriverWizardPage.java b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/wizards/gen/JdbcDriverWizardPage.java
index 2a9306f24a..21e0b6c623 100644
--- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/wizards/gen/JdbcDriverWizardPage.java
+++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/wizards/gen/JdbcDriverWizardPage.java
@@ -12,7 +12,6 @@ package org.eclipse.jpt.dbws.eclipselink.ui.internal.wizards.gen;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
-
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.viewers.ColumnWeightData;
@@ -30,9 +29,8 @@ import org.eclipse.jpt.common.ui.internal.util.SWTUtil;
 import org.eclipse.jpt.common.ui.internal.util.TableLayoutComposite;
 import org.eclipse.jpt.common.utility.internal.StringTools;
 import org.eclipse.jpt.common.utility.internal.collection.CollectionTools;
-import org.eclipse.jpt.dbws.eclipselink.ui.internal.JptDbwsUiIcons;
+import org.eclipse.jpt.dbws.eclipselink.ui.JptDbwsEclipseLinkUiImages;
 import org.eclipse.jpt.dbws.eclipselink.ui.internal.JptDbwsUiMessages;
-import org.eclipse.jpt.dbws.eclipselink.ui.internal.plugin.JptDbwsEclipseLinkUiPlugin;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
@@ -74,7 +72,7 @@ public class JdbcDriverWizardPage extends WizardPage
 	protected void initialize() {
 		this.setTitle(JptDbwsUiMessages.JdbcDriverWizardPage_title);
 		this.setDescription(JptDbwsUiMessages.JdbcDriverWizardPage_desc);
-		this.setImageDescriptor(JptDbwsEclipseLinkUiPlugin.instance().buildImageDescriptor(JptDbwsUiIcons.DBWS_GEN_WIZ_BANNER));
+		this.setImageDescriptor(JptDbwsEclipseLinkUiImages.NEW_WEB_SERVICES_CLIENT_BANNER);
 	}
 
 	// ********** intra-wizard methods **********
diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/wizards/gen/SelectFileOrXMLCatalogIdPanel.java b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/wizards/gen/SelectFileOrXMLCatalogIdPanel.java
index f848ea46b5..5fc55a44ec 100644
--- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/wizards/gen/SelectFileOrXMLCatalogIdPanel.java
+++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/wizards/gen/SelectFileOrXMLCatalogIdPanel.java
@@ -13,11 +13,11 @@ package org.eclipse.jpt.dbws.eclipselink.ui.internal.wizards.gen;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jpt.dbws.eclipselink.ui.internal.plugin.JptDbwsEclipseLinkUiPlugin;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
@@ -44,7 +44,7 @@ public class SelectFileOrXMLCatalogIdPanel extends Composite implements Selectio
 
 	// ********** constructor **********
 
-	public SelectFileOrXMLCatalogIdPanel(Composite parent, IStructuredSelection selection) {
+	public SelectFileOrXMLCatalogIdPanel(Composite parent, IStructuredSelection selection, ResourceManager resourceManager) {
 		super(parent, SWT.NONE);
 
 		// container group
@@ -62,7 +62,7 @@ public class SelectFileOrXMLCatalogIdPanel extends Composite implements Selectio
 		
 		// Catalog
 		ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
-		selectXMLCatalogIdPanel = new SelectXMLCatalogIdPanel(pageBook, xmlCatalog);
+		selectXMLCatalogIdPanel = new SelectXMLCatalogIdPanel(pageBook, xmlCatalog, resourceManager);
 		selectXMLCatalogIdPanel.getTableViewer().addSelectionChangedListener(new ISelectionChangedListener() {
 			public void selectionChanged(SelectionChangedEvent event) {
 				updateCompletionStateChange();
diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/wizards/gen/SelectXMLCatalogIdPanel.java b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/wizards/gen/SelectXMLCatalogIdPanel.java
index 536c1bcf52..eee4d3fcd8 100644
--- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/wizards/gen/SelectXMLCatalogIdPanel.java
+++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/wizards/gen/SelectXMLCatalogIdPanel.java
@@ -14,10 +14,10 @@ package org.eclipse.jpt.dbws.eclipselink.ui.internal.wizards.gen;
 import java.util.Collection;
 import java.util.List;
 import java.util.Vector;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jpt.dbws.eclipselink.ui.internal.JptDbwsUiMessages;
-import org.eclipse.jpt.dbws.eclipselink.ui.internal.plugin.JptDbwsEclipseLinkUiPlugin;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -36,7 +36,7 @@ public class SelectXMLCatalogIdPanel extends Composite {
 	protected XMLCatalogTableViewer tableViewer;
 	protected ICatalog fXmlCatalog;
 
-	public SelectXMLCatalogIdPanel(Composite parent, ICatalog xmlCatalog) {
+	public SelectXMLCatalogIdPanel(Composite parent, ICatalog xmlCatalog, ResourceManager resourceManager) {
 		super(parent, SWT.NONE);
 		this.fXmlCatalog = xmlCatalog;
 
@@ -50,17 +50,17 @@ public class SelectXMLCatalogIdPanel extends Composite {
 		Label label = new Label(this, SWT.NONE);
 		label.setText(JptDbwsUiMessages.BuilderXmlWizardPage_xmlCatalogTableTitle);
 
-		tableViewer = createTableViewer(this);
+		tableViewer = createTableViewer(this, resourceManager);
 		tableViewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 		tableViewer.setInput("dummy"); //$NON-NLS-1$
 	}
 
-	protected XMLCatalogTableViewer createTableViewer(Composite parent) {
+	protected XMLCatalogTableViewer createTableViewer(Composite parent, ResourceManager resourceManager) {
 		String headings[] = new String[2];
 		headings[0] = JptDbwsUiMessages.BuilderXmlWizardPage_xmlCatalogKeyColumn;
 		headings[1] = JptDbwsUiMessages.BuilderXmlWizardPage_xmlCatalogUriColumn;
 
-		XMLCatalogTableViewer theTableViewer = new XMLCatalogTableViewer(parent, headings) {
+		XMLCatalogTableViewer theTableViewer = new XMLCatalogTableViewer(parent, headings, resourceManager) {
 
 			protected void addXMLCatalogEntries(List list, ICatalogEntry[] entries) {
 				for (int i = 0; i < entries.length; i++) {
diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/wizards/gen/XMLCatalogTableViewer.java b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/wizards/gen/XMLCatalogTableViewer.java
index 7947401523..65963285e7 100644
--- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/wizards/gen/XMLCatalogTableViewer.java
+++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/wizards/gen/XMLCatalogTableViewer.java
@@ -14,40 +14,37 @@ package org.eclipse.jpt.dbws.eclipselink.ui.internal.wizards.gen;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Comparator;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.IBaseLabelProvider;
+import org.eclipse.jface.viewers.IDecoration;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.TableLayout;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jpt.dbws.eclipselink.ui.internal.plugin.JptDbwsEclipseLinkUiPlugin;
+import org.eclipse.jpt.common.ui.JptCommonUiImages;
+import org.eclipse.jpt.common.ui.internal.jface.OverlayImageDescriptor;
+import org.eclipse.jpt.common.ui.internal.jface.PluggableTextTableLabelProvider;
+import org.eclipse.jpt.common.ui.internal.jface.ResourceManagerTableLabelProvider;
+import org.eclipse.jpt.common.utility.internal.ObjectTools;
+import org.eclipse.jpt.dbws.eclipselink.ui.JptDbwsEclipseLinkUiImages;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
 import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-
 import com.ibm.icu.text.Collator;
 
-public class XMLCatalogTableViewer extends TableViewer {
-
+public abstract class XMLCatalogTableViewer
+	extends TableViewer
+{
 	protected static String ERROR_STATE_KEY = "errorstatekey"; //$NON-NLS-1$
 
-	protected static Image dtdFileImage = JptDbwsEclipseLinkUiPlugin.instance().getImage("full/obj16/dtdfile"); //$NON-NLS-1$
-	protected static Image unknownFileImage = JptDbwsEclipseLinkUiPlugin.instance().getImage("full/obj16/text"); //$NON-NLS-1$
-	protected static Image xsdFileImage = JptDbwsEclipseLinkUiPlugin.instance().getImage("full/obj16/XSDFile"); //$NON-NLS-1$
-	protected static Image errorImage = JptDbwsEclipseLinkUiPlugin.instance().getImage("full/ovr16/error_ovr"); //$NON-NLS-1$
 
-	// ********** constructor **********
-
-	public XMLCatalogTableViewer(Composite parent, String[] columnProperties) {
+	protected XMLCatalogTableViewer(Composite parent, String[] columnProperties, ResourceManager resourceManager) {
 		super(parent, SWT.FULL_SELECTION);
 
 		Table table = getTable();
@@ -68,34 +65,30 @@ public class XMLCatalogTableViewer extends TableViewer {
 		setColumnProperties(columnProperties);
 
 		setContentProvider(new CatalogEntryContentProvider());
-		setLabelProvider(new CatalogEntryLabelProvider());
+		setLabelProvider(this.buildLabelProvider(resourceManager));
 	}
 
-	public Collection getXMLCatalogEntries() {
-		return null;
+	protected IBaseLabelProvider buildLabelProvider(ResourceManager resourceManager) {
+		return new ResourceManagerTableLabelProvider<Object>(
+				CATALOG_ENTRY_LABEL_IMAGE_DESCRIPTOR_TRANSFORMER,
+				CATALOG_ENTRY_LABEL_TEXT_TRANSFORMER,
+				resourceManager
+			);
 	}
 
-	public void menuAboutToShow(IMenuManager menuManager) {
-		Action action = new Action("hello") { //$NON-NLS-1$
-			public void run() {
-				System.out.println("run!"); //$NON-NLS-1$
-			}
-		};
-		menuManager.add(action);
-	}
+	protected abstract Collection getXMLCatalogEntries();
 
 	public void setFilterExtensions(String[] extensions) {
 		resetFilters();
 		addFilter(new XMLCatalogTableViewerFilter(extensions));
 	}
 
-	// ********** inner class **********
-
-	public class CatalogEntryContentProvider implements IStructuredContentProvider {
 
-		public void dispose() {
-		}
+	// ********** content provider **********
 
+	public class CatalogEntryContentProvider
+		implements IStructuredContentProvider
+	{
 		public Object[] getElements(Object element) {
 			Object[] array = getXMLCatalogEntries().toArray();
 			Comparator comparator = new Comparator() {
@@ -114,56 +107,80 @@ public class XMLCatalogTableViewer extends TableViewer {
 		}
 
 		public void inputChanged(Viewer viewer, Object old, Object newobj) {
+			// NOP
 		}
 
 		public boolean isDeleted(Object object) {
 			return false;
 		}
+
+		public void dispose() {
+			// NOP
+		}
 	}
 
-	public class CatalogEntryLabelProvider extends LabelProvider implements ITableLabelProvider {
-
-		public Image getColumnImage(Object object, int columnIndex) {
-			Image result = null;
-			if (columnIndex == 0) {
-				Image base = null;
-				if (object instanceof ICatalogEntry) {
-					ICatalogEntry catalogEntry = (ICatalogEntry) object;
-					String uri = catalogEntry.getURI();
-					if (uri.endsWith("dtd")) { //$NON-NLS-1$
-						base = dtdFileImage;
-					}
-					else if (uri.endsWith("xsd")) { //$NON-NLS-1$
-						base = xsdFileImage;
-					}
-					else {
-						base = unknownFileImage;
-					}
 
-					if (base != null) {
-						if (URIHelper.isReadableURI(uri, false)) {
-							result = base;
-						}
-						else {
-							// TODO... SSE port
-							result = base;// imageFactory.createCompositeImage(base,
-							// errorImage,
-							// ImageFactory.BOTTOM_LEFT);
-						}
-					}
-				}
+	// ********** label provider **********
+
+	protected static final PluggableTextTableLabelProvider.TextTransformer<Object> CATALOG_ENTRY_LABEL_TEXT_TRANSFORMER = new CatalogEntryLabelTextTransformer();
+	protected static class CatalogEntryLabelTextTransformer
+		implements PluggableTextTableLabelProvider.TextTransformer<Object>
+	{
+		public String transform(Object element, int columnIndex) {
+			return (element instanceof ICatalogEntry) ? this.transform((ICatalogEntry) element, columnIndex) : null;
+		}
+
+		protected String transform(ICatalogEntry catalogEntry, int columnIndex) {
+			return (columnIndex == 0) ?
+					catalogEntry.getKey() :
+					URIHelper.removePlatformResourceProtocol(catalogEntry.getURI());
+		}
+
+		@Override
+		public String toString() {
+			return ObjectTools.toString(this);
+		}
+	}
+
+	protected static final ResourceManagerTableLabelProvider.ImageDescriptorTransformer<Object> CATALOG_ENTRY_LABEL_IMAGE_DESCRIPTOR_TRANSFORMER = new CatalogEntryLabelImageDescriptorTransformer();
+	protected static class CatalogEntryLabelImageDescriptorTransformer
+		implements ResourceManagerTableLabelProvider.ImageDescriptorTransformer<Object>
+	{
+		public ImageDescriptor transform(Object element, int columnIndex) {
+			return (element instanceof ICatalogEntry) ? this.transform((ICatalogEntry) element, columnIndex) : null;
+		}
+
+		protected ImageDescriptor transform(ICatalogEntry catalogEntry, int columnIndex) {
+			return (columnIndex == 0) ? this.transform(catalogEntry) : null;
+		}
+
+		protected ImageDescriptor transform(ICatalogEntry catalogEntry) {
+			String uri = catalogEntry.getURI();
+			if (uri == null) {
+				return null;
 			}
-			return result;
+			ImageDescriptor base = this.getBaseColumnImageDescriptor(uri);
+			return URIHelper.isReadableURI(uri, false) ? base : this.buildErrorImageDescriptor(base);
 		}
 
-		public String getColumnText(Object object, int columnIndex) {
-			String result = null;
-			if (object instanceof ICatalogEntry) {
-				ICatalogEntry catalogEntry = (ICatalogEntry) object;
-				result = columnIndex == 0 ? catalogEntry.getKey() : catalogEntry.getURI();
-				result = URIHelper.removePlatformResourceProtocol(result);
+		protected ImageDescriptor getBaseColumnImageDescriptor(String uri) {
+			uri = uri.toLowerCase();
+			if (uri.endsWith("dtd")) { //$NON-NLS-1$
+				return JptDbwsEclipseLinkUiImages.DTD_FILE;
+			}
+			if (uri.endsWith("xsd")) { //$NON-NLS-1$
+				return JptDbwsEclipseLinkUiImages.XSD_FILE;
 			}
-			return result != null ? result : ""; //$NON-NLS-1$
+			return JptCommonUiImages.FILE;
+		}
+
+		protected ImageDescriptor buildErrorImageDescriptor(ImageDescriptor imageDescriptor) {
+			return new OverlayImageDescriptor(imageDescriptor, JptCommonUiImages.ERROR_OVERLAY, IDecoration.BOTTOM_LEFT);
+		}
+
+		@Override
+		public String toString() {
+			return ObjectTools.toString(this);
 		}
 	}
 
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/META-INF/MANIFEST.MF b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/META-INF/MANIFEST.MF
index 5b1ba72838..1e74f18a6e 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/META-INF/MANIFEST.MF
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/META-INF/MANIFEST.MF
@@ -33,14 +33,13 @@ Export-Package: org.eclipse.jpt.jaxb.eclipselink.core,
  org.eclipse.jpt.jaxb.eclipselink.core.internal;x-internal:=true,
  org.eclipse.jpt.jaxb.eclipselink.core.internal.context;x-internal:=true,
  org.eclipse.jpt.jaxb.eclipselink.core.internal.context.java;x-internal:=true,
- org.eclipse.jpt.jaxb.eclipselink.core.internal.context.oxm,
+ org.eclipse.jpt.jaxb.eclipselink.core.internal.context.oxm;x-internal:=true,
  org.eclipse.jpt.jaxb.eclipselink.core.internal.context.xpath.java;x-internal:=true,
  org.eclipse.jpt.jaxb.eclipselink.core.internal.libval;x-internal:=true,
- org.eclipse.jpt.jaxb.eclipselink.core.internal.plugin,
  org.eclipse.jpt.jaxb.eclipselink.core.internal.resource.java;x-internal:=true,
  org.eclipse.jpt.jaxb.eclipselink.core.internal.resource.java.binary;x-internal:=true,
  org.eclipse.jpt.jaxb.eclipselink.core.internal.resource.java.source;x-internal:=true,
- org.eclipse.jpt.jaxb.eclipselink.core.internal.resource.oxm,
+ org.eclipse.jpt.jaxb.eclipselink.core.internal.resource.oxm;x-internal:=true,
  org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_1;x-internal:=true,
  org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_2;x-internal:=true,
  org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_3;x-internal:=true,
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/META-INF/MANIFEST.MF b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/META-INF/MANIFEST.MF
index 7b3edc94da..bd7bdab724 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/META-INF/MANIFEST.MF
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/META-INF/MANIFEST.MF
@@ -22,8 +22,10 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.5.2,4.0.0)",
  org.eclipse.swt;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.ui.workbench;bundle-version="[3.7.0,4.0.0)"
-Export-Package: org.eclipse.jpt.jaxb.eclipselink.ui.internal;x-internal:=true,
+Export-Package: org.eclipse.jpt.jaxb.eclipselink.ui,
+ org.eclipse.jpt.jaxb.eclipselink.ui.internal;x-internal:=true,
  org.eclipse.jpt.jaxb.eclipselink.ui.internal.commands;x-internal:=true,
+ org.eclipse.jpt.jaxb.eclipselink.ui.internal.navigator;x-internal:=true,
  org.eclipse.jpt.jaxb.eclipselink.ui.internal.v2_1;x-internal:=true,
  org.eclipse.jpt.jaxb.eclipselink.ui.internal.v2_2;x-internal:=true,
  org.eclipse.jpt.jaxb.eclipselink.ui.internal.v2_3;x-internal:=true,
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/build.properties b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/build.properties
index 08bc038360..8aada68f96 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/build.properties
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/build.properties
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2011 Oracle. All rights reserved.
+# Copyright (c) 2011, 2012 Oracle. All rights reserved.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License v1.0, which accompanies this distribution
 # and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -12,7 +12,7 @@ output.. = bin/
 bin.includes = .,\
                META-INF/,\
                about.html,\
-               icons/,\
+               images/,\
                plugin.xml,\
                plugin.properties
 jars.compile.order = .
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/icons/full/obj16/oxm-file.gif b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/images/objects/oxm-file.gif
index 1fb940df94..1fb940df94 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/icons/full/obj16/oxm-file.gif
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/images/objects/oxm-file.gif
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/icons/full/obj16/oxm-file.ico b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/images/objects/oxm-file.ico
index 2d08f4b3fd..2d08f4b3fd 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/icons/full/obj16/oxm-file.ico
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/images/objects/oxm-file.ico
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/icons/full/obj16/xml-inverse-reference.gif b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/images/objects/xml-inverse-reference.gif
index ce55b84284..ce55b84284 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/icons/full/obj16/xml-inverse-reference.gif
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/images/objects/xml-inverse-reference.gif
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/icons/full/obj16/xml-join-nodes.gif b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/images/objects/xml-join-nodes.gif
index 578ec36aa3..578ec36aa3 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/icons/full/obj16/xml-join-nodes.gif
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/images/objects/xml-join-nodes.gif
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/icons/full/obj16/xml-transformation.gif b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/images/objects/xml-transformation.gif
index fecf9e54c3..fecf9e54c3 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/icons/full/obj16/xml-transformation.gif
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/images/objects/xml-transformation.gif
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/JptJaxbEclipseLinkUiImages.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/JptJaxbEclipseLinkUiImages.java
new file mode 100644
index 0000000000..5452b695d8
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/JptJaxbEclipseLinkUiImages.java
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2011, 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.ui;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jpt.common.ui.JptCommonUiImages;
+import org.eclipse.jpt.jaxb.eclipselink.ui.internal.plugin.JptJaxbEclipseLinkUiPlugin;
+
+/**
+ * Actually, just the image descriptors....
+ * <p>
+ * Code should use these constants to acquire (and release) the images provided
+ * by Dali. The images should be managed by a
+ * {@link org.eclipse.jface.resource.ResourceManager "local" resource manager}.
+ * <p>
+ * Also, the {@link org.eclipse.ui.IWorkbench Eclipse workbench} supplies more
+ * general purpose {@link org.eclipse.ui.ISharedImages images}.
+ * 
+ * @see org.eclipse.jpt.jaxb.ui.JptJaxbUiImages
+ * @see JptCommonUiImages
+ */
+// TODO add corresponding ImageDescriptorTest...
+@SuppressWarnings("nls")
+public final class JptJaxbEclipseLinkUiImages {
+
+	// ********** directories **********
+
+	private static final String OBJECTS_ = JptCommonUiImages.OBJECTS_;
+
+
+	// ********** oxm **********
+
+	public static final ImageDescriptor OXM_FILE = buildImageDescriptor(OBJECTS_ + "oxm-file.gif");
+	
+
+	// ********** mappings **********
+
+	public static final ImageDescriptor XML_INVERSE_REFERENCE = buildImageDescriptor(OBJECTS_ + "xml-inverse-reference.gif");
+	public static final ImageDescriptor XML_JOIN_NODES = buildImageDescriptor(OBJECTS_ + "xml-join-nodes.gif");
+	public static final ImageDescriptor XML_TRANSFORMATION = buildImageDescriptor(OBJECTS_ + "xml-transformation.gif");
+
+
+	// ********** misc **********
+
+	private static ImageDescriptor buildImageDescriptor(String path) {
+		return JptJaxbEclipseLinkUiPlugin.instance().buildImageDescriptor(path);
+	}
+
+	private JptJaxbEclipseLinkUiImages() {
+		throw new UnsupportedOperationException();
+	}
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/ELJaxbMappingImageHelper.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/ELJaxbMappingImageHelper.java
index 337814d4d7..ddb51cff33 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/ELJaxbMappingImageHelper.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/ELJaxbMappingImageHelper.java
@@ -9,32 +9,25 @@
  ******************************************************************************/
 package org.eclipse.jpt.jaxb.eclipselink.ui.internal;
 
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbMappingKeys;
-import org.eclipse.jpt.jaxb.eclipselink.ui.internal.plugin.JptJaxbEclipseLinkUiPlugin;
+import org.eclipse.jpt.jaxb.eclipselink.ui.JptJaxbEclipseLinkUiImages;
 import org.eclipse.jpt.jaxb.ui.internal.JaxbMappingImageHelper;
-import org.eclipse.swt.graphics.Image;
 
 
 public class ELJaxbMappingImageHelper {
 	
-	public static Image imageForAttributeMapping(String mappingKey) {
-		String iconKey = iconKeyForAttributeMapping(mappingKey);
-		return (iconKey == null) ? 
-				JaxbMappingImageHelper.imageForAttributeMapping(mappingKey) 
-				: JptJaxbEclipseLinkUiPlugin.instance().getImage(iconKey);
-	}
-	
-	public static String iconKeyForAttributeMapping(String mappingKey) {
-		if (ELJaxbMappingKeys.XML_INVERSE_REFERENCE_ATTRIBUTE_MAPPING_KEY == mappingKey) {
-			return JptJaxbEclipseLinkUiIcons.XML_INVERSE_REFERENCE;
+	public static ImageDescriptor imageDescriptorForAttributeMapping(String mappingKey) {
+		if (ELJaxbMappingKeys.XML_INVERSE_REFERENCE_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) {
+			return JptJaxbEclipseLinkUiImages.XML_INVERSE_REFERENCE;
 		}
-		else if (ELJaxbMappingKeys.XML_JOIN_NODES_ATTRIBUTE_MAPPING_KEY == mappingKey) {
-			return JptJaxbEclipseLinkUiIcons.XML_JOIN_NODES;
+		if (ELJaxbMappingKeys.XML_JOIN_NODES_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) {
+			return JptJaxbEclipseLinkUiImages.XML_JOIN_NODES;
 		}
-		else if (ELJaxbMappingKeys.XML_TRANSFORMATION_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) {
-			return JptJaxbEclipseLinkUiIcons.XML_TRANSFORMATION;
+		if (ELJaxbMappingKeys.XML_TRANSFORMATION_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) {
+			return JptJaxbEclipseLinkUiImages.XML_TRANSFORMATION;
 		}
 		
-		return null;
+		return JaxbMappingImageHelper.imageDescriptorForAttributeMapping(mappingKey);
 	}
 }
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/JptJaxbEclipseLinkUiIcons.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/JptJaxbEclipseLinkUiIcons.java
deleted file mode 100644
index db18d7220b..0000000000
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/JptJaxbEclipseLinkUiIcons.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2011  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.jaxb.eclipselink.ui.internal;
-
-
-public class JptJaxbEclipseLinkUiIcons {
-	
-	public static final String OXM_FILE = "full/obj16/oxm-file"; //$NON-NLS-1$
-	public static final String XML_INVERSE_REFERENCE = "full/obj16/xml-inverse-reference"; //$NON-NLS-1$
-	public static final String XML_JOIN_NODES = "full/obj16/xml-join-nodes"; //$NON-NLS-1$
-	public static final String XML_TRANSFORMATION = "full/obj16/xml-transformation"; //$NON-NLS-1$
-}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbNavigatorItemLabelProviderFactory.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbNavigatorItemLabelProviderFactory.java
index 25ed11804b..dd2f147da9 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbNavigatorItemLabelProviderFactory.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbNavigatorItemLabelProviderFactory.java
@@ -15,7 +15,7 @@ import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider;
 import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
 import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmFile;
 import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaType;
-import org.eclipse.jpt.jaxb.eclipselink.ui.internal.JptJaxbEclipseLinkUiIcons;
+import org.eclipse.jpt.jaxb.eclipselink.ui.JptJaxbEclipseLinkUiImages;
 import org.eclipse.jpt.jaxb.eclipselink.ui.internal.plugin.JptJaxbEclipseLinkUiPlugin;
 import org.eclipse.jpt.jaxb.ui.internal.jaxb21.GenericJaxb_2_1_NavigatorItemLabelProviderFactory;
 
@@ -54,9 +54,10 @@ public class ELJaxbNavigatorItemLabelProviderFactory
 	
 	protected ItemExtendedLabelProvider buildOxmFileLabelProvider(OxmFile file, ItemExtendedLabelProvider.Manager manager) {
 		return new StaticItemExtendedLabelProvider(
-					JptJaxbEclipseLinkUiPlugin.instance().getImage(JptJaxbEclipseLinkUiIcons.OXM_FILE),
+					JptJaxbEclipseLinkUiImages.OXM_FILE,
 					buildOxmFileText(file),
-					buildOxmFileDescription(file)
+					buildOxmFileDescription(file),
+					manager
 				);
 	}
 	
@@ -64,7 +65,7 @@ public class ELJaxbNavigatorItemLabelProviderFactory
 		StringBuffer text = new StringBuffer();
 		IPath path = file.getOxmResource().getFile().getRawLocation();
 		text.append(path.lastSegment());
-		text.append(" - ");
+		text.append(" - "); //$NON-NLS-1$
 		text.append(path.removeLastSegments(1).toOSString());
 		return text.toString();
 	}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbPersistentAttributeItemLabelProvider.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbPersistentAttributeItemLabelProvider.java
index c316fe9bf3..8dbcb74f0c 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbPersistentAttributeItemLabelProvider.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbPersistentAttributeItemLabelProvider.java
@@ -9,23 +9,23 @@
  ******************************************************************************/
 package org.eclipse.jpt.jaxb.eclipselink.ui.internal.navigator;
 
-import org.eclipse.jpt.common.ui.jface.ItemLabelProvider;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider;
 import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
 import org.eclipse.jpt.jaxb.eclipselink.ui.internal.ELJaxbMappingImageHelper;
 import org.eclipse.jpt.jaxb.ui.internal.jaxb21.JaxbPersistentAttributeItemLabelProvider;
-import org.eclipse.swt.graphics.Image;
 
 
 public class ELJaxbPersistentAttributeItemLabelProvider
 	extends JaxbPersistentAttributeItemLabelProvider
 {
-	public ELJaxbPersistentAttributeItemLabelProvider(JaxbPersistentAttribute attribute, ItemLabelProvider.Manager manager) {
+	public ELJaxbPersistentAttributeItemLabelProvider(JaxbPersistentAttribute attribute, ItemExtendedLabelProvider.Manager manager) {
 		super(attribute, manager);
 	}
 	
 	
 	@Override
-	protected Image buildImage(String mappingKey) {
-		return ELJaxbMappingImageHelper.imageForAttributeMapping(mappingKey);
+	protected ImageDescriptor buildImageDescriptor(String mappingKey) {
+		return ELJaxbMappingImageHelper.imageDescriptorForAttributeMapping(mappingKey);
 	}
 }
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/OxmJavaTypeItemLabelProvider.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/OxmJavaTypeItemLabelProvider.java
index 94928d3612..a3e47f9373 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/OxmJavaTypeItemLabelProvider.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/OxmJavaTypeItemLabelProvider.java
@@ -9,25 +9,24 @@
  ******************************************************************************/
 package org.eclipse.jpt.jaxb.eclipselink.ui.internal.navigator;
 
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jpt.common.ui.internal.jface.AbstractItemExtendedLabelProvider;
-import org.eclipse.jpt.common.ui.jface.ItemLabelProvider;
+import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jaxb.eclipselink.core.context.oxm.OxmJavaType;
-import org.eclipse.jpt.jaxb.eclipselink.ui.internal.plugin.JptJaxbEclipseLinkUiPlugin;
-import org.eclipse.jpt.jaxb.ui.internal.JptJaxbUiIcons;
-import org.eclipse.swt.graphics.Image;
+import org.eclipse.jpt.jaxb.ui.JptJaxbUiImages;
 
 public class OxmJavaTypeItemLabelProvider
-		extends AbstractItemExtendedLabelProvider<OxmJavaType> {
-	
-	public OxmJavaTypeItemLabelProvider(OxmJavaType oxmJavaType, ItemLabelProvider.Manager manager) {
+	extends AbstractItemExtendedLabelProvider<OxmJavaType>
+{
+	public OxmJavaTypeItemLabelProvider(OxmJavaType oxmJavaType, ItemExtendedLabelProvider.Manager manager) {
 		super(oxmJavaType, manager);
 	}
-	
+
 	@Override
-	public Image getImage() {
-		return JptJaxbEclipseLinkUiPlugin.instance().getImage(JptJaxbUiIcons.JAXB_CLASS);
+	protected ImageDescriptor getImageDescriptor() {
+		return JptJaxbUiImages.JAXB_CLASS;
 	}
 	
 	@Override
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/build.properties b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/build.properties
index 0a95eca8b7..f31d33b992 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/build.properties
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/build.properties
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2011 Oracle. All rights reserved.
+# Copyright (c) 2010, 2012 Oracle. All rights reserved.
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License v1.0, which accompanies this distribution
 # and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -13,7 +13,7 @@ output.. = bin/
 bin.includes = .,\
                META-INF/,\
                about.html,\
-               icons/,\
+               images/,\
                plugin.xml,\
                plugin.properties
 jars.compile.order = .
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/text.gif b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/text.gif
deleted file mode 100644
index efa7a38014..0000000000
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/text.gif
+++ /dev/null
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/ovr16/error_ovr.gif b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/ovr16/error_ovr.gif
deleted file mode 100644
index 119dcccd5a..0000000000
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/ovr16/error_ovr.gif
+++ /dev/null
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/etool16/newclass_wiz.gif b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/buttons/new-class.gif
index a1c6545cd6..a1c6545cd6 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/etool16/newclass_wiz.gif
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/buttons/new-class.gif
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/etool16/new_jaxb_project_wiz.gif b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/buttons/new-jaxb-project.gif
index b547717598..b547717598 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/etool16/new_jaxb_project_wiz.gif
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/buttons/new-jaxb-project.gif
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/etool16/NewXSD.gif b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/buttons/new-xsd.gif
index b6efdd3d86..b6efdd3d86 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/etool16/NewXSD.gif
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/buttons/new-xsd.gif
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/etool16/jaxb_facet.gif b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/jaxb-facet.gif
index e75a17c2d0..e75a17c2d0 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/etool16/jaxb_facet.gif
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/jaxb-facet.gif
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/dtdfile.gif b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/dtd-file.gif
index 3c0acadd2d..3c0acadd2d 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/dtdfile.gif
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/dtd-file.gif
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/enum_constant.gif b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/enum-constant.gif
index d4cb4254d9..d4cb4254d9 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/enum_constant.gif
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/enum-constant.gif
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/jaxb_class.gif b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/jaxb-class.gif
index baac236770..baac236770 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/jaxb_class.gif
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/jaxb-class.gif
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/jaxb_content.gif b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/jaxb-content.gif
index e75a17c2d0..e75a17c2d0 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/jaxb_content.gif
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/jaxb-content.gif
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/jaxb_enum.gif b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/jaxb-enum.gif
index c73ed28e70..c73ed28e70 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/jaxb_enum.gif
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/jaxb-enum.gif
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/package.gif b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/jaxb-package.gif
index 6989b8df73..6989b8df73 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/package.gif
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/jaxb-package.gif
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/jaxb_registry.gif b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/jaxb-registry.gif
index 719e6057b3..719e6057b3 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/jaxb_registry.gif
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/jaxb-registry.gif
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/jaxb_transient_class.gif b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/jaxb-transient-class.gif
index 066461be61..066461be61 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/jaxb_transient_class.gif
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/jaxb-transient-class.gif
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/jaxb_transient_class.ico b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/jaxb-transient-class.ico
index 126f3e5c81..126f3e5c81 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/jaxb_transient_class.ico
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/jaxb-transient-class.ico
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/jaxb_transient_enum.gif b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/jaxb-transient-enum.gif
index b634fb535f..b634fb535f 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/jaxb_transient_enum.gif
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/jaxb-transient-enum.gif
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/jaxb_transient_enum.ico b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/jaxb-transient-enum.ico
index 6c3cceb0c4..6c3cceb0c4 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/jaxb_transient_enum.ico
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/jaxb-transient-enum.ico
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/null-attribute-mapping.gif b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/null-attribute-mapping.gif
index 70a9c23541..70a9c23541 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/null-attribute-mapping.gif
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/null-attribute-mapping.gif
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/persistent_field.gif b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/persistent-field.gif
index d4cb4254d9..d4cb4254d9 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/persistent_field.gif
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/persistent-field.gif
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/persistent_property.gif b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/persistent-property.gif
index 7d24707ee8..7d24707ee8 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/persistent_property.gif
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/persistent-property.gif
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/xml-any-attribute.gif b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/xml-any-attribute.gif
index a5d9fb0dd6..a5d9fb0dd6 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/xml-any-attribute.gif
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/xml-any-attribute.gif
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/xml-any-element.gif b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/xml-any-element.gif
index f73d02bf43..f73d02bf43 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/xml-any-element.gif
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/xml-any-element.gif
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/xml-attribute.gif b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/xml-attribute.gif
index 851ee72391..851ee72391 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/xml-attribute.gif
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/xml-attribute.gif
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/xml-element-ref.gif b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/xml-element-ref.gif
index 3220052c41..3220052c41 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/xml-element-ref.gif
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/xml-element-ref.gif
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/xml-element-refs.gif b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/xml-element-refs.gif
index 77e4d6a8bd..77e4d6a8bd 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/xml-element-refs.gif
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/xml-element-refs.gif
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/xml-element.gif b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/xml-element.gif
index 8c953dc928..8c953dc928 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/xml-element.gif
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/xml-element.gif
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/xml-elements.gif b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/xml-elements.gif
index cb6aad6b16..cb6aad6b16 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/xml-elements.gif
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/xml-elements.gif
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/xml-transient.gif b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/xml-transient.gif
index 3fd90cf828..3fd90cf828 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/xml-transient.gif
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/xml-transient.gif
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/xml-value.gif b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/xml-value.gif
index 7145d6de8e..7145d6de8e 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/xml-value.gif
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/xml-value.gif
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/XSDFile.gif b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/xsd-file.gif
index cc0eeb7196..cc0eeb7196 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/obj16/XSDFile.gif
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/objects/xsd-file.gif
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/wizban/newclass_wiz.gif b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/wizards/classes-gen-banner.gif
index 0ac0ee8635..0ac0ee8635 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/wizban/newclass_wiz.gif
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/wizards/classes-gen-banner.gif
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/wizban/new_jaxb_prj_wiz.gif b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/wizards/jaxb-project-banner.gif
index d1873a1a51..d1873a1a51 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/wizban/new_jaxb_prj_wiz.gif
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/wizards/jaxb-project-banner.gif
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/wizban/new_jaxb_prj_wiz.png b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/wizards/jaxb-project-banner.png
index 95eb79dbb0..95eb79dbb0 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/wizban/new_jaxb_prj_wiz.png
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/wizards/jaxb-project-banner.png
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/wizban/NewXSD.gif b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/wizards/schema-gen-banner.gif
index 390f48216a..390f48216a 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/icons/full/wizban/NewXSD.gif
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/images/wizards/schema-gen-banner.gif
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/plugin.xml b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/plugin.xml
index 75660d2549..b12082d60b 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/plugin.xml
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/plugin.xml
@@ -49,7 +49,7 @@
 			name="%generateSchemaFromClassesName"
  			category="org.eclipse.jpt.jaxb"
  			class="org.eclipse.jpt.jaxb.ui.internal.wizards.schemagen.SchemaGeneratorWizard"
-			icon="icons/full/etool16/NewXSD.gif">
+			icon="$nl$/images/buttons/new-xsd.gif">
 				<description>%generateSchemaFromClassesDesc</description>
 				<selection class="org.eclipse.core.resources.IResource"/> 
 		</wizard>
@@ -59,7 +59,7 @@
 			name="%generateClassesFromSchemaName"
  			category="org.eclipse.jpt.jaxb"
  			class="org.eclipse.jpt.jaxb.ui.internal.wizards.classesgen.ClassesGeneratorWizard"
-			icon="icons/full/etool16/newclass_wiz.gif">
+			icon="$nl$/images/buttons/new-class.gif">
 				<description>%generateClassesFromSchemaDesc</description>
 		</wizard>
 
@@ -67,7 +67,7 @@
 		<wizard
 			id="org.eclipse.jpt.jaxb.ui.wizard.newJaxbProject"
 			name="%newJaxbProjectWizardName"
-			icon="icons/full/etool16/new_jaxb_project_wiz.gif"
+			icon="$nl$/images/buttons/new-jaxb-project.gif"
 			category="org.eclipse.jpt.jaxb"
 			project="true">
 			<description>%newJaxbProjectWizardDesc</description>
@@ -84,7 +84,8 @@
 		id="jaxbCompletionProposals"
 		name="%jaxbCompletionProposals">
 		
-		<proposalCategory icon="icons/full/etool16/jaxb_facet.gif">
+		<proposalCategory
+			icon="$nl$/images/jaxb-facet.gif">
 			<enablement>
 				<with variable="project">
 					<adapt type="org.eclipse.core.resources.IProject">
@@ -236,7 +237,7 @@
 			name="%jaxbNavigatorContent"
 			priority="higher"
 			appearsBefore="org.eclipse.jst.servlet.ui.EnhancedJavaRendering"
-			icon="icons/full/obj16/jaxb_content.gif"
+			icon="$nl$/images/objects/jaxb-content.gif"
 			activeByDefault="true"
 			contentProvider="org.eclipse.jpt.jaxb.ui.internal.navigator.JaxbNavigatorContentProvider"
 			labelProvider="org.eclipse.jpt.common.ui.internal.jface.NavigatorLabelProvider">
@@ -381,7 +382,7 @@
 	<extension
 		point="org.eclipse.wst.common.project.facet.ui.images">
 		
-		<image facet="jpt.jaxb" path="icons/full/etool16/jaxb_facet.gif"/>
+		<image facet="jpt.jaxb" path="$nl$/images/jaxb-facet.gif"/>
 		
 	</extension>
 	
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/JptJaxbUiImages.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/JptJaxbUiImages.java
new file mode 100644
index 0000000000..dec7afa977
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/JptJaxbUiImages.java
@@ -0,0 +1,99 @@
+/*******************************************************************************
+ * Copyright (c) 2010, 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.jaxb.ui;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jpt.common.ui.JptCommonUiImages;
+import org.eclipse.jpt.jaxb.ui.internal.plugin.JptJaxbUiPlugin;
+
+/**
+ * Actually, just the image descriptors....
+ * <p>
+ * Code should use these constants to acquire (and release) the images provided
+ * by Dali. The images should be managed by a
+ * {@link org.eclipse.jface.resource.ResourceManager "local" resource manager}.
+ * <p>
+ * Also, the {@link org.eclipse.ui.IWorkbench Eclipse workbench} supplies more
+ * general purpose {@link org.eclipse.ui.ISharedImages images}.
+ * 
+ * @see JptCommonUiImages
+ */
+// TODO add corresponding ImageDescriptorTest...
+@SuppressWarnings("nls")
+public final class JptJaxbUiImages {
+
+	// ********** directories **********
+
+	private static final String IMAGES_ = JptCommonUiImages.IMAGES_;
+	private static final String BUTTONS_ = JptCommonUiImages.BUTTONS_;
+	private static final String OBJECTS_ = JptCommonUiImages.OBJECTS_;
+	private static final String WIZARDS_ = JptCommonUiImages.WIZARDS_;
+
+
+	// ********** general **********
+
+	public static final ImageDescriptor JAXB_FACET = buildImageDescriptor(IMAGES_ + "jaxb-facet.gif");
+	public static final ImageDescriptor JAXB_CONTENT = buildImageDescriptor(OBJECTS_ + "jaxb-content.gif");
+
+	public static final ImageDescriptor DTD_FILE = buildImageDescriptor(OBJECTS_ + "dtd-file.gif");
+	public static final ImageDescriptor XSD_FILE = buildImageDescriptor(OBJECTS_ + "xsd-file.gif");
+
+
+	// ********** buttons **********
+
+	public static final ImageDescriptor NEW_CLASS = buildImageDescriptor(BUTTONS_ + "new-class.gif");
+	public static final ImageDescriptor NEW_JAXB_PROJECT = buildImageDescriptor(BUTTONS_ + "new-jaxb-project.gif");
+	public static final ImageDescriptor NEW_XSD = buildImageDescriptor(BUTTONS_ + "new-xsd.gif");
+
+
+	// ********** Java **********
+
+	public static final ImageDescriptor JAXB_PACKAGE = buildImageDescriptor(OBJECTS_ + "jaxb-package.gif");
+	public static final ImageDescriptor JAXB_CLASS = buildImageDescriptor(OBJECTS_ + "jaxb-class.gif");
+	public static final ImageDescriptor JAXB_ENUM = buildImageDescriptor(OBJECTS_ + "jaxb-enum.gif");
+	public static final ImageDescriptor JAXB_TRANSIENT_CLASS = buildImageDescriptor(OBJECTS_ + "jaxb-transient-class.gif");
+	public static final ImageDescriptor JAXB_TRANSIENT_ENUM = buildImageDescriptor(OBJECTS_ + "jaxb-transient-enum.gif");
+	public static final ImageDescriptor PERSISTENT_FIELD = buildImageDescriptor(OBJECTS_ + "persistent-field.gif");
+	public static final ImageDescriptor PERSISTENT_PROPERTY = buildImageDescriptor(OBJECTS_ + "persistent-property.gif");
+	public static final ImageDescriptor ENUM_CONSTANT = buildImageDescriptor(OBJECTS_ + "enum-constant.gif");
+
+
+	// ********** mappings **********
+
+	public static final ImageDescriptor JAXB_REGISTRY = buildImageDescriptor(OBJECTS_ + "jaxb-registry.gif");
+	public static final ImageDescriptor XML_ANY_ATTRIBUTE = buildImageDescriptor(OBJECTS_ + "xml-any-attribute.gif");
+	public static final ImageDescriptor XML_ANY_ELEMENT = buildImageDescriptor(OBJECTS_ + "xml-any-element.gif");
+	public static final ImageDescriptor XML_ATTRIBUTE = buildImageDescriptor(OBJECTS_ + "xml-attribute.gif");
+	public static final ImageDescriptor XML_ELEMENT = buildImageDescriptor(OBJECTS_ + "xml-element.gif");
+	public static final ImageDescriptor XML_ELEMENT_REF = buildImageDescriptor(OBJECTS_ + "xml-element-ref.gif");
+	public static final ImageDescriptor XML_ELEMENT_REFS = buildImageDescriptor(OBJECTS_ + "xml-element-refs.gif");
+	public static final ImageDescriptor XML_ELEMENTS = buildImageDescriptor(OBJECTS_ + "xml-elements.gif");
+	public static final ImageDescriptor XML_TRANSIENT = buildImageDescriptor(OBJECTS_ + "xml-transient.gif");
+	public static final ImageDescriptor XML_VALUE = buildImageDescriptor(OBJECTS_ + "xml-value.gif");
+	public static final ImageDescriptor NULL_ATTRIBUTE_MAPPING = buildImageDescriptor(OBJECTS_ + "null-attribute-mapping.gif");
+
+
+	// ********** wizard banners **********
+
+	public static final ImageDescriptor JAXB_PROJECT_BANNER = buildImageDescriptor(WIZARDS_ + "jaxb-project-banner.gif");
+	public static final ImageDescriptor SCHEMA_GEN_BANNER = buildImageDescriptor(WIZARDS_ + "schema-gen-banner.gif");
+	public static final ImageDescriptor CLASSES_GEN_BANNER = buildImageDescriptor(WIZARDS_ + "classes-gen-banner.gif");
+
+
+	// ********** misc **********
+
+	private static ImageDescriptor buildImageDescriptor(String path) {
+		return JptJaxbUiPlugin.instance().buildImageDescriptor(path);
+	}
+
+	private JptJaxbUiImages() {
+		throw new UnsupportedOperationException();
+	}
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/JaxbMappingImageHelper.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/JaxbMappingImageHelper.java
index b6836f5061..7e9866962b 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/JaxbMappingImageHelper.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/JaxbMappingImageHelper.java
@@ -9,70 +9,45 @@
  ******************************************************************************/
 package org.eclipse.jpt.jaxb.ui.internal;
 
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jpt.jaxb.core.MappingKeys;
-import org.eclipse.jpt.jaxb.ui.internal.plugin.JptJaxbUiPlugin;
-import org.eclipse.swt.graphics.Image;
+import org.eclipse.jpt.jaxb.ui.JptJaxbUiImages;
 
-public class JaxbMappingImageHelper
-{
-//
-//	public static Image imageForTypeMapping(String mappingKey) {
-//		return JptUiPlugin.getImage(iconKeyForTypeMapping(mappingKey));
-//	}
-//
-//	public static String iconKeyForTypeMapping(String mappingKey) {
-//		if (MappingKeys.NULL_TYPE_MAPPING_KEY == mappingKey) {
-//			return JptUiIcons.NULL_TYPE_MAPPING;
-//		}
-//		else if (MappingKeys.ENTITY_TYPE_MAPPING_KEY.equals(mappingKey)) {
-//			return JptUiIcons.ENTITY;
-//		}
-//		else if (MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY.equals(mappingKey)) {
-//			return JptUiIcons.EMBEDDABLE;
-//		}
-//		else if (MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY.equals(mappingKey)) {
-//			return JptUiIcons.MAPPED_SUPERCLASS;
-//		}
-//		return null;
-//	}
+public class JaxbMappingImageHelper {
 
-	public static Image imageForAttributeMapping(String mappingKey) {
-		return JptJaxbUiPlugin.instance().getImage(iconKeyForAttributeMapping(mappingKey));
-	}
-
-	public static String iconKeyForAttributeMapping(String mappingKey) {
+	public static ImageDescriptor imageDescriptorForAttributeMapping(String mappingKey) {
 		if (MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY == mappingKey) {
-			return JptJaxbUiIcons.NULL_ATTRIBUTE_MAPPING;
+			return JptJaxbUiImages.NULL_ATTRIBUTE_MAPPING;
 		}
-		else if (MappingKeys.XML_ANY_ATTRIBUTE_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) {
-			return JptJaxbUiIcons.XML_ANY_ATTRIBUTE;
+		if (MappingKeys.XML_ANY_ATTRIBUTE_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) {
+			return JptJaxbUiImages.XML_ANY_ATTRIBUTE;
 		}
-		else if (MappingKeys.XML_ANY_ELEMENT_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) {
-			return JptJaxbUiIcons.XML_ANY_ELEMENT;
+		if (MappingKeys.XML_ANY_ELEMENT_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) {
+			return JptJaxbUiImages.XML_ANY_ELEMENT;
 		}
-		else if (MappingKeys.XML_ATTRIBUTE_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) {
-			return JptJaxbUiIcons.XML_ATTRIBUTE;
+		if (MappingKeys.XML_ATTRIBUTE_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) {
+			return JptJaxbUiImages.XML_ATTRIBUTE;
 		}
-		else if (MappingKeys.XML_ELEMENT_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) {
-			return JptJaxbUiIcons.XML_ELEMENT;
+		if (MappingKeys.XML_ELEMENT_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) {
+			return JptJaxbUiImages.XML_ELEMENT;
 		}
-		else if (MappingKeys.XML_ELEMENT_REF_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) {
-			return JptJaxbUiIcons.XML_ELEMENT_REF;
+		if (MappingKeys.XML_ELEMENT_REF_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) {
+			return JptJaxbUiImages.XML_ELEMENT_REF;
 		}
-		else if (MappingKeys.XML_ELEMENT_REFS_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) {
-			return JptJaxbUiIcons.XML_ELEMENT_REFS;
+		if (MappingKeys.XML_ELEMENT_REFS_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) {
+			return JptJaxbUiImages.XML_ELEMENT_REFS;
 		}
-		else if (MappingKeys.XML_ELEMENTS_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) {
-			return JptJaxbUiIcons.XML_ELEMENTS;
+		if (MappingKeys.XML_ELEMENTS_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) {
+			return JptJaxbUiImages.XML_ELEMENTS;
 		}
-		else if (MappingKeys.XML_TRANSIENT_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) {
-			return JptJaxbUiIcons.XML_TRANSIENT;
+		if (MappingKeys.XML_TRANSIENT_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) {
+			return JptJaxbUiImages.XML_TRANSIENT;
 		}
-		else if (MappingKeys.XML_VALUE_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) {
-			return JptJaxbUiIcons.XML_VALUE;
+		if (MappingKeys.XML_VALUE_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) {
+			return JptJaxbUiImages.XML_VALUE;
 		}
 		
 		//return the JAXB_CONTENT icon instead of null, might as well have an icon if one is not defined
-		return JptJaxbUiIcons.JAXB_CONTENT;
+		return JptJaxbUiImages.JAXB_CONTENT;
 	}
 }
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/JptJaxbUiIcons.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/JptJaxbUiIcons.java
deleted file mode 100644
index 693c3ec187..0000000000
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/JptJaxbUiIcons.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2010, 2011 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
-package org.eclipse.jpt.jaxb.ui.internal;
-
-@SuppressWarnings("nls")
-public class JptJaxbUiIcons {
-	
-	// **************** General icons **************************************
-	
-	public static final String JAXB_CONTENT = "full/obj16/jaxb_content";
-	public static final String PACKAGE = "full/obj16/package";
-	
-	public static final String JAXB_CLASS = "full/obj16/jaxb_class";
-	public static final String JAXB_ENUM = "full/obj16/jaxb_enum";
-	public static final String JAXB_TRANSIENT_CLASS = "full/obj16/jaxb_transient_class";
-	public static final String JAXB_TRANSIENT_ENUM = "full/obj16/jaxb_transient_enum";
-	public static final String JAXB_REGISTRY = "full/obj16/jaxb_registry";
-	
-	public static final String XML_ANY_ATTRIBUTE = "full/obj16/xml-any-attribute";
-	public static final String XML_ANY_ELEMENT = "full/obj16/xml-any-element";
-	public static final String XML_ATTRIBUTE = "full/obj16/xml-attribute";
-	public static final String XML_ELEMENT = "full/obj16/xml-element";
-	public static final String XML_ELEMENT_REF = "full/obj16/xml-element-ref";
-	public static final String XML_ELEMENT_REFS = "full/obj16/xml-element-refs";
-	public static final String XML_ELEMENTS = "full/obj16/xml-elements";
-	
-	public static final String XML_TRANSIENT = "full/obj16/xml-transient";
-	public static final String XML_VALUE = "full/obj16/xml-value";
-	public static final String NULL_ATTRIBUTE_MAPPING = "full/obj16/null-attribute-mapping";
-	
-	public static final String PERSISTENT_FIELD = "full/obj16/persistent_field";
-	public static final String PERSISTENT_PROPERTY = "full/obj16/persistent_property";
-	public static final String ENUM_CONSTANT = "full/obj16/enum_constant";
-	
-	
-	// **************** Wizard icons *******************************************
-	
-	public static final String SCHEMA_GEN = "full/wizban/NewXSD";
-	
-	public static final String SCHEMA_GEN_WIZ_BANNER = "full/wizban/NewXSD";
-	public static final String CLASSES_GEN_WIZ_BANNER = "full/wizban/newclass_wiz";
-	public static final String JAXB_WIZ_BANNER = "full/wizban/new_jaxb_prj_wiz";
-}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorItemLabelProviderFactory.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorItemLabelProviderFactory.java
index 33cb0dea08..82da87aa75 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorItemLabelProviderFactory.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorItemLabelProviderFactory.java
@@ -18,9 +18,8 @@ import org.eclipse.jpt.jaxb.core.context.JaxbEnum;
 import org.eclipse.jpt.jaxb.core.context.JaxbEnumConstant;
 import org.eclipse.jpt.jaxb.core.context.JaxbPackage;
 import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
-import org.eclipse.jpt.jaxb.ui.internal.JptJaxbUiIcons;
+import org.eclipse.jpt.jaxb.ui.JptJaxbUiImages;
 import org.eclipse.jpt.jaxb.ui.internal.JptJaxbUiMessages;
-import org.eclipse.jpt.jaxb.ui.internal.plugin.JptJaxbUiPlugin;
 
 
 public class GenericJaxb_2_1_NavigatorItemLabelProviderFactory
@@ -65,11 +64,12 @@ public class GenericJaxb_2_1_NavigatorItemLabelProviderFactory
 		return null;
 	}
 
-	protected ItemExtendedLabelProvider buildJaxbContextRootProvider(JaxbContextRoot root, @SuppressWarnings("unused") ItemExtendedLabelProvider.Manager manager) {
+	protected ItemExtendedLabelProvider buildJaxbContextRootProvider(JaxbContextRoot root, ItemExtendedLabelProvider.Manager manager) {
 		return new StaticItemExtendedLabelProvider(
-					JptJaxbUiPlugin.instance().getImage(JptJaxbUiIcons.JAXB_CONTENT),
+					JptJaxbUiImages.JAXB_CONTENT,
 					JptJaxbUiMessages.JaxbContent_label,
-					this.buildJaxbContextRootDescription(root)
+					this.buildJaxbContextRootDescription(root),
+					manager
 				);
 	}
 
@@ -81,18 +81,20 @@ public class GenericJaxb_2_1_NavigatorItemLabelProviderFactory
 		return sb.toString();
 	}
 
-	protected ItemExtendedLabelProvider buildJaxbEnumConstantProvider(JaxbEnumConstant enumConstant, @SuppressWarnings("unused") ItemExtendedLabelProvider.Manager manager) {
+	protected ItemExtendedLabelProvider buildJaxbEnumConstantProvider(JaxbEnumConstant enumConstant, ItemExtendedLabelProvider.Manager manager) {
 		return new StaticItemExtendedLabelProvider(
-					JptJaxbUiPlugin.instance().getImage(JptJaxbUiIcons.ENUM_CONSTANT),
-					enumConstant.getName()
+					JptJaxbUiImages.ENUM_CONSTANT,
+					enumConstant.getName(),
+					manager
 				);
 	}
 
-	protected ItemExtendedLabelProvider buildJaxbPackageProvider(JaxbPackage pkg, @SuppressWarnings("unused") ItemExtendedLabelProvider.Manager manager) {
+	protected ItemExtendedLabelProvider buildJaxbPackageProvider(JaxbPackage pkg, ItemExtendedLabelProvider.Manager manager) {
 		return new StaticItemExtendedLabelProvider(
-					JptJaxbUiPlugin.instance().getImage(JptJaxbUiIcons.PACKAGE),
+					JptJaxbUiImages.JAXB_PACKAGE,
 					pkg.getName(),
-					this.buildJaxbPackageDescription(pkg)
+					this.buildJaxbPackageDescription(pkg),
+					manager
 				);
 	}
 
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbClassItemLabelProvider.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbClassItemLabelProvider.java
index 6215510d1d..6570d9a396 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbClassItemLabelProvider.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbClassItemLabelProvider.java
@@ -9,7 +9,8 @@
  ******************************************************************************/
 package org.eclipse.jpt.jaxb.ui.internal.jaxb21;
 
-import org.eclipse.jpt.common.ui.jface.ItemLabelProvider;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider;
 import org.eclipse.jpt.common.utility.internal.model.value.AspectPropertyValueModelAdapter;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.internal.model.value.StaticPropertyValueModel;
@@ -20,27 +21,25 @@ import org.eclipse.jpt.jaxb.core.context.JaxbClass;
 import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping;
 import org.eclipse.jpt.jaxb.core.context.JaxbType;
 import org.eclipse.jpt.jaxb.core.context.JaxbTypeMapping;
-import org.eclipse.jpt.jaxb.ui.internal.JptJaxbUiIcons;
-import org.eclipse.jpt.jaxb.ui.internal.plugin.JptJaxbUiPlugin;
-import org.eclipse.swt.graphics.Image;
+import org.eclipse.jpt.jaxb.ui.JptJaxbUiImages;
 
 
 public class JaxbClassItemLabelProvider
 	extends JaxbTypeItemLabelProvider<JaxbClass>
 {
 	
-	public JaxbClassItemLabelProvider(JaxbClass jaxbPersistentClass, ItemLabelProvider.Manager manager) {
+	public JaxbClassItemLabelProvider(JaxbClass jaxbPersistentClass, ItemExtendedLabelProvider.Manager manager) {
 		super(jaxbPersistentClass, manager);
 	}
 	
 	@Override
-	protected PropertyValueModel<Image> buildImageModel() {
-		return new JaxbClassImageModel(this.item);
+	protected PropertyValueModel<ImageDescriptor> buildImageDescriptorModel() {
+		return new JaxbClassImageDescriptorModel(this.item);
 	}
 	
 	
-	protected class JaxbClassImageModel
-			extends AspectPropertyValueModelAdapter<JaxbClass, Image> {
+	protected class JaxbClassImageDescriptorModel
+			extends AspectPropertyValueModelAdapter<JaxbClass, ImageDescriptor> {
 		
 		protected final PropertyValueModel<Boolean> isXmlRegistryModel;
 			
@@ -51,7 +50,7 @@ public class JaxbClassItemLabelProvider
 		protected final PropertyChangeListener propertyChangeListener;
 		
 		
-		public JaxbClassImageModel(JaxbClass subject) {
+		public JaxbClassImageDescriptorModel(JaxbClass subject) {
 			super(new StaticPropertyValueModel<JaxbClass>(subject));
 			this.isXmlRegistryModel = buildIsXmlRegistryModel();
 			this.mappingModel = buildMappingModel();
@@ -91,22 +90,20 @@ public class JaxbClassItemLabelProvider
 			// transform the subject's property change events into VALUE property change events
 			return new PropertyChangeListener() {
 				public void propertyChanged(PropertyChangeEvent event) {
-					JaxbClassImageModel.this.aspectChanged();
+					JaxbClassImageDescriptorModel.this.aspectChanged();
 				}
 			};
 		}
 		
 		@Override
-		protected Image buildValue_() {
-			if (this.mappingModel.getValue() != null) {
-				if (this.isXmlTransientModel.getValue() == Boolean.TRUE) {
-					return JptJaxbUiPlugin.instance().getImage(JptJaxbUiIcons.JAXB_TRANSIENT_CLASS);
-				}
+		protected ImageDescriptor buildValue_() {
+			if ((this.mappingModel.getValue() != null) && (this.isXmlTransientModel.getValue() == Boolean.TRUE)) {
+				return JptJaxbUiImages.JAXB_TRANSIENT_CLASS;
 			}
-			else if (this.isXmlRegistryModel.getValue() == Boolean.TRUE) {
-				return JptJaxbUiPlugin.instance().getImage(JptJaxbUiIcons.JAXB_REGISTRY);
+			if (this.isXmlRegistryModel.getValue() == Boolean.TRUE) {
+				return JptJaxbUiImages.JAXB_REGISTRY;
 			}
-			return JptJaxbUiPlugin.instance().getImage(JptJaxbUiIcons.JAXB_CLASS);
+			return JptJaxbUiImages.JAXB_CLASS;
 		}
 		
 		@Override
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbEnumItemLabelProvider.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbEnumItemLabelProvider.java
index bdef1b1d44..8eb8e7011b 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbEnumItemLabelProvider.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbEnumItemLabelProvider.java
@@ -9,7 +9,8 @@
  ******************************************************************************/
 package org.eclipse.jpt.jaxb.ui.internal.jaxb21;
 
-import org.eclipse.jpt.common.ui.jface.ItemLabelProvider;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider;
 import org.eclipse.jpt.common.utility.internal.model.value.AspectPropertyValueModelAdapter;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.internal.model.value.StaticPropertyValueModel;
@@ -19,27 +20,25 @@ import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jaxb.core.context.JaxbEnum;
 import org.eclipse.jpt.jaxb.core.context.JaxbEnumMapping;
 import org.eclipse.jpt.jaxb.core.context.JaxbType;
-import org.eclipse.jpt.jaxb.ui.internal.JptJaxbUiIcons;
-import org.eclipse.jpt.jaxb.ui.internal.plugin.JptJaxbUiPlugin;
-import org.eclipse.swt.graphics.Image;
+import org.eclipse.jpt.jaxb.ui.JptJaxbUiImages;
 
 
 public class JaxbEnumItemLabelProvider
 	extends JaxbTypeItemLabelProvider<JaxbEnum>
 {
 	
-	public JaxbEnumItemLabelProvider(JaxbEnum jaxbEnum, ItemLabelProvider.Manager manager) {
+	public JaxbEnumItemLabelProvider(JaxbEnum jaxbEnum, ItemExtendedLabelProvider.Manager manager) {
 		super(jaxbEnum, manager);
 	}
 	
 	@Override
-	protected PropertyValueModel<Image> buildImageModel() {
-		return new JaxbEnumImageModel(this.item);
+	protected PropertyValueModel<ImageDescriptor> buildImageDescriptorModel() {
+		return new JaxbEnumImageDescriptorModel(this.item);
 	}
 	
 	
-	protected class JaxbEnumImageModel
-			extends AspectPropertyValueModelAdapter<JaxbEnum, Image> {
+	protected class JaxbEnumImageDescriptorModel
+			extends AspectPropertyValueModelAdapter<JaxbEnum, ImageDescriptor> {
 		
 		protected final PropertyValueModel<JaxbEnumMapping> mappingModel;
 		
@@ -48,7 +47,7 @@ public class JaxbEnumItemLabelProvider
 		protected final PropertyChangeListener propertyChangeListener;
 		
 		
-		public JaxbEnumImageModel(JaxbEnum subject) {
+		public JaxbEnumImageDescriptorModel(JaxbEnum subject) {
 			super(new StaticPropertyValueModel<JaxbEnum>(subject));
 			this.mappingModel = buildMappingModel();
 			this.isXmlTransientModel = buildIsXmlTransientModel();
@@ -78,19 +77,17 @@ public class JaxbEnumItemLabelProvider
 			// transform the subject's property change events into VALUE property change events
 			return new PropertyChangeListener() {
 				public void propertyChanged(PropertyChangeEvent event) {
-					JaxbEnumImageModel.this.aspectChanged();
+					JaxbEnumImageDescriptorModel.this.aspectChanged();
 				}
 			};
 		}
 		
 		@Override
-		protected Image buildValue_() {
-			if (this.mappingModel.getValue() != null) {
-				if (this.isXmlTransientModel.getValue() == Boolean.TRUE) {
-					return JptJaxbUiPlugin.instance().getImage(JptJaxbUiIcons.JAXB_TRANSIENT_ENUM);
-				}
+		protected ImageDescriptor buildValue_() {
+			if ((this.mappingModel.getValue() != null) && (this.isXmlTransientModel.getValue() == Boolean.TRUE)) {
+				return JptJaxbUiImages.JAXB_TRANSIENT_ENUM;
 			}
-			return JptJaxbUiPlugin.instance().getImage(JptJaxbUiIcons.JAXB_ENUM);
+			return JptJaxbUiImages.JAXB_ENUM;
 		}
 		
 		@Override
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbPersistentAttributeItemLabelProvider.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbPersistentAttributeItemLabelProvider.java
index 0c1ee41d75..9064b8febd 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbPersistentAttributeItemLabelProvider.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbPersistentAttributeItemLabelProvider.java
@@ -9,13 +9,13 @@
  ******************************************************************************/
 package org.eclipse.jpt.jaxb.ui.internal.jaxb21;
 
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jpt.common.ui.internal.jface.AbstractItemExtendedLabelProvider;
-import org.eclipse.jpt.common.ui.jface.ItemLabelProvider;
+import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute;
 import org.eclipse.jpt.jaxb.ui.internal.JaxbMappingImageHelper;
-import org.eclipse.swt.graphics.Image;
 
 
 public class JaxbPersistentAttributeItemLabelProvider
@@ -24,24 +24,24 @@ public class JaxbPersistentAttributeItemLabelProvider
 	protected final String text;
 	protected final String description;
 	
-	public JaxbPersistentAttributeItemLabelProvider(JaxbPersistentAttribute attribute, ItemLabelProvider.Manager manager) {
+	public JaxbPersistentAttributeItemLabelProvider(JaxbPersistentAttribute attribute, ItemExtendedLabelProvider.Manager manager) {
 		super(attribute, manager);
 		this.text = this.buildText();
 		this.description = this.buildDescription();
 	}
 	
 	@Override
-	protected PropertyValueModel<Image> buildImageModel() {
-		return new PropertyAspectAdapter<JaxbPersistentAttribute, Image>(IMAGE_ASPECT_NAMES, this.item) {
+	protected PropertyValueModel<ImageDescriptor> buildImageDescriptorModel() {
+		return new PropertyAspectAdapter<JaxbPersistentAttribute, ImageDescriptor>(IMAGE_ASPECT_NAMES, this.item) {
 			@Override
-			protected Image buildValue_() {
-				return JaxbPersistentAttributeItemLabelProvider.this.buildImage(this.subject.getMappingKey());
+			protected ImageDescriptor buildValue_() {
+				return JaxbPersistentAttributeItemLabelProvider.this.buildImageDescriptor(this.subject.getMappingKey());
 			}
 		};
 	}
 
-	protected Image buildImage(String mappingKey) {
-		return JaxbMappingImageHelper.imageForAttributeMapping(mappingKey);
+	protected ImageDescriptor buildImageDescriptor(String mappingKey) {
+		return JaxbMappingImageHelper.imageDescriptorForAttributeMapping(mappingKey);
 	}
 
 	protected static final String[] IMAGE_ASPECT_NAMES = new String[] {
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbTypeItemLabelProvider.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbTypeItemLabelProvider.java
index e08db985c7..254717e202 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbTypeItemLabelProvider.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbTypeItemLabelProvider.java
@@ -10,7 +10,7 @@
 package org.eclipse.jpt.jaxb.ui.internal.jaxb21;
 
 import org.eclipse.jpt.common.ui.internal.jface.AbstractItemExtendedLabelProvider;
-import org.eclipse.jpt.common.ui.jface.ItemLabelProvider;
+import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider;
 import org.eclipse.jpt.jaxb.core.context.JaxbType;
 
 
@@ -20,7 +20,7 @@ public abstract class JaxbTypeItemLabelProvider<I extends JaxbType>
 	protected final String text;
 	protected final String description;
 	
-	protected JaxbTypeItemLabelProvider(I jaxbType, ItemLabelProvider.Manager manager) {
+	protected JaxbTypeItemLabelProvider(I jaxbType, ItemExtendedLabelProvider.Manager manager) {
 		super(jaxbType, manager);
 		this.text = this.buildText();
 		this.description = this.buildDescription();
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/navigator/JaxbNavigatorContentProvider.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/navigator/JaxbNavigatorContentProvider.java
index efa396858a..e2dbcdb06e 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/navigator/JaxbNavigatorContentProvider.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/navigator/JaxbNavigatorContentProvider.java
@@ -16,6 +16,9 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.resource.LocalResourceManager;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jface.viewers.StructuredViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jpt.common.ui.internal.jface.NavigatorContentProvider;
@@ -70,6 +73,15 @@ public class JaxbNavigatorContentProvider
 	}
 
 	@Override
+	protected ResourceManager buildResourceManager() {
+		return new LocalResourceManager(this.getParentResourceManager());
+	}
+
+	protected ResourceManager getParentResourceManager() {
+		return JFaceResources.getResources();
+	}
+
+	@Override
 	public void inputChanged(Viewer v, Object oldInput, Object newInput) {
 		super.inputChanged(v, oldInput, newInput);
 		this.viewer = (StructuredViewer) v;
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/properties/JaxbSchemasPropertiesPage.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/properties/JaxbSchemasPropertiesPage.java
index cbd7f4b5bf..c84c2f3cb8 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/properties/JaxbSchemasPropertiesPage.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/properties/JaxbSchemasPropertiesPage.java
@@ -35,6 +35,7 @@ import org.eclipse.jface.dialogs.TrayDialog;
 import org.eclipse.jface.layout.TableColumnLayout;
 import org.eclipse.jface.operation.IRunnableContext;
 import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jface.viewers.ColumnViewerToolTipSupport;
 import org.eclipse.jface.viewers.ColumnWeightData;
 import org.eclipse.jface.viewers.ITableLabelProvider;
@@ -97,6 +98,7 @@ public class JaxbSchemasPropertiesPage
 	
 	private static final int SIZING_SELECTION_PANE_WIDTH = 450;
 	
+	private final ResourceManager resourceManager;
 	
 	protected final ModifiablePropertyValueModel<IProject> projectModel;
 	
@@ -109,8 +111,9 @@ public class JaxbSchemasPropertiesPage
 	private final ModifiableCollectionValueModel<Schema> schemasSelectionModel;
 	
 	
-	public JaxbSchemasPropertiesPage() {
+	public JaxbSchemasPropertiesPage(ResourceManager resourceManager) {
 		super();
+		this.resourceManager = resourceManager;
 		this.projectModel = new SimplePropertyValueModel<IProject>();
 		this.jaxbProjectModel = new JaxbProjectModel(this.projectModel);
 		this.trigger = new BufferedModifiablePropertyValueModel.Trigger();
@@ -266,7 +269,8 @@ public class JaxbSchemasPropertiesPage
 				new AddEditSchemaDialog(
 						getShell(),
 						null,
-						this.schemasModel.getAspectValue());
+						this.schemasModel.getAspectValue(),
+						this.resourceManager);
 		
 		// opens the dialog - just returns if the user cancels it
 		if (dialog.open() == Window.CANCEL) {
@@ -296,7 +300,8 @@ public class JaxbSchemasPropertiesPage
 				new AddEditSchemaDialog(
 						getShell(),
 						schema,
-						this.schemasModel.getAspectValue());
+						this.schemasModel.getAspectValue(),
+						this.resourceManager);
 		
 		// opens the dialog - just returns if the user cancels it
 		if (dialog.open() == Window.CANCEL) {
@@ -412,12 +417,6 @@ public class JaxbSchemasPropertiesPage
 		this.trigger.reset();
 	}
 	
-	@Override
-	public void dispose() {
-		
-		super.dispose();
-	}
-	
 	
 	static class SchemasModel
 			extends AspectAdapter<JaxbProject, Collection<Schema>>
@@ -712,7 +711,9 @@ public class JaxbSchemasPropertiesPage
 	static class AddEditSchemaDialog
 			extends TitleAreaDialog {
 		
-		private Schema currentSchema;
+		private final ResourceManager resourceManager;
+		
+		private final Schema currentSchema;
 		
 		private String defaultMessage;
 		
@@ -724,11 +725,12 @@ public class JaxbSchemasPropertiesPage
 		
 		private final Mode mode;
 		
-		private Iterable<Schema> allSchemas;
+		private final Iterable<Schema> allSchemas;
 		
 		
-		public AddEditSchemaDialog(Shell shell, Schema currentSchema, Iterable<Schema> allSchemas) {
+		public AddEditSchemaDialog(Shell shell, Schema currentSchema, Iterable<Schema> allSchemas, ResourceManager resourceManager) {
 			super(shell);
+			this.resourceManager = resourceManager;
 			this.currentSchema = currentSchema;
 			this.allSchemas = allSchemas;
 			this.location = new SimplePropertyValueModel<String>();
@@ -840,7 +842,7 @@ public class JaxbSchemasPropertiesPage
 		}
 		
 		private void browseForSchemaLocation() {
-			SchemaLocationDialog dialog = new SchemaLocationDialog(getShell());
+			SchemaLocationDialog dialog = new SchemaLocationDialog(getShell(), this.resourceManager);
 			
 			// opens the dialog - just returns if the user cancels it
 			if (dialog.open() == Window.CANCEL) {
@@ -918,13 +920,16 @@ public class JaxbSchemasPropertiesPage
 	static class SchemaLocationDialog
 			extends TrayDialog {
 		
+		private final ResourceManager resourceManager;
+
 		private SelectFileOrXMLCatalogIdPanel locationPanel;
 		
 		private String location;
 		
 		
-		public SchemaLocationDialog(Shell shell) {
+		public SchemaLocationDialog(Shell shell, ResourceManager resourceManager) {
 			super(shell);
+			this.resourceManager = resourceManager;
 		}
 		
 		
@@ -938,7 +943,7 @@ public class JaxbSchemasPropertiesPage
 		protected Control createDialogArea(Composite parent) {
 			Composite composite = (Composite) super.createDialogArea(parent);
 			
-			this.locationPanel = new SelectFileOrXMLCatalogIdPanel(composite, StructuredSelection.EMPTY);
+			this.locationPanel = new SelectFileOrXMLCatalogIdPanel(composite, StructuredSelection.EMPTY, this.resourceManager);
 			this.locationPanel.setFilterExtensions(new String[] {".xsd"}); //$NON-NLS-1$
 			this.locationPanel.update();
 			this.locationPanel.setVisibleHelper(true);
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/classesgen/ClassesGeneratorWizard.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/classesgen/ClassesGeneratorWizard.java
index 6bfdc368ab..11a23559c4 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/classesgen/ClassesGeneratorWizard.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/classesgen/ClassesGeneratorWizard.java
@@ -23,6 +23,9 @@ import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.resource.LocalResourceManager;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.jface.wizard.WizardPage;
@@ -35,7 +38,7 @@ import org.eclipse.jpt.jaxb.core.SchemaLibrary;
 import org.eclipse.jpt.jaxb.core.internal.gen.ClassesGeneratorExtensionOptions;
 import org.eclipse.jpt.jaxb.core.internal.gen.ClassesGeneratorOptions;
 import org.eclipse.jpt.jaxb.core.xsd.XsdUtil;
-import org.eclipse.jpt.jaxb.ui.internal.JptJaxbUiIcons;
+import org.eclipse.jpt.jaxb.ui.JptJaxbUiImages;
 import org.eclipse.jpt.jaxb.ui.internal.JptJaxbUiMessages;
 import org.eclipse.jpt.jaxb.ui.internal.gen.GenerateJaxbClassesJob;
 import org.eclipse.jpt.jaxb.ui.internal.plugin.JptJaxbUiPlugin;
@@ -56,6 +59,7 @@ public class ClassesGeneratorWizard
 
 	private IJavaProject javaProject;
 	private IFile preselectedXsdFile;
+	private ResourceManager resourceManager;
 	protected IStructuredSelection selection;
 	
 	private String destinationFolder;
@@ -93,11 +97,12 @@ public class ClassesGeneratorWizard
 	
 	// ********** IWorkbenchWizard implementation  **********
 	
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		this.selection = selection;
+	public void init(IWorkbench workbench, IStructuredSelection sel) {
+		this.resourceManager = new LocalResourceManager(JFaceResources.getResources(workbench.getDisplay()));
+		this.selection = sel;
 		
 		this.setWindowTitle(JptJaxbUiMessages.ClassesGeneratorWizard_title);
-		this.setDefaultPageImageDescriptor(JptJaxbUiPlugin.instance().buildImageDescriptor(JptJaxbUiIcons.CLASSES_GEN_WIZ_BANNER));
+		this.setDefaultPageImageDescriptor(JptJaxbUiImages.CLASSES_GEN_BANNER);
 		this.setNeedsProgressMonitor(true);
 	}
 	
@@ -123,7 +128,7 @@ public class ClassesGeneratorWizard
 		}
 		
 		if (this.preselectedXsdFile == null) {
-			this.schemaWizardPage = new SchemaWizardPage(this.selection);
+			this.schemaWizardPage = new SchemaWizardPage(this.selection, this.resourceManager);
 			this.addPage(this.schemaWizardPage);
 		}
 		
@@ -265,7 +270,7 @@ public class ClassesGeneratorWizard
     }
 	
     private ClassesGeneratorWizardPage buildClassesGeneratorPage() {
-		return new ClassesGeneratorWizardPage();
+		return new ClassesGeneratorWizardPage(this.resourceManager);
 	}
 	
 	private ClassesGeneratorOptionsWizardPage buildClassesGeneratorOptionsPage() {
@@ -411,6 +416,12 @@ public class ClassesGeneratorWizard
 				message
 			);
 	}
+
+	@Override
+	public void dispose() {
+		this.resourceManager.dispose();
+		super.dispose();
+	}
 	
 	static class OverwriteConfirmerDialog extends OptionalMessageDialog {
 
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/classesgen/ClassesGeneratorWizardPage.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/classesgen/ClassesGeneratorWizardPage.java
index 7dd337f84e..5a985c6228 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/classesgen/ClassesGeneratorWizardPage.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/classesgen/ClassesGeneratorWizardPage.java
@@ -36,6 +36,8 @@ import org.eclipse.jdt.ui.StandardJavaElementContentProvider;
 import org.eclipse.jdt.ui.wizards.NewTypeWizardPage;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.TrayDialog;
+import org.eclipse.jface.resource.LocalResourceManager;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jface.viewers.ColumnWeightData;
 import org.eclipse.jface.viewers.IBaseLabelProvider;
 import org.eclipse.jface.viewers.IContentProvider;
@@ -90,8 +92,9 @@ public class ClassesGeneratorWizardPage extends NewTypeWizardPage {
 	static public final String[] bindingdFilesFilterExtensions = {".xjb",".xml",".xbd"}; //$NON-NLS-1$
 	public static final String ECLIPSELINK_PLATFORM_GROUP_ID = "eclipselink";   //$NON-NLS-1$
 
-	public static final String HELP_CONTEXT_ID = "org.eclipse.jpt.ui.configure_jaxb_class_generation_dialog"; //$NON-NLS-1$
+	public static final String HELP_CONTEXT_ID = "org.eclipse.jpt.jaxb.ui.configure_jaxb_class_generation_dialog"; //$NON-NLS-1$
 
+	final ResourceManager resourceManager;
 	private SettingsGroup settingsGroup;
 	
 	private String targetFolder;
@@ -102,9 +105,10 @@ public class ClassesGeneratorWizardPage extends NewTypeWizardPage {
 
 	// ********** constructor **********
 	
-	public ClassesGeneratorWizardPage() {
+	public ClassesGeneratorWizardPage(ResourceManager resourceManager) {
 		super(true, "Classes Generator"); //$NON-NLS-1$
 
+		this.resourceManager = resourceManager;
 		this.setDescription(JptJaxbUiMessages.ClassesGeneratorWizardPage_desc);
 	}
 
@@ -495,6 +499,7 @@ public class ClassesGeneratorWizardPage extends NewTypeWizardPage {
 		this.setMessage(message, WARNING);
 	}
 
+
 	// ********** inner class **********
 	
 	// ********** SettingsGroup class **********
@@ -796,7 +801,7 @@ public class ClassesGeneratorWizardPage extends NewTypeWizardPage {
 		protected Control createDialogArea(Composite parent) {
 			Composite composite = (Composite) super.createDialogArea(parent);
 			
-			this.locationPanel = new SelectFileOrXMLCatalogIdPanel(composite, StructuredSelection.EMPTY);
+			this.locationPanel = new SelectFileOrXMLCatalogIdPanel(composite, StructuredSelection.EMPTY, resourceManager);
 			this.locationPanel.setFilterExtensions(bindingdFilesFilterExtensions);
 			this.locationPanel.update();
 			this.locationPanel.setVisibleHelper(true);
@@ -822,4 +827,4 @@ public class ClassesGeneratorWizardPage extends NewTypeWizardPage {
 			return this.location;
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/classesgen/SchemaWizardPage.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/classesgen/SchemaWizardPage.java
index cb1a1d6c0a..36f4a33724 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/classesgen/SchemaWizardPage.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/classesgen/SchemaWizardPage.java
@@ -16,6 +16,7 @@ import org.eclipse.emf.common.CommonPlugin;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.wizard.IWizardPage;
@@ -37,6 +38,7 @@ public class SchemaWizardPage
 	protected static final String[] browseXSDFilterExtensions = {".xsd"}; //$NON-NLS-1$
 	
 	private final IStructuredSelection initialSelection;
+	private final ResourceManager resourceManager;
 	private IProject targetProject;
 	
 	protected SelectFileOrXMLCatalogIdPanel selectSourcePanel;
@@ -60,10 +62,11 @@ public class SchemaWizardPage
     
 	// ********** constructor **********
     
-	SchemaWizardPage(IStructuredSelection selection) {
+	SchemaWizardPage(IStructuredSelection selection, ResourceManager resourceManager) {
 		super("SchemaWizardPage"); //$NON-NLS-1$
 		
 		this.initialSelection = selection;
+		this.resourceManager = resourceManager;
 	}
 	
 	
@@ -76,7 +79,7 @@ public class SchemaWizardPage
 		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
 		this.setControl(composite);
 		
-		this.selectSourcePanel = new SelectFileOrXMLCatalogIdPanel(composite, this.initialSelection);
+		this.selectSourcePanel = new SelectFileOrXMLCatalogIdPanel(composite, this.initialSelection, this.resourceManager);
 		this.selectSourcePanel.setLayoutData(new GridData(GridData.FILL_BOTH));
 		
 		SelectFileOrXMLCatalogIdPanel.PanelListener listener = new SelectFileOrXMLCatalogIdPanel.PanelListener() {
@@ -207,7 +210,7 @@ public class SchemaWizardPage
 		return errorMessage;
 	}
 	
-	private void selectFileOrXMLCatalogIdPanelChanged() {
+	void selectFileOrXMLCatalogIdPanelChanged() {
 		String errorMessage = this.computeErrorMessage();
 		this.setErrorMessage(errorMessage);
 		this.setPageComplete(this.isPageComplete());
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/classesgen/SelectFileOrXMLCatalogIdPanel.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/classesgen/SelectFileOrXMLCatalogIdPanel.java
index c2e8fd787b..18c5de8042 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/classesgen/SelectFileOrXMLCatalogIdPanel.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/classesgen/SelectFileOrXMLCatalogIdPanel.java
@@ -13,12 +13,12 @@ package org.eclipse.jpt.jaxb.ui.internal.wizards.classesgen;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jpt.jaxb.ui.internal.JptJaxbUiMessages;
-import org.eclipse.jpt.jaxb.ui.internal.plugin.JptJaxbUiPlugin;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
@@ -48,7 +48,7 @@ public class SelectFileOrXMLCatalogIdPanel extends Composite implements Selectio
 
 	// ********** constructor **********
 
-	public SelectFileOrXMLCatalogIdPanel(Composite parent, IStructuredSelection selection) {
+	public SelectFileOrXMLCatalogIdPanel(Composite parent, IStructuredSelection selection, ResourceManager resourceManager) {
 		super(parent, SWT.NONE);
 
 		// container group
@@ -78,7 +78,7 @@ public class SelectFileOrXMLCatalogIdPanel extends Composite implements Selectio
 		
 		// Catalog
 		ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
-		selectXMLCatalogIdPanel = new SelectXMLCatalogIdPanel(pageBook, xmlCatalog);
+		selectXMLCatalogIdPanel = new SelectXMLCatalogIdPanel(pageBook, xmlCatalog, resourceManager);
 		selectXMLCatalogIdPanel.getTableViewer().addSelectionChangedListener(new ISelectionChangedListener() {
 			public void selectionChanged(SelectionChangedEvent event) {
 				updateCompletionStateChange();
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/classesgen/SelectXMLCatalogIdPanel.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/classesgen/SelectXMLCatalogIdPanel.java
index 4e6f9da052..8ef27ff129 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/classesgen/SelectXMLCatalogIdPanel.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/classesgen/SelectXMLCatalogIdPanel.java
@@ -14,10 +14,10 @@ package org.eclipse.jpt.jaxb.ui.internal.wizards.classesgen;
 import java.util.Collection;
 import java.util.List;
 import java.util.Vector;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jpt.jaxb.ui.internal.JptJaxbUiMessages;
-import org.eclipse.jpt.jaxb.ui.internal.plugin.JptJaxbUiPlugin;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -36,7 +36,7 @@ public class SelectXMLCatalogIdPanel extends Composite {
 	protected XMLCatalogTableViewer tableViewer;
 	protected ICatalog fXmlCatalog;
 
-	public SelectXMLCatalogIdPanel(Composite parent, ICatalog xmlCatalog) {
+	public SelectXMLCatalogIdPanel(Composite parent, ICatalog xmlCatalog, ResourceManager resourceManager) {
 		super(parent, SWT.NONE);
 		this.fXmlCatalog = xmlCatalog;
 
@@ -50,17 +50,17 @@ public class SelectXMLCatalogIdPanel extends Composite {
 		Label label = new Label(this, SWT.NONE);
 		label.setText(JptJaxbUiMessages.SchemaWizardPage_xmlCatalogTableTitle);
 
-		tableViewer = createTableViewer(this);
+		tableViewer = createTableViewer(this, resourceManager);
 		tableViewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 		tableViewer.setInput("dummy"); //$NON-NLS-1$
 	}
 
-	protected XMLCatalogTableViewer createTableViewer(Composite parent) {
+	protected XMLCatalogTableViewer createTableViewer(Composite parent, ResourceManager resourceManager) {
 		String headings[] = new String[2];
 		headings[0] = JptJaxbUiMessages.SchemaWizardPage_xmlCatalogKeyColumn;
 		headings[1] = JptJaxbUiMessages.SchemaWizardPage_xmlCatalogUriColumn;
 
-		XMLCatalogTableViewer theTableViewer = new XMLCatalogTableViewer(parent, headings) {
+		XMLCatalogTableViewer theTableViewer = new XMLCatalogTableViewer(parent, headings, resourceManager) {
 
 			protected void addXMLCatalogEntries(List list, ICatalogEntry[] entries) {
 				for (int i = 0; i < entries.length; i++) {
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/classesgen/XMLCatalogTableViewer.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/classesgen/XMLCatalogTableViewer.java
index 5ba8b02336..af7914b23c 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/classesgen/XMLCatalogTableViewer.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/classesgen/XMLCatalogTableViewer.java
@@ -14,40 +14,37 @@ package org.eclipse.jpt.jaxb.ui.internal.wizards.classesgen;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Comparator;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.IBaseLabelProvider;
+import org.eclipse.jface.viewers.IDecoration;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.TableLayout;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jpt.jaxb.ui.internal.plugin.JptJaxbUiPlugin;
+import org.eclipse.jpt.common.ui.JptCommonUiImages;
+import org.eclipse.jpt.common.ui.internal.jface.OverlayImageDescriptor;
+import org.eclipse.jpt.common.ui.internal.jface.PluggableTextTableLabelProvider;
+import org.eclipse.jpt.common.ui.internal.jface.ResourceManagerTableLabelProvider;
+import org.eclipse.jpt.common.utility.internal.ObjectTools;
+import org.eclipse.jpt.jaxb.ui.JptJaxbUiImages;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
 import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-
 import com.ibm.icu.text.Collator;
 
-public class XMLCatalogTableViewer extends TableViewer {
-
+public abstract class XMLCatalogTableViewer
+	extends TableViewer
+{
 	protected static String ERROR_STATE_KEY = "errorstatekey"; //$NON-NLS-1$
 
-	protected static Image dtdFileImage = JptJaxbUiPlugin.instance().getImage("full/obj16/dtdfile"); //$NON-NLS-1$
-	protected static Image unknownFileImage = JptJaxbUiPlugin.instance().getImage("full/obj16/text"); //$NON-NLS-1$
-	protected static Image xsdFileImage = JptJaxbUiPlugin.instance().getImage("full/obj16/XSDFile"); //$NON-NLS-1$
-	protected static Image errorImage = JptJaxbUiPlugin.instance().getImage("full/ovr16/error_ovr"); //$NON-NLS-1$
 
-	// ********** constructor **********
-
-	public XMLCatalogTableViewer(Composite parent, String[] columnProperties) {
+	protected XMLCatalogTableViewer(Composite parent, String[] columnProperties, ResourceManager resourceManager) {
 		super(parent, SWT.FULL_SELECTION);
 
 		Table table = getTable();
@@ -68,34 +65,30 @@ public class XMLCatalogTableViewer extends TableViewer {
 		setColumnProperties(columnProperties);
 
 		setContentProvider(new CatalogEntryContentProvider());
-		setLabelProvider(new CatalogEntryLabelProvider());
+		setLabelProvider(this.buildLabelProvider(resourceManager));
 	}
 
-	public Collection getXMLCatalogEntries() {
-		return null;
+	protected IBaseLabelProvider buildLabelProvider(ResourceManager resourceManager) {
+		return new ResourceManagerTableLabelProvider<Object>(
+				CATALOG_ENTRY_LABEL_IMAGE_DESCRIPTOR_TRANSFORMER,
+				CATALOG_ENTRY_LABEL_TEXT_TRANSFORMER,
+				resourceManager
+			);
 	}
 
-	public void menuAboutToShow(IMenuManager menuManager) {
-		Action action = new Action("hello") { //$NON-NLS-1$
-			public void run() {
-				System.out.println("run!"); //$NON-NLS-1$
-			}
-		};
-		menuManager.add(action);
-	}
+	protected abstract Collection getXMLCatalogEntries();
 
 	public void setFilterExtensions(String[] extensions) {
 		resetFilters();
 		addFilter(new XMLCatalogTableViewerFilter(extensions));
 	}
 
-	// ********** inner class **********
-
-	public class CatalogEntryContentProvider implements IStructuredContentProvider {
 
-		public void dispose() {
-		}
+	// ********** content provider **********
 
+	public class CatalogEntryContentProvider
+		implements IStructuredContentProvider
+	{
 		public Object[] getElements(Object element) {
 			Object[] array = getXMLCatalogEntries().toArray();
 			Comparator comparator = new Comparator() {
@@ -114,56 +107,80 @@ public class XMLCatalogTableViewer extends TableViewer {
 		}
 
 		public void inputChanged(Viewer viewer, Object old, Object newobj) {
+			// NOP
 		}
 
 		public boolean isDeleted(Object object) {
 			return false;
 		}
+
+		public void dispose() {
+			// NOP
+		}
 	}
 
-	public class CatalogEntryLabelProvider extends LabelProvider implements ITableLabelProvider {
-
-		public Image getColumnImage(Object object, int columnIndex) {
-			Image result = null;
-			if (columnIndex == 0) {
-				Image base = null;
-				if (object instanceof ICatalogEntry) {
-					ICatalogEntry catalogEntry = (ICatalogEntry) object;
-					String uri = catalogEntry.getURI();
-					if (uri.endsWith("dtd")) { //$NON-NLS-1$
-						base = dtdFileImage;
-					}
-					else if (uri.endsWith("xsd")) { //$NON-NLS-1$
-						base = xsdFileImage;
-					}
-					else {
-						base = unknownFileImage;
-					}
 
-					if (base != null) {
-						if (URIHelper.isReadableURI(uri, false)) {
-							result = base;
-						}
-						else {
-							// TODO... SSE port
-							result = base;// imageFactory.createCompositeImage(base,
-							// errorImage,
-							// ImageFactory.BOTTOM_LEFT);
-						}
-					}
-				}
+	// ********** label provider **********
+
+	protected static final PluggableTextTableLabelProvider.TextTransformer<Object> CATALOG_ENTRY_LABEL_TEXT_TRANSFORMER = new CatalogEntryLabelTextTransformer();
+	protected static class CatalogEntryLabelTextTransformer
+		implements PluggableTextTableLabelProvider.TextTransformer<Object>
+	{
+		public String transform(Object element, int columnIndex) {
+			return (element instanceof ICatalogEntry) ? this.transform((ICatalogEntry) element, columnIndex) : null;
+		}
+
+		protected String transform(ICatalogEntry catalogEntry, int columnIndex) {
+			return (columnIndex == 0) ?
+					catalogEntry.getKey() :
+					URIHelper.removePlatformResourceProtocol(catalogEntry.getURI());
+		}
+
+		@Override
+		public String toString() {
+			return ObjectTools.toString(this);
+		}
+	}
+
+	protected static final ResourceManagerTableLabelProvider.ImageDescriptorTransformer<Object> CATALOG_ENTRY_LABEL_IMAGE_DESCRIPTOR_TRANSFORMER = new CatalogEntryLabelImageDescriptorTransformer();
+	protected static class CatalogEntryLabelImageDescriptorTransformer
+		implements ResourceManagerTableLabelProvider.ImageDescriptorTransformer<Object>
+	{
+		public ImageDescriptor transform(Object element, int columnIndex) {
+			return (element instanceof ICatalogEntry) ? this.transform((ICatalogEntry) element, columnIndex) : null;
+		}
+
+		protected ImageDescriptor transform(ICatalogEntry catalogEntry, int columnIndex) {
+			return (columnIndex == 0) ? this.transform(catalogEntry) : null;
+		}
+
+		protected ImageDescriptor transform(ICatalogEntry catalogEntry) {
+			String uri = catalogEntry.getURI();
+			if (uri == null) {
+				return null;
 			}
-			return result;
+			ImageDescriptor base = this.getBaseColumnImageDescriptor(uri);
+			return URIHelper.isReadableURI(uri, false) ? base : this.buildErrorImageDescriptor(base);
 		}
 
-		public String getColumnText(Object object, int columnIndex) {
-			String result = null;
-			if (object instanceof ICatalogEntry) {
-				ICatalogEntry catalogEntry = (ICatalogEntry) object;
-				result = columnIndex == 0 ? catalogEntry.getKey() : catalogEntry.getURI();
-				result = URIHelper.removePlatformResourceProtocol(result);
+		protected ImageDescriptor getBaseColumnImageDescriptor(String uri) {
+			uri = uri.toLowerCase();
+			if (uri.endsWith("dtd")) { //$NON-NLS-1$
+				return JptJaxbUiImages.DTD_FILE;
+			}
+			if (uri.endsWith("xsd")) { //$NON-NLS-1$
+				return JptJaxbUiImages.XSD_FILE;
 			}
-			return result != null ? result : ""; //$NON-NLS-1$
+			return JptCommonUiImages.FILE;
+		}
+
+		protected ImageDescriptor buildErrorImageDescriptor(ImageDescriptor imageDescriptor) {
+			return new OverlayImageDescriptor(imageDescriptor, JptCommonUiImages.ERROR_OVERLAY, IDecoration.BOTTOM_LEFT);
+		}
+
+		@Override
+		public String toString() {
+			return ObjectTools.toString(this);
 		}
 	}
 
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/facet/JaxbFacetPage.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/facet/JaxbFacetPage.java
index 013696b8ad..aec31a9dab 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/facet/JaxbFacetPage.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/facet/JaxbFacetPage.java
@@ -13,9 +13,8 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jpt.jaxb.core.internal.facet.JaxbFacetDataModelProperties;
-import org.eclipse.jpt.jaxb.ui.internal.JptJaxbUiIcons;
+import org.eclipse.jpt.jaxb.ui.JptJaxbUiImages;
 import org.eclipse.jpt.jaxb.ui.internal.JptJaxbUiMessages;
-import org.eclipse.jpt.jaxb.ui.internal.plugin.JptJaxbUiPlugin;
 import org.eclipse.jst.common.project.facet.core.libprov.LibraryInstallDelegate;
 import org.eclipse.jst.common.project.facet.ui.libprov.LibraryProviderFrameworkUi;
 import org.eclipse.swt.SWT;
@@ -39,7 +38,7 @@ public abstract class JaxbFacetPage
 		super(pageName);
 		setTitle(JptJaxbUiMessages.JaxbFacetWizardPage_title);
 		setDescription(JptJaxbUiMessages.JaxbFacetWizardPage_desc);
-		setImageDescriptor(JptJaxbUiPlugin.instance().buildImageDescriptor(JptJaxbUiIcons.JAXB_WIZ_BANNER));
+		setImageDescriptor(JptJaxbUiImages.JAXB_PROJECT_BANNER);
 	}
 	
 	
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/proj/JaxbProjectWizard.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/proj/JaxbProjectWizard.java
index 49dce38650..4a032e43e6 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/proj/JaxbProjectWizard.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/proj/JaxbProjectWizard.java
@@ -11,9 +11,8 @@ package org.eclipse.jpt.jaxb.ui.internal.wizards.proj;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jpt.jaxb.ui.internal.JptJaxbUiIcons;
+import org.eclipse.jpt.jaxb.ui.JptJaxbUiImages;
 import org.eclipse.jpt.jaxb.ui.internal.JptJaxbUiMessages;
-import org.eclipse.jpt.jaxb.ui.internal.plugin.JptJaxbUiPlugin;
 import org.eclipse.jpt.jaxb.ui.internal.wizards.proj.model.JaxbProjectCreationDataModelProvider;
 import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
@@ -38,7 +37,7 @@ public class JaxbProjectWizard
 	
 	@Override
 	protected ImageDescriptor getDefaultPageImageDescriptor() {
-		return JptJaxbUiPlugin.instance().buildImageDescriptor(JptJaxbUiIcons.JAXB_WIZ_BANNER);
+		return JptJaxbUiImages.JAXB_PROJECT_BANNER;
 	}
 	
 	@Override
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/schemagen/SchemaGeneratorWizard.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/schemagen/SchemaGeneratorWizard.java
index 4344e0e10b..b6e3d54c8a 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/schemagen/SchemaGeneratorWizard.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/schemagen/SchemaGeneratorWizard.java
@@ -35,7 +35,7 @@ import org.eclipse.jpt.common.utility.internal.StringTools;
 import org.eclipse.jpt.common.utility.internal.io.FileTools;
 import org.eclipse.jpt.jaxb.core.internal.gen.SchemaGenerator;
 import org.eclipse.jpt.jaxb.core.internal.operations.SchemaFileCreationDataModelProvider;
-import org.eclipse.jpt.jaxb.ui.internal.JptJaxbUiIcons;
+import org.eclipse.jpt.jaxb.ui.JptJaxbUiImages;
 import org.eclipse.jpt.jaxb.ui.internal.JptJaxbUiMessages;
 import org.eclipse.jpt.jaxb.ui.internal.plugin.JptJaxbUiPlugin;
 import org.eclipse.osgi.util.NLS;
@@ -66,7 +66,7 @@ public class SchemaGeneratorWizard extends Wizard implements INewWizard
 	public SchemaGeneratorWizard() {
 		super();
 		setWindowTitle(JptJaxbUiMessages.SchemaGeneratorWizard_title);
-		setDefaultPageImageDescriptor(JptJaxbUiPlugin.instance().buildImageDescriptor(JptJaxbUiIcons.SCHEMA_GEN_WIZ_BANNER));
+		setDefaultPageImageDescriptor(JptJaxbUiImages.SCHEMA_GEN_BANNER);
 	}
 	
 	public void init(IWorkbench workbench, IStructuredSelection selection) {
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/schemagen/SchemaGeneratorWizardPage.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/schemagen/SchemaGeneratorWizardPage.java
index 70aa054611..1c26bf0a18 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/schemagen/SchemaGeneratorWizardPage.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/wizards/schemagen/SchemaGeneratorWizardPage.java
@@ -68,7 +68,7 @@ public class SchemaGeneratorWizardPage extends AbstractJarDestinationWizardPage
 	private static final int SIZING_SELECTION_WIDGET_WIDTH = 480;
 	private static final int SIZING_SELECTION_WIDGET_HEIGHT = 150;
 
-	public static final String HELP_CONTEXT_ID = "org.eclipse.jpt.ui.wizard_jaxbschema_classes"; //$NON-NLS-1$
+	public static final String HELP_CONTEXT_ID = "org.eclipse.jpt.jaxb.ui.wizard_jaxbschema_classes"; //$NON-NLS-1$
 	
 	// ********** constructor **********
 
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/create_entity.xml b/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/create_entity.xml
index fd91891cfc..9c0b3f9816 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/create_entity.xml
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/create_entity.xml
@@ -15,7 +15,7 @@ If not, select <b>File->New->Project...</b> and choose <b>JPA->JPA Project</b> i
       </description>
 	</item>
 	<item title="Open the JPA Development Perspective" skip="true" href="/org.eclipse.jpt.doc.user/ref_persistence_perspective.htm">
-		<action pluginId="org.eclipse.ui.cheatsheets" class="org.eclipse.ui.internal.cheatsheets.actions.OpenPerspective" param1="org.eclipse.jpt.ui.PersistencePerspective"/>
+		<action pluginId="org.eclipse.ui.cheatsheets" class="org.eclipse.ui.internal.cheatsheets.actions.OpenPerspective" param1="org.eclipse.jpt.ui.jpaPerspective"/>
 		<description>
 When working with JPA  persistence, you should use the Persistence perspective. If you already have the Persistence perspective active, you may skip this step by clicking the "Click to Skip" button. 
 If not, select <b>Window->Open Perspective->Other</b> in the menubar at the top of the workbench. In the Select Perspectives dialog, select <b>JPA Development</b> and click OK. This step changes the perspective to set up the Eclipse workbench for JPA development.
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/map_entity.xml b/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/map_entity.xml
index 63307f226e..2a7a877d24 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/map_entity.xml
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/cheatsheets/map_entity.xml
@@ -43,7 +43,7 @@ If you already have a JPA project, you  may skip this step by clicking the &quot
 If not, select <b>Window-&gt;Open Perspective-&gt;Other</b> in the menubar at the top of the workbench. In the Select Perspectives dialog, select <b>JPA Development</b> and click OK. This step changes the perspective to set up the Eclipse workbench for JPA development.
 You can click the &quot;Click to Perform&quot; button to have the &quot;Persistence&quot; perspective opened automatically.
       </description>
-      <action class="org.eclipse.ui.internal.cheatsheets.actions.OpenPerspective" pluginId="org.eclipse.ui.cheatsheets" confirm="false" param1="org.eclipse.jpt.ui.PersistencePerspective">
+      <action class="org.eclipse.ui.internal.cheatsheets.actions.OpenPerspective" pluginId="org.eclipse.ui.cheatsheets" confirm="false" param1="org.eclipse.jpt.ui.jpaPerspective">
       </action>
    </item>
    <item title="Create a Java Class" dialog="false" skip="false">
diff --git a/jpa/plugins/org.eclipse.jpt.doc.user/plugin.xml b/jpa/plugins/org.eclipse.jpt.doc.user/plugin.xml
index 7efde27bf5..f8e58baced 100644
--- a/jpa/plugins/org.eclipse.jpt.doc.user/plugin.xml
+++ b/jpa/plugins/org.eclipse.jpt.doc.user/plugin.xml
@@ -1,37 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin name="JPA Documentation Plug-in" id="org.eclipse.jpt.doc.user" version="3.0.2" provider-name="Oracle">
-	<!-- =========== -->
-	<!-- Define TOC  -->
-	<!-- =========== -->
-	<extension point="org.eclipse.help.toc">
+<plugin>
+
+	<!-- ***** TOC ***** -->
+	<extension
+		point="org.eclipse.help.toc">
 		<toc file="toc.xml" primary="true"/>
 	</extension>
-	<!-- =========== -->
-	<!-- Define F1   -->
-	<!-- =========== -->
-	<extension point="org.eclipse.help.contexts">
+
+	<!-- ***** F1 ***** -->
+	<extension
+		point="org.eclipse.help.contexts">
 		<contexts file="contexts.xml" plugin="org.eclipse.jpt.jpa.ui"/>
 	</extension>
-	<!-- ==================== -->
-	<!-- Define Keyword Index -->
-	<!-- ==================== -->
-	<extension point="org.eclipse.help.index">
+
+	<!-- ***** Keyword Index ***** -->
+	<extension
+		point="org.eclipse.help.index">
 		<index file="index.xml"/>
 	</extension>
-	<!-- =========== -->
-	<!-- Cheatsheets -->
-	<!-- =========== -->
-	<extension point="org.eclipse.ui.cheatsheets.cheatSheetContent">
-		<category name="JPA Development" id="com.jpa.category"/>
-		<cheatsheet name="Create a JPA Project" category="com.jpa.category" contentFile="$nl$/cheatsheets/add_persistence.xml" id="org.eclipse.jpa.cheatsheet.createproject1">
+
+	<!-- ***** Cheatsheets ***** -->
+	<extension
+		point="org.eclipse.ui.cheatsheets.cheatSheetContent">
+
+		<category name="JPA Development"
+			id="org.eclipse.jpt.jpa.category"/>
+
+		<cheatsheet name="Create a JPA Project"
+			id="org.eclipse.jpt.jpa.cheatsheet.CreateJpaProject"
+			contentFile="$nl$/cheatsheets/add_persistence.xml"
+			category="org.eclipse.jpt.jpa.category">
 			<description>Learn how to create a JPA project.</description>
 		</cheatsheet>
-		<cheatsheet name="Create a Persistent Entity" category="com.jpa.category" contentFile="$nl$/cheatsheets/create_entity.xml" id="org.eclipse.jpa.cheatsheet.addentity">
+
+		<cheatsheet name="Create a Persistent Entity"
+			id="org.eclipse.jpt.jpa.cheatsheet.AddEntity"
+			contentFile="$nl$/cheatsheets/create_entity.xml"
+			category="org.eclipse.jpt.jpa.category">
 			<description>Learn how to add a persistent entity to a Java project.</description>
 		</cheatsheet>
-		<cheatsheet name="Map a Persistent Entity" category="com.jpa.category" contentFile="$nl$/cheatsheets/map_entity.xml" id="org.eclipse.jpa.cheatsheet.mapentity">
+
+		<cheatsheet name="Map a Persistent Entity"
+			id="org.eclipse.jpt.jpa.cheatsheet.MapEntity"
+			contentFile="$nl$/cheatsheets/map_entity.xml"
+			category="org.eclipse.jpt.jpa.category">
 			<description>Learn how to map a persistent entity to a database.</description>
 		</cheatsheet>
+
 	</extension>
+
 </plugin>
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkConvert.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkConvert.java
index e37f336d91..c8be861cbd 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkConvert.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkConvert.java
@@ -9,6 +9,8 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.context;
 
+import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter;
+import org.eclipse.jpt.common.utility.transformer.Transformer;
 import org.eclipse.jpt.jpa.core.context.Converter;
 import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit;
 
@@ -66,4 +68,19 @@ public interface EclipseLinkConvert
 	String[] RESERVED_CONVERTER_NAMES = {NO_CONVERTER, CLASS_INSTANCE_CONVERTER, SERIALIZED_CONVERTER};
 	
 	String DEFAULT_CONVERTER_NAME = NO_CONVERTER;
+
+	/**
+	 * A transformer that returns an {@link EclipseLinkConvert} if the passed
+	 * in {@link Converter} can be cast as such;
+	 * otherwise, it returns <code>null</code>.
+	 */
+	Transformer<Converter, EclipseLinkConvert> CONVERTER_TRANSFORMER = new ConverterTransformer();
+	class ConverterTransformer
+		extends TransformerAdapter<Converter, EclipseLinkConvert>
+	{
+		@Override
+		public EclipseLinkConvert transform(Converter converter) {
+			return (converter.getType() == EclipseLinkConvert.class) ? (EclipseLinkConvert) converter : null;
+		}
+	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/plugin.xml b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/plugin.xml
index eb3ec9117a..8a73d10f45 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/plugin.xml
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/plugin.xml
@@ -69,10 +69,13 @@
 			name="%eclipseLinkWizardCategoryName"
 			parentCategory="org.eclipse.jpt.jpa"/>
 		
+<!-- bug 395126
+			icon="platform:/plugin/org.eclipse.jpt.jpa.ui/$nl$/images/buttons/new-jpa-file.gif"
+ -->
 		<wizard
             id="org.eclipse.jpt.jpa.eclipselink.ui.wizard.newEclipseLinkMappingFile"
 			name="%newEclipseLinkMappingFileWizardName"
-			icon="platform:/plugin/org.eclipse.jpt.jpa.ui/icons/full/etool16/new_jpa_file_wiz.gif"
+			icon="platform:/plugin/org.eclipse.jpt.jpa.ui/images/buttons/new-jpa-file.gif"
 			category="org.eclipse.jpt.jpa/org.eclipse.jpt.jpa.eclipselink">
 			<description>%newEclipseLinkJpaMappingFileWizardDesc</description>
 			<class class="org.eclipse.jpt.jpa.eclipselink.ui.internal.wizards.EclipseLinkMappingFileWizard"> 
@@ -82,20 +85,26 @@
 			</class> 
 		</wizard>
 		
+<!-- bug 395126
+			icon="platform:/plugin/org.eclipse.jpt.jpa.ui/$nl$/images/buttons/new-jpa-file.gif"
+ -->
 		<wizard
 			category="org.eclipse.jpt.jpa/org.eclipse.jpt.jpa.eclipselink"
 			class="org.eclipse.jpt.jpa.eclipselink.ui.internal.wizards.gen.GenerateDynamicEntitiesFromSchemaWizard"
-			icon="platform:/plugin/org.eclipse.jpt.jpa.ui/icons/full/etool16/new_jpa_file_wiz.gif"
+			icon="platform:/plugin/org.eclipse.jpt.jpa.ui/images/buttons/new-jpa-file.gif"
 			id="org.eclipse.jpt.jpa.eclipselink.ui.wizard.newDynamicEntitiesFromTables"
 			name="%newDynamicEntityFromTableWizardName">
 			<description>%newDynamicEntityFromTableWizardDesc</description>
 			<selection class="org.eclipse.core.resources.IResource"/> 
         </wizard>		
 
+<!-- bug 395126
+			icon="platform:/plugin/org.eclipse.jpt.jpa.ui/$nl$/images/buttons/new-entity.gif"
+ -->
         <wizard
             id="org.eclipse.jpt.jpa.eclipselink.ui.wizard.newEclipseLinkDynamicEntity"
 			name="%newEclipseLinkDynamicEntityName"
-			icon="platform:/plugin/org.eclipse.jpt.jpa.ui/icons/full/etool16/new_entity_wiz.gif"
+			icon="platform:/plugin/org.eclipse.jpt.jpa.ui/images/buttons/new-entity.gif"
 			category="org.eclipse.jpt.jpa/org.eclipse.jpt.jpa.eclipselink">
 			<description>%newEclipseLinkDynamicEntityWizardDesc</description>
 			<class class="org.eclipse.jpt.jpa.eclipselink.ui.internal.wizards.EclipseLinkDynamicEntityWizard"> 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLink2_4ProjectFlagModel.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLink2_4ProjectFlagModel.java
index 73c5624d43..c2a01a12bf 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLink2_4ProjectFlagModel.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLink2_4ProjectFlagModel.java
@@ -21,13 +21,13 @@ import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaPlatformFacto
 public class EclipseLink2_4ProjectFlagModel<T extends JpaNode>
 	extends TransformationPropertyValueModel<T, Boolean>
 {
-	public EclipseLink2_4ProjectFlagModel(PropertyValueModel<T> jpaProjectModel) { 
+	public EclipseLink2_4ProjectFlagModel(PropertyValueModel<? extends T> jpaProjectModel) { 
 		super(jpaProjectModel);
 	}
 
 	@Override
-	protected Boolean transform_(T value) {
-		EclipseLinkJpaPlatformVersion jpaVersion = (EclipseLinkJpaPlatformVersion) value.getJpaPlatform().getJpaVersion();
+	protected Boolean transform_(T jpaModel) {
+		EclipseLinkJpaPlatformVersion jpaVersion = (EclipseLinkJpaPlatformVersion) jpaModel.getJpaPlatform().getJpaVersion();
 		return Boolean.valueOf(jpaVersion.isCompatibleWithEclipseLinkVersion(EclipseLink2_4JpaPlatformFactory.VERSION));
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkArrayMapping2_3Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkArrayMapping2_3Composite.java
index 330ebfc3f6..e62ce588b2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkArrayMapping2_3Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkArrayMapping2_3Composite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2012 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -16,19 +17,21 @@ import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkArrayMapping2_3;
 import org.eclipse.jpt.jpa.ui.details.JpaComposite;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkArrayMapping2_3Composite extends Pane<EclipseLinkArrayMapping2_3>
-                                       implements JpaComposite
+public class EclipseLinkArrayMapping2_3Composite
+	extends Pane<EclipseLinkArrayMapping2_3>
+	implements JpaComposite
 {
-	public EclipseLinkArrayMapping2_3Composite(PropertyValueModel<? extends EclipseLinkArrayMapping2_3> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-	                                Composite parent,
-	                                WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public EclipseLinkArrayMapping2_3Composite(
+			PropertyValueModel<? extends EclipseLinkArrayMapping2_3> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
 	protected void initializeLayout(Composite container) {
-
+		// NOP
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkBasicCollectionMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkBasicCollectionMappingComposite.java
index 85aefe3587..1390c5650c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkBasicCollectionMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkBasicCollectionMappingComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -16,31 +17,21 @@ import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkBasicCollectionMa
 import org.eclipse.jpt.jpa.ui.details.JpaComposite;
 import org.eclipse.swt.widgets.Composite;
 
-/**
- *
- * @version 2.1
- * @since 2.1
- */
-public class EclipseLinkBasicCollectionMappingComposite extends Pane<EclipseLinkBasicCollectionMapping>
-                                       implements JpaComposite
+public class EclipseLinkBasicCollectionMappingComposite
+	extends Pane<EclipseLinkBasicCollectionMapping>
+	implements JpaComposite
 {
-	/**
-	 * Creates a new <code>EclipseLinkBasicCollectionMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>IManyToOneMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public EclipseLinkBasicCollectionMappingComposite(PropertyValueModel<? extends EclipseLinkBasicCollectionMapping> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-	                                WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public EclipseLinkBasicCollectionMappingComposite(
+			PropertyValueModel<? extends EclipseLinkBasicCollectionMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
 	protected void initializeLayout(Composite container) {
-
+		// NOP
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkBasicMapMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkBasicMapMappingComposite.java
index 86c4e89cd3..acc010a4d4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkBasicMapMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkBasicMapMappingComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -16,31 +17,21 @@ import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkBasicMapMapping;
 import org.eclipse.jpt.jpa.ui.details.JpaComposite;
 import org.eclipse.swt.widgets.Composite;
 
-/**
- *
- * @version 2.1
- * @since 2.1
- */
-public class EclipseLinkBasicMapMappingComposite extends Pane<EclipseLinkBasicMapMapping>
-                                       implements JpaComposite
+public class EclipseLinkBasicMapMappingComposite
+	extends Pane<EclipseLinkBasicMapMapping>
+	implements JpaComposite
 {
-	/**
-	 * Creates a new <code>EclipseLinkBasicCollectionMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>IManyToOneMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public EclipseLinkBasicMapMappingComposite(PropertyValueModel<? extends EclipseLinkBasicMapMapping> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-	                                WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public EclipseLinkBasicMapMappingComposite(
+			PropertyValueModel<? extends EclipseLinkBasicMapMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
 	protected void initializeLayout(Composite container) {
-
+		// NOP
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkBasicMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkBasicMappingComposite.java
index b87f40d26c..5f655e563e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkBasicMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkBasicMappingComposite.java
@@ -9,24 +9,23 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
-import org.eclipse.jpt.common.utility.internal.model.value.CompositeBooleanPropertyValueModel;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
+import org.eclipse.jpt.common.utility.internal.transformer.NotNullObjectTransformer;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
+import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter;
+import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
 import org.eclipse.jpt.jpa.core.context.BasicMapping;
 import org.eclipse.jpt.jpa.core.context.Converter;
-import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter;
 import org.eclipse.jpt.jpa.core.context.LobConverter;
-import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
 import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkBasicMapping;
 import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConvert;
 import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverterContainer;
 import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkMutable;
 import org.eclipse.jpt.jpa.ui.internal.details.AbstractBasicMappingComposite;
-import org.eclipse.jpt.jpa.ui.internal.details.ColumnComposite;
 import org.eclipse.jpt.jpa.ui.internal.details.EnumTypeComboViewer;
-import org.eclipse.jpt.jpa.ui.internal.details.FetchTypeComboViewer;
 import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages;
 import org.eclipse.jpt.jpa.ui.internal.details.TemporalTypeCombo;
 import org.eclipse.swt.layout.GridData;
@@ -39,73 +38,16 @@ import org.eclipse.ui.forms.events.ExpansionEvent;
 import org.eclipse.ui.forms.widgets.ExpandableComposite;
 import org.eclipse.ui.forms.widgets.Section;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | ColumnComposite                                                       | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | FetchTypeComposite                                                    | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | TemporalTypeComposite                                                 | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | EnumTypeComposite                                                     | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | OptionalComposite                                                     | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | MutableComposite                                                      | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | LobComposite                                                          | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see BasicMapping
- * @see ColumnComposite
- * @see EnumTypeComboViewer
- * @see FetchTypeComboViewer
- * @see LobComposite
- * @see OptionalComposite
- * @see TemporalTypeCombo
- *
- * @version 3.2
- * @since 2.1
- */
-public abstract class EclipseLinkBasicMappingComposite<T extends BasicMapping> extends AbstractBasicMappingComposite<T>
+public abstract class EclipseLinkBasicMappingComposite<T extends BasicMapping>
+	extends AbstractBasicMappingComposite<T>
 {
-	/**
-	 * Creates a new <code>BasicMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>IBasicMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	protected EclipseLinkBasicMappingComposite(PropertyValueModel<? extends T> subjectHolder,
-								 PropertyValueModel<Boolean> enabledModel,
-	                             Composite parent,
-	                             WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	protected EclipseLinkBasicMappingComposite(
+			PropertyValueModel<? extends T> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	
@@ -136,7 +78,7 @@ public abstract class EclipseLinkBasicMappingComposite<T extends BasicMapping> e
 			JptUiDetailsMessages.TypeSection_temporal, 
 			buildConverterBooleanHolder(BaseTemporalConverter.class), 
 			null);
-		registerSubPane(new TemporalTypeCombo(buildTemporalConverterHolder(converterHolder), getEnabledModel(), container, getWidgetFactory()));
+		new TemporalTypeCombo(this, buildTemporalConverterHolder(converterHolder), container);
 		
 		
 		// Enumerated
@@ -145,7 +87,7 @@ public abstract class EclipseLinkBasicMappingComposite<T extends BasicMapping> e
 			JptUiDetailsMessages.TypeSection_enumerated, 
 			buildConverterBooleanHolder(BaseEnumeratedConverter.class), 
 			null);
-		registerSubPane(new EnumTypeComboViewer(buildEnumeratedConverterHolder(converterHolder), getEnabledModel(), container, getWidgetFactory()));
+		new EnumTypeComboViewer(this, this.buildEnumeratedConverterHolder(converterHolder), container);
 
 		// EclipseLink Converter
 		Button elConverterButton = addRadioButton(
@@ -155,13 +97,13 @@ public abstract class EclipseLinkBasicMappingComposite<T extends BasicMapping> e
 			null);
 		((GridData) elConverterButton.getLayoutData()).horizontalSpan = 2;
 
-		PropertyValueModel<EclipseLinkConvert> convertHolder = buildEclipseLinkConverterHolder(converterHolder);
-		PropertyValueModel<Boolean> convertEnabledModel = CompositeBooleanPropertyValueModel.and(getEnabledModel(), buildEclipseLinkConvertBooleanHolder(convertHolder));
+		PropertyValueModel<EclipseLinkConvert> convertModel = this.buildEclipseLinkConvertModel(converterHolder);
+		PropertyValueModel<Boolean> convertEnabledModel = this.buildNonNullEclipseLinkConvertModel(convertModel);
 		Label convertLabel = this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkConvertComposite_converterNameLabel, convertEnabledModel);
 		GridData gridData = new GridData();
 		gridData.horizontalIndent = 20;
 		convertLabel.setLayoutData(gridData);
-		registerSubPane(new EclipseLinkConvertCombo(convertHolder, convertEnabledModel, container, getWidgetFactory()));
+		new EclipseLinkConvertCombo(this, convertModel, convertEnabledModel, container);
 
 		return container;
 	}
@@ -175,22 +117,12 @@ public abstract class EclipseLinkBasicMappingComposite<T extends BasicMapping> e
 		};
 	}
 	
-	protected PropertyValueModel<EclipseLinkConvert> buildEclipseLinkConverterHolder(PropertyValueModel<Converter> converterHolder) {
-		return new TransformationPropertyValueModel<Converter, EclipseLinkConvert>(converterHolder) {
-			@Override
-			protected EclipseLinkConvert transform_(Converter converter) {
-				return converter.getType() == EclipseLinkConvert.class ? (EclipseLinkConvert) converter : null;
-			}
-		};
+	protected PropertyValueModel<EclipseLinkConvert> buildEclipseLinkConvertModel(PropertyValueModel<Converter> converterModel) {
+		return new TransformationPropertyValueModel<Converter, EclipseLinkConvert>(converterModel, EclipseLinkConvert.CONVERTER_TRANSFORMER);
 	}
 
-	protected PropertyValueModel<Boolean> buildEclipseLinkConvertBooleanHolder(PropertyValueModel<EclipseLinkConvert> convertHolder) {
-		return new TransformationPropertyValueModel<EclipseLinkConvert, Boolean>(convertHolder) {
-			@Override
-			protected Boolean transform(EclipseLinkConvert value) {
-				return Boolean.valueOf(value != null);
-			}
-		};
+	protected PropertyValueModel<Boolean> buildNonNullEclipseLinkConvertModel(PropertyValueModel<EclipseLinkConvert> convertModel) {
+		return new TransformationPropertyValueModel<EclipseLinkConvert, Boolean>(convertModel, NotNullObjectTransformer.<EclipseLinkConvert>instance());
 	}
 
 	protected void initializeConvertersCollapsibleSection(Composite container) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConversionValueDialog.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConversionValueDialog.java
index 161e43cd98..d24b6d901e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConversionValueDialog.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConversionValueDialog.java
@@ -10,53 +10,59 @@
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details;
 
 import java.util.Set;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.internal.widgets.DialogPane;
 import org.eclipse.jpt.common.ui.internal.widgets.ValidatingDialog;
 import org.eclipse.jpt.common.utility.internal.collection.CollectionTools;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
+import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConversionValue;
 import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkObjectTypeConverter;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
-/**
- * Clients can use this dialog to prompt the user for SecondaryTable settings.
- * Use the following once the dialog is closed:
- *     @see #getSelectedTable()
- *     @see #getSelectedCatalog()
- *     @see #getSelectedSchema()
- * @version 2.1
- * @since 2.1
- */
-public class EclipseLinkConversionValueDialog extends ValidatingDialog<EclipseLinkConversionValueStateObject> {
-
+public class EclipseLinkConversionValueDialog
+	extends ValidatingDialog<EclipseLinkConversionValueStateObject>
+{
+	private final EclipseLinkObjectTypeConverter objectTypeConverter;
+	
 	/**
-	 * when creating a new EclipseLinkConversionValue, 'conversionValue' will be null
+	 * This will be <code>null</code> when creating a new conversion value.
 	 */
 	private final EclipseLinkConversionValue conversionValue;
 
-	private EclipseLinkObjectTypeConverter objectTypeConverter;
-	
-	// ********** constructors **********
 
 	/**
-	 * Use this constructor to create a new conversion value
+	 * Use this constructor to create a <em>new</em> conversion value.
 	 */
-	public EclipseLinkConversionValueDialog(Shell parent, EclipseLinkObjectTypeConverter objectTypeConverter) {
-		this(parent,objectTypeConverter, null);
+	public EclipseLinkConversionValueDialog(
+			Shell parentShell,
+			ResourceManager resourceManager,
+			EclipseLinkObjectTypeConverter objectTypeConverter) {
+		this(parentShell, resourceManager, objectTypeConverter, null);
 	}
 
 	/**
-	 * Use this constructor to edit an existing conversion value
+	 * Use this constructor to edit an <em>existing</em> conversion value.
 	 */
-	public EclipseLinkConversionValueDialog(Shell parent, EclipseLinkObjectTypeConverter objectTypeConverter, EclipseLinkConversionValue conversionValue) {
-		super(parent);
+	public EclipseLinkConversionValueDialog(
+			Shell parentShell,
+			ResourceManager resourceManager,
+			EclipseLinkObjectTypeConverter objectTypeConverter,
+			EclipseLinkConversionValue conversionValue) {
+		super(parentShell, resourceManager, buildTitle(conversionValue));
 		this.objectTypeConverter = objectTypeConverter;
 		this.conversionValue = conversionValue;
 	}
 
+	private static String buildTitle(EclipseLinkConversionValue conversionValue) {
+		return (conversionValue == null) ?
+				EclipseLinkUiDetailsMessages.EclipseLinkConversionValueDialog_addConversionValue :
+				EclipseLinkUiDetailsMessages.EclipseLinkConversionValueDialog_editConversionValue;
+	}
+
 	@Override
 	protected EclipseLinkConversionValueStateObject buildStateObject() {
 		String dataValue = null;
@@ -77,48 +83,34 @@ public class EclipseLinkConversionValueDialog extends ValidatingDialog<EclipseLi
 	// ********** open **********
 
 	@Override
-	protected void configureShell(Shell shell) {
-		super.configureShell(shell);
-		shell.setText(this.getTitle());
-	}
-
-	@Override
-	protected String getTitle() {
-		return (this.isAddDialog()) ?
-						EclipseLinkUiDetailsMessages.EclipseLinkConversionValueDialog_addConversionValue
-					:
-						EclipseLinkUiDetailsMessages.EclipseLinkConversionValueDialog_editConversionValue;
-	}
-
-	@Override
 	protected String getDescriptionTitle() {
 		return (this.isAddDialog()) ?
-			EclipseLinkUiDetailsMessages.EclipseLinkConversionValueDialog_addConversionValueDescriptionTitle
-		:
+			EclipseLinkUiDetailsMessages.EclipseLinkConversionValueDialog_addConversionValueDescriptionTitle :
 			EclipseLinkUiDetailsMessages.EclipseLinkConversionValueDialog_editConversionValueDescriptionTitle;
 	}
 	
 	@Override
 	protected String getDescription() {
 		return (this.isAddDialog()) ?
-			EclipseLinkUiDetailsMessages.EclipseLinkConversionValueDialog_addConversionValueDescription
-		:
+			EclipseLinkUiDetailsMessages.EclipseLinkConversionValueDialog_addConversionValueDescription :
 			EclipseLinkUiDetailsMessages.EclipseLinkConversionValueDialog_editConversionValueDescription;
 	}
 	
 	@Override
 	protected DialogPane<EclipseLinkConversionValueStateObject> buildLayout(Composite container) {
-		return new ConversionValueDialogPane(container);
+		return new ConversionValueDialogPane(this.getSubjectHolder(), container, this.resourceManager);
 	}
 	
 	@Override
 	public void create() {
 		super.create();
+		this.getPane().selectAll();
+		this.getButton(OK).setEnabled(false);
+	}
 
-		ConversionValueDialogPane pane = (ConversionValueDialogPane) getPane();
-		pane.selectAll();
-
-		getButton(OK).setEnabled(false);
+	@Override
+	protected ConversionValueDialogPane getPane() {
+		return (ConversionValueDialogPane) super.getPane();
 	}
 
 
@@ -149,13 +141,18 @@ public class EclipseLinkConversionValueDialog extends ValidatingDialog<EclipseLi
 		return getSubject().getObjectValue();
 	}
 	
-	private class ConversionValueDialogPane extends DialogPane<EclipseLinkConversionValueStateObject> {
-
+	
+	static class ConversionValueDialogPane
+		extends DialogPane<EclipseLinkConversionValueStateObject>
+	{
 		private Text dataValueText;
 		private Text objectValueText;
 
-		ConversionValueDialogPane(Composite parent) {
-			super(EclipseLinkConversionValueDialog.this.getSubjectHolder(), parent);
+		ConversionValueDialogPane(
+				PropertyValueModel<EclipseLinkConversionValueStateObject> subjectModel,
+				Composite parentComposite,
+				ResourceManager resourceManager) {
+			super(subjectModel, parentComposite, resourceManager);
 		}
 
 		@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConversionValueStateObject.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConversionValueStateObject.java
index add473aa37..994604ac50 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConversionValueStateObject.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConversionValueStateObject.java
@@ -21,11 +21,6 @@ import org.eclipse.jpt.common.utility.node.Problem;
 /**
  * This is the state object used by the <code>NewNameDialog</code>, which stores
  * the current name and validates it when it is modified.
- *
- * @see NewNameDialog
- *
- * @version 2.1
- * @since 2.1
  */
 @SuppressWarnings("nls")
 final class EclipseLinkConversionValueStateObject extends AbstractNode
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConvertCombo.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConvertCombo.java
index b69bb8eda4..1f34316524 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConvertCombo.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConvertCombo.java
@@ -10,7 +10,6 @@
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details;
 
 import java.util.ArrayList;
-import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.JptCommonUiMessages;
 import org.eclipse.jpt.common.ui.internal.util.SWTUtil;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
@@ -39,21 +38,6 @@ import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * |            -------------------------------------------------------------- |
- * | Enum Type: |                                                          |v| |
- * |            -------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see EclipseLinkConvert
- * @see EclipseLinkBasicMappingComposite - A container of this widget
- *
- * @version 2.1
- * @since 2.1
- */
 public class EclipseLinkConvertCombo
 	extends Pane<EclipseLinkConvert>
 {
@@ -70,15 +54,13 @@ public class EclipseLinkConvertCombo
 	protected static String DEFAULT_KEY = "?!#!?#?#?default?#?!#?!#?"; //$NON-NLS-1$
 
 
-	/**
-	 * Creates a new <code>EclipseLinkConvertComposite</code>.
-	 */
-	public EclipseLinkConvertCombo(PropertyValueModel<? extends EclipseLinkConvert> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public EclipseLinkConvertCombo(
+		Pane<?> parentPane,
+		PropertyValueModel<? extends EclipseLinkConvert> subjectModel,
+		PropertyValueModel<Boolean> enabledModel,
+		Composite parentComposite
+	) {
+		super(parentPane, subjectModel, enabledModel, parentComposite);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConvertersComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConvertersComposite.java
index c137d0c926..ed34d3ee26 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConvertersComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConvertersComposite.java
@@ -124,48 +124,28 @@ public class EclipseLinkConvertersComposite extends Pane<EclipseLinkConverterCon
 
 	protected EclipseLinkCustomConverterComposite getCustomConverterComposite(PageBook pageBook) {
 		if (this.converterComposite == null) {
-			this.converterComposite = new EclipseLinkCustomConverterComposite(
-				buildSelectedCustomConverterModel(),
-				pageBook,
-				getWidgetFactory()
-			);
-			registerSubPane(this.converterComposite);
+			this.converterComposite = new EclipseLinkCustomConverterComposite(this, this.buildSelectedCustomConverterModel(), pageBook);
 		}
 		return this.converterComposite;
 	}
 
 	protected EclipseLinkObjectTypeConverterComposite getObjectTypeConverterComposite(PageBook pageBook) {
 		if (this.objectTypeConverterComposite == null) {
-			this.objectTypeConverterComposite = new EclipseLinkObjectTypeConverterComposite(
-				buildSelectedObjectTypeConverterModel(),
-				pageBook,
-				getWidgetFactory()
-			);
-			registerSubPane(this.objectTypeConverterComposite);
+			this.objectTypeConverterComposite = new EclipseLinkObjectTypeConverterComposite(this, this.buildSelectedObjectTypeConverterModel(), pageBook);
 		}
 		return this.objectTypeConverterComposite;
 	}
 		
 	protected EclipseLinkStructConverterComposite getStructConverterComposite(PageBook pageBook) {
 		if (this.structConverterComposite == null) {
-			this.structConverterComposite = new EclipseLinkStructConverterComposite(
-				buildSelectedStructConverterModel(),
-				pageBook,
-				getWidgetFactory()
-			);
-			registerSubPane(this.structConverterComposite);
+			this.structConverterComposite = new EclipseLinkStructConverterComposite(this, this.buildSelectedStructConverterModel(), pageBook);
 		}
 		return this.structConverterComposite;
 	}
 
 	protected EclipseLinkTypeConverterComposite getTypeConverterComposite(PageBook pageBook) {
 		if (this.typeConverterComposite == null) {
-			this.typeConverterComposite = new EclipseLinkTypeConverterComposite(
-				buildSelectedTypeConverterModel(),
-				pageBook,
-				getWidgetFactory()
-			);
-			registerSubPane(this.typeConverterComposite);
+			this.typeConverterComposite = new EclipseLinkTypeConverterComposite(this, this.buildSelectedTypeConverterModel(), pageBook);
 		}
 		return this.typeConverterComposite;
 	}
@@ -225,7 +205,7 @@ public class EclipseLinkConvertersComposite extends Pane<EclipseLinkConverterCon
 	}
 
 	protected EclipseLinkConverterDialog buildEclipseLinkConverterDialog() {
-		return new EclipseLinkConverterDialog(this.getShell(), this.getSubject());
+		return new EclipseLinkConverterDialog(this.getShell(), this.getResourceManager(), this.getSubject());
 	}
 
 	protected EclipseLinkConverter addEclipseLinkConverterFromDialog(EclipseLinkConverterDialog dialog) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCustomConverterComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCustomConverterComposite.java
index ca9cfcb18f..04c7f7591e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCustomConverterComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCustomConverterComposite.java
@@ -38,20 +38,11 @@ import org.eclipse.ui.forms.widgets.Hyperlink;
  * @version 2.1
  * @since 2.1
  */
-public class EclipseLinkCustomConverterComposite extends Pane<EclipseLinkCustomConverter>
+public class EclipseLinkCustomConverterComposite
+	extends Pane<EclipseLinkCustomConverter>
 {
-
-	/**
-	 * Creates a new <code>ConverterComposite</code>.
-	 *
-	 * @param parentPane The parent container of this one
-	 * @param parent The parent container
-	 */
-	public EclipseLinkCustomConverterComposite(PropertyValueModel<? extends EclipseLinkCustomConverter> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-
-		super(subjectHolder, parent, widgetFactory);
+	public EclipseLinkCustomConverterComposite(Pane<?> parentPane, PropertyValueModel<? extends EclipseLinkCustomConverter> subjectModel, Composite parentComposite) {
+		super(parentPane, subjectModel, parentComposite);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkElementCollectionMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkElementCollectionMapping2_0Composite.java
index ce1e1d939d..82064dbfe3 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkElementCollectionMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkElementCollectionMapping2_0Composite.java
@@ -9,18 +9,25 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
+import org.eclipse.jpt.common.utility.internal.transformer.NotNullObjectTransformer;
+import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
+import org.eclipse.jpt.jpa.core.context.Converter;
+import org.eclipse.jpt.jpa.core.context.ConvertibleMapping;
 import org.eclipse.jpt.jpa.core.jpa2.context.ElementCollectionMapping2_0;
 import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConvert;
 import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverterContainer;
 import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkElementCollectionMapping2_0;
 import org.eclipse.jpt.jpa.ui.internal.jpa2.details.AbstractElementCollectionMapping2_0Composite;
 import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
 import org.eclipse.ui.forms.events.ExpansionAdapter;
 import org.eclipse.ui.forms.events.ExpansionEvent;
 import org.eclipse.ui.forms.widgets.ExpandableComposite;
@@ -29,13 +36,13 @@ import org.eclipse.ui.forms.widgets.Section;
 public abstract class EclipseLinkElementCollectionMapping2_0Composite<T extends ElementCollectionMapping2_0>
 	extends AbstractElementCollectionMapping2_0Composite<T>
 {
-
-	protected EclipseLinkElementCollectionMapping2_0Composite(PropertyValueModel<? extends T> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-									WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	protected EclipseLinkElementCollectionMapping2_0Composite(
+			PropertyValueModel<? extends T> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
@@ -74,13 +81,60 @@ public abstract class EclipseLinkElementCollectionMapping2_0Composite<T extends
 		};
 	}
 
-	protected PropertyValueModel<Boolean> buildEclipseLinkConvertBooleanHolder(PropertyValueModel<EclipseLinkConvert> convertHolder) {
-		return new TransformationPropertyValueModel<EclipseLinkConvert, Boolean>(convertHolder) {
+	@Override
+	protected Composite buildBasicValueTypeSectionClient(Section section) {
+		Composite container = super.buildBasicValueTypeSectionClient(section);
+		PropertyValueModel<Converter> converterHolder = buildConverterModel();
+
+		// EclipseLink Converter
+		Button elConverterButton = addRadioButton(
+			container, 
+			EclipseLinkUiDetailsMessages.TypeSection_converted, 
+			buildConverterBooleanHolder(EclipseLinkConvert.class), 
+			null);
+		((GridData) elConverterButton.getLayoutData()).horizontalSpan = 2;
+
+		PropertyValueModel<EclipseLinkConvert> convertModel = this.buildEclipseLinkConvertModel(converterHolder);
+		PropertyValueModel<Boolean> convertEnabledModel = this.buildNotNullModel(convertModel);
+		Label convertLabel = this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkConvertComposite_converterNameLabel, convertEnabledModel);
+		GridData gridData = new GridData();
+		gridData.horizontalIndent = 20;
+		convertLabel.setLayoutData(gridData);
+		new EclipseLinkConvertCombo(this, convertModel, convertEnabledModel, container);
+
+		return container;
+	}
+
+	protected PropertyValueModel<Converter> buildConverterModel() {
+		return new PropertyAspectAdapter<ConvertibleMapping, Converter>(this.getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) {
 			@Override
-			protected Boolean transform(EclipseLinkConvert value) {
-				return Boolean.valueOf(value != null);
+			protected Converter buildValue_() {
+				return this.subject.getConverter();
 			}
 		};
 	}
 
+	protected ModifiablePropertyValueModel<Boolean> buildConverterBooleanHolder(final Class<? extends Converter> converterType) {
+		return new PropertyAspectAdapter<ConvertibleMapping, Boolean>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) {
+			@Override
+			protected Boolean buildValue_() {
+				Converter converter = this.subject.getConverter();
+				return Boolean.valueOf(converter.getType() == converterType);
+			}
+
+			@Override
+			protected void setValue_(Boolean value) {
+				if (value.booleanValue()) {
+					this.subject.setConverter(converterType);
+				}
+			}
+		};
+	}
+	protected PropertyValueModel<EclipseLinkConvert> buildEclipseLinkConvertModel(PropertyValueModel<Converter> converterModel) {
+		return new TransformationPropertyValueModel<Converter, EclipseLinkConvert>(converterModel, EclipseLinkConvert.CONVERTER_TRANSFORMER);
+	}
+
+	protected <M> PropertyValueModel<Boolean> buildNotNullModel(PropertyValueModel<M> valueModel) {
+		return new TransformationPropertyValueModel<M, Boolean>(valueModel, NotNullObjectTransformer.<M>instance());
+	}
 }
 \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkIdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkIdMappingComposite.java
index df5032aba0..db6157a08a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkIdMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkIdMappingComposite.java
@@ -9,14 +9,15 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
-import org.eclipse.jpt.common.utility.internal.model.value.CompositeBooleanPropertyValueModel;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
+import org.eclipse.jpt.common.utility.internal.transformer.NotNullObjectTransformer;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
+import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
 import org.eclipse.jpt.jpa.core.context.Converter;
 import org.eclipse.jpt.jpa.core.context.IdMapping;
-import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
 import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConvert;
 import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverterContainer;
 import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkIdMapping;
@@ -39,12 +40,12 @@ public abstract class EclipseLinkIdMappingComposite<T extends IdMapping>
 	extends AbstractIdMappingComposite<T>
 {
 	protected EclipseLinkIdMappingComposite(
-			PropertyValueModel<? extends T> subjectHolder,
+			PropertyValueModel<? extends T> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-	        WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	@Override
@@ -76,7 +77,7 @@ public abstract class EclipseLinkIdMappingComposite<T extends IdMapping>
 			JptUiDetailsMessages.TypeSection_temporal, 
 			buildConverterBooleanHolder(BaseTemporalConverter.class), 
 			null);
-		registerSubPane(new TemporalTypeCombo(buildTemporalConverterHolder(converterHolder), getEnabledModel(), container, getWidgetFactory()));
+		new TemporalTypeCombo(this, this.buildTemporalConverterHolder(converterHolder), container);
 
 		// EclipseLink Converter
 		Button elConverterButton = addRadioButton(
@@ -86,35 +87,25 @@ public abstract class EclipseLinkIdMappingComposite<T extends IdMapping>
 			null);
 		((GridData) elConverterButton.getLayoutData()).horizontalSpan = 2;
 		
-		PropertyValueModel<EclipseLinkConvert> convertHolder = buildEclipseLinkConverterHolder(converterHolder);
-		PropertyValueModel<Boolean> convertEnabledModel = CompositeBooleanPropertyValueModel.and(getEnabledModel(), buildEclipseLinkConvertBooleanHolder(convertHolder));
+		PropertyValueModel<EclipseLinkConvert> convertModel = this.buildEclipseLinkConvertModel(converterHolder);
+		PropertyValueModel<Boolean> convertEnabledModel = this.buildNonNullEclipseLinkConvertModel(convertModel);
 		Label convertLabel = this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkConvertComposite_converterNameLabel, convertEnabledModel);
 		GridData gridData = new GridData();
 		gridData.horizontalIndent = 20;
 		convertLabel.setLayoutData(gridData);
-		registerSubPane(new EclipseLinkConvertCombo(convertHolder, convertEnabledModel, container, getWidgetFactory()));
+		new EclipseLinkConvertCombo(this, convertModel, convertEnabledModel, container);
 
 		return container;
 	}
 	
-	protected PropertyValueModel<EclipseLinkConvert> buildEclipseLinkConverterHolder(PropertyValueModel<Converter> converterHolder) {
-		return new TransformationPropertyValueModel<Converter, EclipseLinkConvert>(converterHolder) {
-			@Override
-			protected EclipseLinkConvert transform_(Converter converter) {
-				return converter.getType() == EclipseLinkConvert.class ? (EclipseLinkConvert) converter : null;
-			}
-		};
+	protected PropertyValueModel<EclipseLinkConvert> buildEclipseLinkConvertModel(PropertyValueModel<Converter> converterModel) {
+		return new TransformationPropertyValueModel<Converter, EclipseLinkConvert>(converterModel, EclipseLinkConvert.CONVERTER_TRANSFORMER);
 	}
 
-	protected PropertyValueModel<Boolean> buildEclipseLinkConvertBooleanHolder(PropertyValueModel<EclipseLinkConvert> convertHolder) {
-		return new TransformationPropertyValueModel<EclipseLinkConvert, Boolean>(convertHolder) {
-			@Override
-			protected Boolean transform(EclipseLinkConvert value) {
-				return Boolean.valueOf(value != null);
-			}
-		};
+	protected PropertyValueModel<Boolean> buildNonNullEclipseLinkConvertModel(PropertyValueModel<EclipseLinkConvert> convertModel) {
+		return new TransformationPropertyValueModel<EclipseLinkConvert, Boolean>(convertModel, NotNullObjectTransformer.<EclipseLinkConvert>instance());
 	}
-	
+
 	protected PropertyValueModel<EclipseLinkMutable> buildMutableHolder() {
 		return new PropertyAspectAdapter<T, EclipseLinkMutable>(getSubjectHolder()) {
 			@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkManyToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkManyToManyMappingComposite.java
index 5e2b62f5ab..6311096c01 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkManyToManyMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkManyToManyMappingComposite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2011 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2012 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -18,13 +19,10 @@ import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverterContaine
 import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch;
 import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkManyToManyMapping;
 import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkRelationshipMapping;
-import org.eclipse.jpt.jpa.ui.details.JpaComposite;
 import org.eclipse.jpt.jpa.ui.internal.details.AbstractManyToManyMappingComposite;
 import org.eclipse.jpt.jpa.ui.internal.details.CascadeComposite;
 import org.eclipse.jpt.jpa.ui.internal.details.FetchTypeComboViewer;
 import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages;
-import org.eclipse.jpt.jpa.ui.internal.details.ManyToManyJoiningStrategyPane;
-import org.eclipse.jpt.jpa.ui.internal.details.OrderingComposite;
 import org.eclipse.jpt.jpa.ui.internal.details.TargetEntityClassChooser;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
@@ -35,64 +33,16 @@ import org.eclipse.ui.forms.widgets.ExpandableComposite;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 import org.eclipse.ui.forms.widgets.Section;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | TargetEntityComposite                                                 | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | JoiningStrategyComposite                                              | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | FetchTypeComposite                                                    | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | CascadeComposite                                                      | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | OrderingComposite                                                     | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see {@link ManyToManyMapping}
- * @see {@link TargetEntityClassChooser}
- * @see {@link ManyToManyJoiningStrategyPane}
- * @see {@link FetchTypeComboViewer}
- * @see {@link CascadeComposite}
- * @see {@link OrderingComposite}
- *
- * @version 2.3
- * @since 2.1
- */
-public class EclipseLinkManyToManyMappingComposite<T extends ManyToManyMapping> 
+public class EclipseLinkManyToManyMappingComposite<T extends ManyToManyMapping>
 	extends AbstractManyToManyMappingComposite<T, ManyToManyRelationship>
-	implements JpaComposite
 {
-	/**
-	 * Creates a new <code>ManyToManyMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>IManyToManyMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public EclipseLinkManyToManyMappingComposite(PropertyValueModel<? extends T> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-	                                WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public EclipseLinkManyToManyMappingComposite(
+			PropertyValueModel<? extends T> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkManyToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkManyToOneMappingComposite.java
index e6958b9254..80617dfac7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkManyToOneMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkManyToOneMappingComposite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2011 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2012 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -58,33 +59,17 @@ import org.eclipse.ui.forms.widgets.Hyperlink;
  * | |                                                                       | |
  * | ------------------------------------------------------------------------- |
  * -----------------------------------------------------------------------------</pre>
- *
- * @see {@link ManyToOneMapping}
- * @see {@link TargetEntityClassChooser}
- * @see {@link ManyToOneJoiningStrategyPane}
- * @see {@link FetchTypeComboViewer}
- * @see {@link OptionalComposite}
- * @see {@link CascadeComposite}
- *
- * @version 2.3
- * @since 2.1
  */
 public class EclipseLinkManyToOneMappingComposite<T extends ManyToOneMapping> 
 	extends AbstractManyToOneMappingComposite<T, ManyToOneRelationship>
 {
-	/**
-	 * Creates a new <code>EclipseLinkManyToOneMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>ManyToOneMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public EclipseLinkManyToOneMappingComposite(PropertyValueModel<? extends T> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-	                                WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public EclipseLinkManyToOneMappingComposite(
+			PropertyValueModel<? extends T> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+	        WidgetFactory widgetFactory,
+	        ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkMultitenancyComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkMultitenancyComposite.java
index df489b30b5..614abef11f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkMultitenancyComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkMultitenancyComposite.java
@@ -229,14 +229,14 @@ public class EclipseLinkMultitenancyComposite extends Pane<EclipseLinkMultitenan
 		};
 	}
 
-	//TODO do i need to pass in the PaneEnabler from *this* pane as a Combined property value model?
 	protected TenantDiscriminatorColumnsComposite<EclipseLinkMultitenancy2_3>  buildTenantDiscriminatorColumnsComposite(Composite container) {
 		return new TenantDiscriminatorColumnsComposite<EclipseLinkMultitenancy2_3>(
-			getSubjectHolder(),
-			new TenantDiscriminatorColumnPaneEnablerHolder(),
-			container,
-			getWidgetFactory(),
-			buildTenantDiscriminatorColumnsEditor());
+				this,
+				this.getSubjectHolder(),
+				new TenantDiscriminatorColumnPaneEnablerHolder(),
+				container,
+				this.buildTenantDiscriminatorColumnsEditor()
+			);
 	}
 
 	protected TenantDiscriminatorColumnsEditor<EclipseLinkMultitenancy2_3> buildTenantDiscriminatorColumnsEditor() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkObjectTypeConverterComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkObjectTypeConverterComposite.java
index e81e78ccdf..8f67ff8eb7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkObjectTypeConverterComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkObjectTypeConverterComposite.java
@@ -14,7 +14,6 @@ import org.eclipse.jdt.ui.IJavaElementSearchConstants;
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.window.Window;
-import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.swt.ColumnAdapter;
 import org.eclipse.jpt.common.ui.internal.widgets.AddRemoveListPane;
 import org.eclipse.jpt.common.ui.internal.widgets.AddRemoveTablePane;
@@ -59,20 +58,11 @@ import org.eclipse.ui.forms.widgets.Hyperlink;
  * @version 2.1
  * @since 2.1
  */
-public class EclipseLinkObjectTypeConverterComposite extends Pane<EclipseLinkObjectTypeConverter>
+public class EclipseLinkObjectTypeConverterComposite
+	extends Pane<EclipseLinkObjectTypeConverter>
 {
-
-	/**
-	 * Creates a new <code>ObjectTypeConverterComposite</code>.
-	 *
-	 * @param parentPane The parent container of this one
-	 * @param parent The parent container
-	 */
-	public EclipseLinkObjectTypeConverterComposite(PropertyValueModel<? extends EclipseLinkObjectTypeConverter> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-
-		super(subjectHolder, parent, widgetFactory);
+	public EclipseLinkObjectTypeConverterComposite(Pane<?> parentPane, PropertyValueModel<? extends EclipseLinkObjectTypeConverter> subjectModel, Composite parentComposite) {
+		super(parentPane, subjectModel, parentComposite);
 	}
 
 	@Override
@@ -282,7 +272,7 @@ public class EclipseLinkObjectTypeConverterComposite extends Pane<EclipseLinkObj
 			@Override
 			public void optionOnSelection(CollectionValueModel<EclipseLinkConversionValue> selectedItemsModel) {
 				EclipseLinkConversionValue conversionValue = selectedItemsModel.iterator().next();
-				EclipseLinkConversionValueDialog dialog = new EclipseLinkConversionValueDialog(getShell(), getSubject(), conversionValue);
+				EclipseLinkConversionValueDialog dialog = new EclipseLinkConversionValueDialog(getShell(), getResourceManager(), getSubject(), conversionValue);
 				editConversionValueFromDialog(dialog, conversionValue);
 			}
 
@@ -303,7 +293,7 @@ public class EclipseLinkObjectTypeConverterComposite extends Pane<EclipseLinkObj
 
 
 	protected EclipseLinkConversionValueDialog buildConversionValueDialogForAdd() {
-		return new EclipseLinkConversionValueDialog(getShell(), getSubject());
+		return new EclipseLinkConversionValueDialog(this.getShell(), this.getResourceManager(), this.getSubject());
 	}
 
 	protected EclipseLinkConversionValue addConversionValueFromDialog(EclipseLinkConversionValueDialog dialog) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkOneToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkOneToManyMappingComposite.java
index 21792ed847..304fc10409 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkOneToManyMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkOneToManyMappingComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -35,76 +36,16 @@ import org.eclipse.ui.forms.widgets.ExpandableComposite;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 import org.eclipse.ui.forms.widgets.Section;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | TargetEntityComposite                                                 | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | EclipseLinkOneToManyJoiningStrategyPane                               | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | FetchTypeComposite                                                    | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | EclipseLinkJoinFetchComposite                                         | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | EclipseLinkvateOwnedComposite                                         | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | CascadeComposite                                                      | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | OrderingComposite                                                     | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see OneToOneMapping
- * @see CascadeComposite
- * @see EclipseLinkJoinFetchComboViewer
- * @see EclipseLinkJoinFetchComboViewer
- * @see EclipseLinkOneToManyJoiningStrategyPane
- * @see FetchTypeComboViewer
- * @see OrderingComposite
- * @see TargetEntityClassChooser
- *
- * @version 2.3
- * @since 2.1
- */
 public class EclipseLinkOneToManyMappingComposite<T extends OneToManyMapping> 
 	extends AbstractOneToManyMappingComposite<T, EclipseLinkOneToManyRelationship>
-    implements JpaComposite
 {
-	/**
-	 * Creates a new <code>EclipselinkOneToManyMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>IOneToManyMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public EclipseLinkOneToManyMappingComposite(PropertyValueModel<? extends T> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-	                                WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public EclipseLinkOneToManyMappingComposite(
+			PropertyValueModel<? extends T> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkOneToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkOneToOneMappingComposite.java
index d2a899234a..43b5677692 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkOneToOneMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkOneToOneMappingComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -32,21 +33,14 @@ import org.eclipse.ui.forms.widgets.Hyperlink;
 
 public class EclipseLinkOneToOneMappingComposite<T extends OneToOneMapping>
 	extends AbstractOneToOneMappingComposite<T, OneToOneRelationship>
-	implements JpaComposite
 {
-	/**
-	 * Creates a new <code>EclipselinkOneToOneMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>IOneToOneMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public EclipseLinkOneToOneMappingComposite(PropertyValueModel<? extends T> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-	                                WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public EclipseLinkOneToOneMappingComposite(
+			PropertyValueModel<? extends T> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+	        WidgetFactory widgetFactory,
+	        ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkStructConverterComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkStructConverterComposite.java
index e58fccf90f..66db9ed42b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkStructConverterComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkStructConverterComposite.java
@@ -10,7 +10,6 @@
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details;
 
 import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.ClassChooserPane;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
@@ -38,20 +37,11 @@ import org.eclipse.ui.forms.widgets.Hyperlink;
  * @version 2.1
  * @since 2.1
  */
-public class EclipseLinkStructConverterComposite extends Pane<EclipseLinkStructConverter>
+public class EclipseLinkStructConverterComposite
+	extends Pane<EclipseLinkStructConverter>
 {
-
-	/**
-	 * Creates a new <code>StructConverterComposite</code>.
-	 *
-	 * @param parentPane The parent container of this one
-	 * @param parent The parent container
-	 */
-	public EclipseLinkStructConverterComposite(PropertyValueModel<? extends EclipseLinkStructConverter> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-
-		super(subjectHolder, parent, widgetFactory);
+	public EclipseLinkStructConverterComposite(Pane<?> parentPane, PropertyValueModel<? extends EclipseLinkStructConverter> subjectModel, Composite parentComposite) {
+		super(parentPane, subjectModel, parentComposite);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkStructureMapping2_3Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkStructureMapping2_3Composite.java
index b5d1cb791f..b807d468f6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkStructureMapping2_3Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkStructureMapping2_3Composite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2012 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -16,19 +17,21 @@ import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkStructureMapping2
 import org.eclipse.jpt.jpa.ui.details.JpaComposite;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkStructureMapping2_3Composite extends Pane<EclipseLinkStructureMapping2_3>
-                                       implements JpaComposite
+public class EclipseLinkStructureMapping2_3Composite
+	extends Pane<EclipseLinkStructureMapping2_3>
+	implements JpaComposite
 {
-	public EclipseLinkStructureMapping2_3Composite(PropertyValueModel<? extends EclipseLinkStructureMapping2_3> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-	                                WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public EclipseLinkStructureMapping2_3Composite(
+			PropertyValueModel<? extends EclipseLinkStructureMapping2_3> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
 	protected void initializeLayout(Composite container) {
-
+		// NOP
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkTransformationMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkTransformationMappingComposite.java
index 1735c412dd..f5982febcc 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkTransformationMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkTransformationMappingComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -16,31 +17,21 @@ import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkTransformationMap
 import org.eclipse.jpt.jpa.ui.details.JpaComposite;
 import org.eclipse.swt.widgets.Composite;
 
-/**
- *
- * @version 2.1
- * @since 2.1
- */
-public class EclipseLinkTransformationMappingComposite extends Pane<EclipseLinkTransformationMapping>
-                                       implements JpaComposite
+public class EclipseLinkTransformationMappingComposite
+	extends Pane<EclipseLinkTransformationMapping>
+	implements JpaComposite
 {
-	/**
-	 * Creates a new <code>EclipseLinkBasicCollectionMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>IManyToOneMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public EclipseLinkTransformationMappingComposite(PropertyValueModel<? extends EclipseLinkTransformationMapping> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-	                                WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public EclipseLinkTransformationMappingComposite(
+			PropertyValueModel<? extends EclipseLinkTransformationMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
 	protected void initializeLayout(Composite container) {
-
+		// NOP
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkTypeConverterComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkTypeConverterComposite.java
index 3f8947837b..b1b4a645e9 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkTypeConverterComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkTypeConverterComposite.java
@@ -10,7 +10,6 @@
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details;
 
 import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.ClassChooserPane;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
@@ -37,20 +36,11 @@ import org.eclipse.ui.forms.widgets.Hyperlink;
  * @version 2.1
  * @since 2.1
  */
-public class EclipseLinkTypeConverterComposite extends Pane<EclipseLinkTypeConverter>
+public class EclipseLinkTypeConverterComposite
+	extends Pane<EclipseLinkTypeConverter>
 {
-
-	/**
-	 * Creates a new <code>TypeConverterComposite</code>.
-	 *
-	 * @param parentPane The parent container of this one
-	 * @param parent The parent container
-	 */
-	public EclipseLinkTypeConverterComposite(PropertyValueModel<? extends EclipseLinkTypeConverter> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-
-		super(subjectHolder, parent, widgetFactory);
+	public EclipseLinkTypeConverterComposite(Pane<?> parentPane, PropertyValueModel<? extends EclipseLinkTypeConverter> subjectModel, Composite parentComposite) {
+		super(parentPane, subjectModel, parentComposite);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkVariableOneToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkVariableOneToOneMappingComposite.java
index fb31567490..14936aeb9f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkVariableOneToOneMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkVariableOneToOneMappingComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -16,31 +17,21 @@ import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkVariableOneToOneM
 import org.eclipse.jpt.jpa.ui.details.JpaComposite;
 import org.eclipse.swt.widgets.Composite;
 
-/**
- *
- * @version 2.2
- * @since 2.2
- */
-public class EclipseLinkVariableOneToOneMappingComposite extends Pane<EclipseLinkVariableOneToOneMapping>
-                                       implements JpaComposite
+public class EclipseLinkVariableOneToOneMappingComposite
+	extends Pane<EclipseLinkVariableOneToOneMapping>
+	implements JpaComposite
 {
-	/**
-	 * Creates a new <code>EclipseLinkBasicCollectionMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>IManyToOneMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public EclipseLinkVariableOneToOneMappingComposite(PropertyValueModel<? extends EclipseLinkVariableOneToOneMapping> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-	                                WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public EclipseLinkVariableOneToOneMappingComposite(
+			PropertyValueModel<? extends EclipseLinkVariableOneToOneMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
 	protected void initializeLayout(Composite container) {
-
+		// NOP
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkVersionMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkVersionMappingComposite.java
index 45bbc78d33..1202ce3311 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkVersionMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkVersionMappingComposite.java
@@ -9,14 +9,15 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
-import org.eclipse.jpt.common.utility.internal.model.value.CompositeBooleanPropertyValueModel;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
+import org.eclipse.jpt.common.utility.internal.transformer.NotNullObjectTransformer;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
+import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
 import org.eclipse.jpt.jpa.core.context.Converter;
 import org.eclipse.jpt.jpa.core.context.ConvertibleMapping;
-import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
 import org.eclipse.jpt.jpa.core.context.VersionMapping;
 import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConvert;
 import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverterContainer;
@@ -56,30 +57,17 @@ import org.eclipse.ui.forms.widgets.Section;
  * | |                                                                       | |
  * | ------------------------------------------------------------------------- |
  * -----------------------------------------------------------------------------</pre>
- *
- * @see VersionMapping
- * @see ColumnComposite
- * @see TemporalTypeCombo
- *
- * @version 3.2
- * @since 2.1
  */
 public abstract class EclipseLinkVersionMappingComposite<T extends VersionMapping>
 	extends AbstractVersionMappingComposite<T>
 {
-	/**
-	 * Creates a new <code>VersionMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>IVersionMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	protected EclipseLinkVersionMappingComposite(PropertyValueModel<? extends T> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-									WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	protected EclipseLinkVersionMappingComposite(
+			PropertyValueModel<? extends T> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	@Override
@@ -111,7 +99,7 @@ public abstract class EclipseLinkVersionMappingComposite<T extends VersionMappin
 			JptUiDetailsMessages.TypeSection_temporal, 
 			buildConverterBooleanHolder(BaseTemporalConverter.class), 
 			null);
-		registerSubPane(new TemporalTypeCombo(buildTemporalConverterHolder(converterHolder), getEnabledModel(), container, getWidgetFactory()));
+		new TemporalTypeCombo(this, this.buildTemporalConverterHolder(converterHolder), container);
 
 		// EclipseLink Converter
 		Button elConverterButton = addRadioButton(
@@ -121,27 +109,17 @@ public abstract class EclipseLinkVersionMappingComposite<T extends VersionMappin
 			null);
 		((GridData) elConverterButton.getLayoutData()).horizontalSpan = 2;
 
-		PropertyValueModel<EclipseLinkConvert> convertHolder = buildEclipseLinkConverterHolder(converterHolder);
-		PropertyValueModel<Boolean> convertEnabledModel = CompositeBooleanPropertyValueModel.and(getEnabledModel(), buildEclipseLinkConvertBooleanHolder(convertHolder));
+		PropertyValueModel<EclipseLinkConvert> convertModel = this.buildEclipseLinkConvertModel(converterHolder);
+		PropertyValueModel<Boolean> convertEnabledModel = this.buildNonNullEclipseLinkConvertModel(convertModel);
 		Label convertLabel = this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkConvertComposite_converterNameLabel, convertEnabledModel);
 		GridData gridData = new GridData();
 		gridData.horizontalIndent = 20;
 		convertLabel.setLayoutData(gridData);
-		registerSubPane(new EclipseLinkConvertCombo(convertHolder, convertEnabledModel, container, getWidgetFactory()));
+		new EclipseLinkConvertCombo(this, convertModel, convertEnabledModel, container);
 
 		return container;
 	}
 
-
-	protected PropertyValueModel<EclipseLinkConvert> buildEclipseLinkConverterHolder(PropertyValueModel<Converter> converterHolder) {
-		return new TransformationPropertyValueModel<Converter, EclipseLinkConvert>(converterHolder) {
-			@Override
-			protected EclipseLinkConvert transform_(Converter converter) {
-				return (converter != null && converter.getType() == EclipseLinkConvert.class) ? (EclipseLinkConvert) converter : null;
-			}
-		};
-	}
-
 	protected PropertyValueModel<Converter> buildConverterHolder() {
 		return new PropertyAspectAdapter<T, Converter>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) {
 			@Override
@@ -151,15 +129,14 @@ public abstract class EclipseLinkVersionMappingComposite<T extends VersionMappin
 		};
 	}
 
-	protected PropertyValueModel<Boolean> buildEclipseLinkConvertBooleanHolder(PropertyValueModel<EclipseLinkConvert> convertHolder) {
-		return new TransformationPropertyValueModel<EclipseLinkConvert, Boolean>(convertHolder) {
-			@Override
-			protected Boolean transform(EclipseLinkConvert value) {
-				return Boolean.valueOf(value != null);
-			}
-		};
+	protected PropertyValueModel<EclipseLinkConvert> buildEclipseLinkConvertModel(PropertyValueModel<Converter> converterModel) {
+		return new TransformationPropertyValueModel<Converter, EclipseLinkConvert>(converterModel, EclipseLinkConvert.CONVERTER_TRANSFORMER);
 	}
-	
+
+	protected PropertyValueModel<Boolean> buildNonNullEclipseLinkConvertModel(PropertyValueModel<EclipseLinkConvert> convertModel) {
+		return new TransformationPropertyValueModel<EclipseLinkConvert, Boolean>(convertModel, NotNullObjectTransformer.<EclipseLinkConvert>instance());
+	}
+
 	protected PropertyValueModel<BaseTemporalConverter> buildTemporalConverterHolder(PropertyValueModel<Converter> converterHolder) {
 		return new TransformationPropertyValueModel<Converter, BaseTemporalConverter>(converterHolder) {
 			@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/TenantDiscriminatorColumnComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/TenantDiscriminatorColumnComposite.java
index 836dd69386..547f79759c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/TenantDiscriminatorColumnComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/TenantDiscriminatorColumnComposite.java
@@ -354,7 +354,7 @@ public class TenantDiscriminatorColumnComposite extends Pane<ReadOnlyTenantDiscr
 		};
 	}
 
-	private ModifiablePropertyValueModel<String> buildColumnDefinitionHolder(PropertyValueModel<ReadOnlyTenantDiscriminatorColumn2_3> discriminatorColumnHolder) {
+	private ModifiablePropertyValueModel<String> buildColumnDefinitionHolder(PropertyValueModel<? extends ReadOnlyTenantDiscriminatorColumn2_3> discriminatorColumnHolder) {
 		return new PropertyAspectAdapter<ReadOnlyTenantDiscriminatorColumn2_3, String>(discriminatorColumnHolder, ReadOnlyNamedColumn.COLUMN_DEFINITION_PROPERTY) {
 			@Override
 			protected String buildValue_() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/TenantDiscriminatorColumnsComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/TenantDiscriminatorColumnsComposite.java
index f645b8ed1c..2cc4ba79b2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/TenantDiscriminatorColumnsComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/TenantDiscriminatorColumnsComposite.java
@@ -42,22 +42,8 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.part.PageBook;
 
-/**
- * Here is the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | AddRemoveListPane                                                     | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
-
- *
- * @version 3.1
- * @since 3.1
- */
-public class TenantDiscriminatorColumnsComposite<T extends JpaNode> extends Pane<T>
+public class TenantDiscriminatorColumnsComposite<T extends JpaNode>
+	extends Pane<T>
 {
 	/**
 	 * The editor used to perform the common behaviors defined in the list pane.
@@ -68,23 +54,14 @@ public class TenantDiscriminatorColumnsComposite<T extends JpaNode> extends Pane
 	private ModifiableCollectionValueModel<ReadOnlyTenantDiscriminatorColumn2_3> selectedTenantDiscriminatorColumnsModel;
 	private PropertyValueModel<ReadOnlyTenantDiscriminatorColumn2_3> selectedTenantDiscriminatorColumnModel;
 
-	public TenantDiscriminatorColumnsComposite(Pane<? extends T> parentPane,
-	                            Composite parent,
-	                            TenantDiscriminatorColumnsEditor<T> tenantDiscriminatorColumnsEditor,
-	                            PropertyValueModel<Boolean> enabledModel) {
-
-		super(parentPane, parent, enabledModel);
-		this.tenantDiscriminatorColumnsEditor = tenantDiscriminatorColumnsEditor;
-		initializeLayout2();
-	}
-
-	public TenantDiscriminatorColumnsComposite(PropertyValueModel<? extends T> subjectHolder,
-								PropertyValueModel<Boolean> enabledModel,
-	                            Composite parent,
-	                            WidgetFactory widgetFactory,
-	                            TenantDiscriminatorColumnsEditor<T> tenantDiscriminatorColumnsEditor) {
 
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public TenantDiscriminatorColumnsComposite(
+			Pane<?> parent,
+			PropertyValueModel<? extends T> subjectModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			TenantDiscriminatorColumnsEditor<T> tenantDiscriminatorColumnsEditor) {
+		super(parent, subjectModel, enabledModel, parentComposite);
 		this.tenantDiscriminatorColumnsEditor = tenantDiscriminatorColumnsEditor;
 		initializeLayout2();
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkEmbeddableComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkEmbeddableComposite.java
index 7ef374eae1..9fd5a511dd 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkEmbeddableComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkEmbeddableComposite.java
@@ -9,18 +9,16 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.jpa.core.context.Embeddable;
 import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddable;
 import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkConverterContainer;
 import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkEmbeddable;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkConvertersComposite;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkEmbeddableAdvancedComposite;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages;
-import org.eclipse.jpt.jpa.ui.details.JpaComposite;
-import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory;
 import org.eclipse.jpt.jpa.ui.internal.details.AbstractEmbeddableComposite;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
@@ -30,37 +28,21 @@ import org.eclipse.ui.forms.events.ExpansionEvent;
 import org.eclipse.ui.forms.widgets.ExpandableComposite;
 import org.eclipse.ui.forms.widgets.Section;
 
-/**
- * This pane does not have any widgets.
- *
- * @see Embeddable
- * @see JavaUiFactory - The factory creating this pane
- * @see EmbeddableUiProvider
- *
- * @version 2.3
- * @since 2.1
- */
-public abstract class AbstractJavaEclipseLinkEmbeddableComposite extends AbstractEmbeddableComposite<JavaEmbeddable>
-                                 implements JpaComposite
+public abstract class AbstractJavaEclipseLinkEmbeddableComposite
+	extends AbstractEmbeddableComposite<JavaEmbeddable>
 {
-	/**
-	 * Creates a new <code>EmbeddableComposite</code>.
-	 *
-	 * @param subjectHolder The holder of this pane's subject
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	protected AbstractJavaEclipseLinkEmbeddableComposite(PropertyValueModel<? extends JavaEmbeddable> subjectHolder,
-	                           Composite parent,
-	                           WidgetFactory widgetFactory) {
-
-		super(subjectHolder, parent, widgetFactory);
+	protected AbstractJavaEclipseLinkEmbeddableComposite(
+			PropertyValueModel<? extends JavaEmbeddable> embeddableModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(embeddableModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
 	protected void initializeLayout(Composite container) {
-		initializeConvertersCollapsibleSection(container);
-		initializeAdvancedCollapsibleSection(container);
+		this.initializeConvertersCollapsibleSection(container);
+		this.initializeAdvancedCollapsibleSection(container);
 	}
 
 	protected void initializeConvertersCollapsibleSection(Composite container) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkEntity2_xComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkEntity2_xComposite.java
index 8f10127fb7..e14672c9d0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkEntity2_xComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkEntity2_xComposite.java
@@ -9,12 +9,12 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.AccessHolder;
 import org.eclipse.jpt.jpa.core.context.java.JavaEntity;
-import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkEntity;
 import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
 import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer;
 import org.eclipse.jpt.jpa.ui.internal.details.EntityNameCombo;
@@ -29,31 +29,15 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 
-/**
- * The pane used for an EclipseLink 2.x Java entity.
- *
- * @see JavaEclipseLinkEntity
- * @see EclipselinkJpaUiFactory - The factory creating this pane
- *
- * @version 3.1
- * @since 3.1
- */
 public abstract class AbstractJavaEclipseLinkEntity2_xComposite
 	extends AbstractJavaEclipseLinkEntityComposite<JavaEntity>
 {
-	/**
-	 * Creates a new <code>EclipseLinkJavaEntityComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>JavaEntity</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
 	protected AbstractJavaEclipseLinkEntity2_xComposite(
-			PropertyValueModel<? extends JavaEntity> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<? extends JavaEntity> entityModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(entityModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkEntityComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkEntityComposite.java
index 48a61c5818..7f73f4c412 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkEntityComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkEntityComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -30,31 +31,15 @@ import org.eclipse.ui.forms.events.ExpansionEvent;
 import org.eclipse.ui.forms.widgets.ExpandableComposite;
 import org.eclipse.ui.forms.widgets.Section;
 
-/**
- * The pane used for an EclipseLink Java entity.
- *
- * @see JavaEclipseLinkEntity
- * @see EclipselinkJpaUiFactory - The factory creating this pane
- *
- * @version 2.3
- * @since 2.1
- */
 public abstract class AbstractJavaEclipseLinkEntityComposite<T extends JavaEntity>
 	extends AbstractEntityComposite<T>
 {
-	/**
-	 * Creates a new <code>EclipseLinkJavaEntityComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>JavaEntity</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
 	protected AbstractJavaEclipseLinkEntityComposite(
-			PropertyValueModel<? extends T> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<? extends T> entityModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(entityModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkMappedSuperclassComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkMappedSuperclassComposite.java
index 67612bdb01..f6e5f25b55 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkMappedSuperclassComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkMappedSuperclassComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -22,7 +23,6 @@ import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkMappedSu
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkConvertersComposite;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkNonEmbeddableTypeMappingAdvancedComposite;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages;
-import org.eclipse.jpt.jpa.ui.details.JpaComposite;
 import org.eclipse.jpt.jpa.ui.internal.details.AbstractJavaMappedSuperclassComposite;
 import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages;
 import org.eclipse.jpt.jpa.ui.internal.jpa2.details.Generation2_0Composite;
@@ -34,32 +34,15 @@ import org.eclipse.ui.forms.events.ExpansionEvent;
 import org.eclipse.ui.forms.widgets.ExpandableComposite;
 import org.eclipse.ui.forms.widgets.Section;
 
-/**
- * The pane used for an EclipseLink Java Mapped Superclass.
- *
- * @see EclipseLinkMappedSuperclass
- * @see EclipselinkJpaUiFactory - The factory creating this pane
- *
- * @version 2.3
- * @since 2.1
- */
 public abstract class AbstractJavaEclipseLinkMappedSuperclassComposite
 	extends AbstractJavaMappedSuperclassComposite
-    implements JpaComposite
 {
-	/**
-	 * Creates a new <code>MappedSuperclassComposite</code>.
-	 *
-	 * @param subjectHolder The holder of this pane's subject
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
 	protected AbstractJavaEclipseLinkMappedSuperclassComposite(
-		PropertyValueModel<? extends JavaMappedSuperclass> subjectHolder,
-		Composite parent,
-		WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<? extends JavaMappedSuperclass> mappedSuperclassModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/DefaultJavaEclipseLinkOneToManyMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/DefaultJavaEclipseLinkOneToManyMappingUiDefinition.java
index bcd47819bc..ce596aecf6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/DefaultJavaEclipseLinkOneToManyMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/DefaultJavaEclipseLinkOneToManyMappingUiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.MappingKeys;
@@ -62,8 +63,8 @@ public class DefaultJavaEclipseLinkOneToManyMappingUiDefinition
 	public String getLinkLabel() {
 		return EclipseLinkUiDetailsMessages.DefaultEclipseLinkOneToManyMappingUiProvider_linkLabel;
 	}
-	
-	public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaOneToManyMapping> subjectHolder, PropertyValueModel<Boolean> enabledModel, Composite parent, WidgetFactory widgetFactory) {
-		return factory.createJavaOneToManyMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+
+	public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaOneToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return factory.createJavaOneToManyMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/DefaultJavaEclipseLinkOneToOneMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/DefaultJavaEclipseLinkOneToOneMappingUiDefinition.java
index 2e873f5958..d4350c0106 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/DefaultJavaEclipseLinkOneToOneMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/DefaultJavaEclipseLinkOneToOneMappingUiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.MappingKeys;
@@ -62,8 +63,8 @@ public class DefaultJavaEclipseLinkOneToOneMappingUiDefinition
 	public String getLinkLabel() {
 		return EclipseLinkUiDetailsMessages.DefaultEclipseLinkOneToOneMappingUiProvider_linkLabel;
 	}
-	
-	public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaOneToOneMapping> subjectHolder, PropertyValueModel<Boolean> enabledModel, Composite parent, WidgetFactory widgetFactory) {
-		return factory.createJavaOneToOneMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+
+	public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaOneToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return factory.createJavaOneToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/DefaultJavaEclipseLinkVariableOneToOneMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/DefaultJavaEclipseLinkVariableOneToOneMappingUiDefinition.java
index 832bb9d71e..6890c87202 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/DefaultJavaEclipseLinkVariableOneToOneMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/DefaultJavaEclipseLinkVariableOneToOneMappingUiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
@@ -59,8 +60,8 @@ public class DefaultJavaEclipseLinkVariableOneToOneMappingUiDefinition
 	public String getLinkLabel() {
 		return EclipseLinkUiDetailsMessages.DefaultEclipseLinkVariableOneToOneMappingUiProvider_linkLabel;
 	}
-	
-	public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<EclipseLinkVariableOneToOneMapping> subjectHolder, PropertyValueModel<Boolean> enabledModel, Composite parent, WidgetFactory widgetFactory) {
-		return new EclipseLinkVariableOneToOneMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+
+	public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<EclipseLinkVariableOneToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return new EclipseLinkVariableOneToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}	
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLink1_2JavaUiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLink1_2JavaUiFactory.java
index 642544b3c1..fe20dbbb69 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLink1_2JavaUiFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLink1_2JavaUiFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2011 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2012 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,6 +9,7 @@
  *******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddable;
@@ -17,33 +18,35 @@ import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass;
 import org.eclipse.jpt.jpa.ui.details.JpaComposite;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLink1_2JavaUiFactory extends EclipseLinkJavaUiFactory
+public class EclipseLink1_2JavaUiFactory
+	extends EclipseLinkJavaUiFactory
 {
-	public EclipseLink1_2JavaUiFactory() {
-		super();
-	}
-
-
-	// **************** java type mapping composites ***************************
+	// ********** type mappings **********
 
 	@Override
 	public JpaComposite createJavaMappedSuperclassComposite(
-			PropertyValueModel<JavaMappedSuperclass> subjectHolder,
-			Composite parent, WidgetFactory widgetFactory) {
-		return new JavaEclipseLinkMappedSuperclass1_2Composite(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<JavaMappedSuperclass> mappedSuperclassModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new JavaEclipseLinkMappedSuperclass1_2Composite(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
 	public JpaComposite createJavaEntityComposite(
-			PropertyValueModel<JavaEntity> subjectHolder,
-			Composite parent, WidgetFactory widgetFactory) {
-		return new JavaEclipseLinkEntity1_2Composite(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<JavaEntity> entityModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new JavaEclipseLinkEntity1_2Composite(entityModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
 	public JpaComposite createJavaEmbeddableComposite(
-			PropertyValueModel<JavaEmbeddable> subjectHolder,
-			Composite parent, WidgetFactory widgetFactory) {
-		return new JavaEclipseLinkEmbeddable1_2Composite(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<JavaEmbeddable> embeddableModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new JavaEclipseLinkEmbeddable1_2Composite(embeddableModel, parentComposite, widgetFactory, resourceManager);
 	}
-}
-\ No newline at end of file
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLink2_0JavaUiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLink2_0JavaUiFactory.java
index 37485996ed..405261842d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLink2_0JavaUiFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLink2_0JavaUiFactory.java
@@ -1,14 +1,15 @@
 /*******************************************************************************
-* Copyright (c) 2009, 2012 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
+ * Copyright (c) 2009, 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddedIdMapping;
@@ -25,97 +26,99 @@ import org.eclipse.jpt.jpa.ui.internal.jpa2.details.EmbeddedIdMapping2_0Composit
 import org.eclipse.jpt.jpa.ui.jpa2.details.java.JavaUiFactory2_0;
 import org.eclipse.swt.widgets.Composite;
 
-/**
- *  EclipseLink2_0JpaUiFactory
- */
 public class EclipseLink2_0JavaUiFactory
 	extends EclipseLink1_2JavaUiFactory
 	implements JavaUiFactory2_0
 {
-	public EclipseLink2_0JavaUiFactory() {
-		super();
-	}
-	
-	
-	// **************** java type mapping composites ***************************
+	// ********** type mappings **********
 	
 	@Override
 	public JpaComposite createJavaEntityComposite(
-			PropertyValueModel<JavaEntity> subjectHolder,
-			Composite parent, WidgetFactory widgetFactory) {
-		return new JavaEclipseLinkEntity2_0Composite(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<JavaEntity> entityModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new JavaEclipseLinkEntity2_0Composite(entityModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	@Override
 	public JpaComposite createJavaMappedSuperclassComposite(
-			PropertyValueModel<JavaMappedSuperclass> subjectHolder,
-			Composite parent, WidgetFactory widgetFactory) {
-		return new JavaEclipseLinkMappedSuperclass2_0Composite(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<JavaMappedSuperclass> mappedSuperclassModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new JavaEclipseLinkMappedSuperclass2_0Composite(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	
-	// **************** java attribute mapping composites **********************
+	// ********** attribute mappings **********
 	
 	@Override
 	public JpaComposite createJavaIdMappingComposite(
-			PropertyValueModel<JavaIdMapping> subjectHolder,
+			PropertyValueModel<JavaIdMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new JavaEclipseLinkIdMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new JavaEclipseLinkIdMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	@Override
 	public JpaComposite createJavaEmbeddedIdMappingComposite(
-			PropertyValueModel<JavaEmbeddedIdMapping> subjectHolder, 
+			PropertyValueModel<JavaEmbeddedIdMapping> mappingModel, 
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent, 
-			WidgetFactory widgetFactory) {
-		return new EmbeddedIdMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite, 
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new EmbeddedIdMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	public JpaComposite createJavaElementCollectionMapping2_0Composite(
-			PropertyValueModel<JavaElementCollectionMapping2_0> subjectHolder,
+			PropertyValueModel<JavaElementCollectionMapping2_0> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new JavaEclipseLinkElementCollectionMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new JavaEclipseLinkElementCollectionMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	@Override
 	public JpaComposite createJavaOneToManyMappingComposite(
-			PropertyValueModel<JavaOneToManyMapping> subjectHolder, 
+			PropertyValueModel<JavaOneToManyMapping> mappingModel, 
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent, 
-			WidgetFactory widgetFactory) {
-		return new JavaEclipseLinkOneToManyMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite, 
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new JavaEclipseLinkOneToManyMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	@Override
 	public JpaComposite createJavaOneToOneMappingComposite(
-		PropertyValueModel<JavaOneToOneMapping> subjectHolder,
+		PropertyValueModel<JavaOneToOneMapping> mappingModel,
 		PropertyValueModel<Boolean> enabledModel,
-		Composite parent,
-		WidgetFactory widgetFactory) {
-		return new JavaEclipseLinkOneToOneMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory);
+		Composite parentComposite,
+		WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new JavaEclipseLinkOneToOneMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	@Override
 	public JpaComposite createJavaManyToOneMappingComposite(
-		PropertyValueModel<JavaManyToOneMapping> subjectHolder,
+		PropertyValueModel<JavaManyToOneMapping> mappingModel,
 		PropertyValueModel<Boolean> enabledModel,
-		Composite parent,
-		WidgetFactory widgetFactory) {
-		return new JavaEclipseLinkManyToOneMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory);
+		Composite parentComposite,
+		WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new JavaEclipseLinkManyToOneMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	@Override
 	public JpaComposite createJavaManyToManyMappingComposite(
-			PropertyValueModel<JavaManyToManyMapping> subjectHolder, 
+			PropertyValueModel<JavaManyToManyMapping> mappingModel, 
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent, 
-			WidgetFactory widgetFactory) {
-		return new JavaEclipseLinkManyToManyMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite, 
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new JavaEclipseLinkManyToManyMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
-
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLink2_3JavaUiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLink2_3JavaUiFactory.java
index 044d308da8..b447d4b3de 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLink2_3JavaUiFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLink2_3JavaUiFactory.java
@@ -1,48 +1,42 @@
 /*******************************************************************************
-* Copyright (c) 2011 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
+ * Copyright (c) 2011, 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.java.JavaEntity;
 import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass;
 import org.eclipse.jpt.jpa.ui.details.JpaComposite;
-import org.eclipse.jpt.jpa.ui.jpa2.details.java.JavaUiFactory2_0;
 import org.eclipse.swt.widgets.Composite;
 
-/**
- *  EclipseLink2_0JpaUiFactory
- */
 public class EclipseLink2_3JavaUiFactory
 	extends EclipseLink2_0JavaUiFactory
-	implements JavaUiFactory2_0
 {
-	public EclipseLink2_3JavaUiFactory() {
-		super();
-	}
-
-
-	// **************** java type mapping composites ***************************
+	// ********** type mappings **********
 
 	@Override
 	public JpaComposite createJavaEntityComposite(
-			PropertyValueModel<JavaEntity> subjectHolder,
-			Composite parent, WidgetFactory widgetFactory) {
-		return new JavaEclipseLinkEntity2_3Composite(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<JavaEntity> entityModel,
+			Composite parent,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new JavaEclipseLinkEntity2_3Composite(entityModel, parent, widgetFactory, resourceManager);
 	}
 
 	@Override
 	public JpaComposite createJavaMappedSuperclassComposite(
-			PropertyValueModel<JavaMappedSuperclass> subjectHolder,
-			Composite parent, WidgetFactory widgetFactory) {
-		return new JavaEclipseLinkMappedSuperclass2_3Composite(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<JavaMappedSuperclass> mappedSuperclassModel,
+			Composite parent,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new JavaEclipseLinkMappedSuperclass2_3Composite(mappedSuperclassModel, parent, widgetFactory, resourceManager);
 	}
-
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaUiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaUiFactory.java
index a37e75d94f..83a35414dc 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaUiFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaUiFactory.java
@@ -9,6 +9,7 @@
  *******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.java.JavaBasicMapping;
@@ -34,135 +35,147 @@ import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkOneToOneMa
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkTransformationMappingComposite;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkVariableOneToOneMappingComposite;
 import org.eclipse.jpt.jpa.ui.details.JpaComposite;
-import org.eclipse.jpt.jpa.ui.internal.details.java.BaseJavaUiFactory;
+import org.eclipse.jpt.jpa.ui.internal.details.java.AbstractJavaUiFactory;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkJavaUiFactory extends BaseJavaUiFactory
+public class EclipseLinkJavaUiFactory
+	extends AbstractJavaUiFactory
 {
-	public EclipseLinkJavaUiFactory() {
-		super();
-	}
-	
-	// **************** java type mapping composites ***************************
+	// ********** type mappings **********
 	
 	@Override
 	public JpaComposite createJavaMappedSuperclassComposite(
-			PropertyValueModel<JavaMappedSuperclass> subjectHolder,
-			Composite parent, WidgetFactory widgetFactory) {
-		return new JavaEclipseLinkMappedSuperclassComposite(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<JavaMappedSuperclass> mappedSuperclassModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new JavaEclipseLinkMappedSuperclassComposite(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	@Override
 	public JpaComposite createJavaEntityComposite(
-			PropertyValueModel<JavaEntity> subjectHolder,
-			Composite parent, WidgetFactory widgetFactory) {
-		return new JavaEclipseLinkEntityComposite(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<JavaEntity> entityModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new JavaEclipseLinkEntityComposite(entityModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	@Override
 	public JpaComposite createJavaEmbeddableComposite(
-			PropertyValueModel<JavaEmbeddable> subjectHolder,
-			Composite parent, WidgetFactory widgetFactory) {
-		return new JavaEclipseLinkEmbeddableComposite(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<JavaEmbeddable> embeddableModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new JavaEclipseLinkEmbeddableComposite(embeddableModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	
-	// **************** java attribute mapping composites **********************
+	// ********** attribute mappings **********
 	
 	@Override
 	public JpaComposite createJavaIdMappingComposite(
-			PropertyValueModel<JavaIdMapping> subjectHolder,
+			PropertyValueModel<JavaIdMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new JavaEclipseLinkIdMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new JavaEclipseLinkIdMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	@Override
 	public JpaComposite createJavaBasicMappingComposite(
-			PropertyValueModel<JavaBasicMapping> subjectHolder,
+			PropertyValueModel<JavaBasicMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new JavaEclipseLinkBasicMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new JavaEclipseLinkBasicMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	@Override
 	public JpaComposite createJavaVersionMappingComposite(
-			PropertyValueModel<JavaVersionMapping> subjectHolder,
+			PropertyValueModel<JavaVersionMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new JavaEclipseLinkVersionMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new JavaEclipseLinkVersionMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	@Override
 	public JpaComposite createJavaManyToOneMappingComposite(
-			PropertyValueModel<JavaManyToOneMapping> subjectHolder, 
+			PropertyValueModel<JavaManyToOneMapping> mappingModel, 
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent, 
-			WidgetFactory widgetFactory) {
-		return new EclipseLinkManyToOneMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite, 
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new EclipseLinkManyToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	@Override
 	public JpaComposite createJavaOneToManyMappingComposite(
-			PropertyValueModel<JavaOneToManyMapping> subjectHolder, 
+			PropertyValueModel<JavaOneToManyMapping> mappingModel, 
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent, 
-			WidgetFactory widgetFactory) {
-		return new EclipseLinkOneToManyMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite, 
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new EclipseLinkOneToManyMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	@Override
 	public JpaComposite createJavaOneToOneMappingComposite(
-			PropertyValueModel<JavaOneToOneMapping> subjectHolder, 
+			PropertyValueModel<JavaOneToOneMapping> mappingModel, 
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent, 
-			WidgetFactory widgetFactory) {
-		return new EclipseLinkOneToOneMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite, 
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new EclipseLinkOneToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	@Override
 	public JpaComposite createJavaManyToManyMappingComposite(
-			PropertyValueModel<JavaManyToManyMapping> subjectHolder, 
+			PropertyValueModel<JavaManyToManyMapping> mappingModel, 
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent, 
-			WidgetFactory widgetFactory) {
-		return new EclipseLinkManyToManyMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite, 
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new EclipseLinkManyToManyMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	public JpaComposite createJavaEclipseLinkBasicMapMappingComposite(
-			PropertyValueModel<EclipseLinkBasicMapMapping> subjectHolder,
+			PropertyValueModel<EclipseLinkBasicMapMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new EclipseLinkBasicMapMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new EclipseLinkBasicMapMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	public JpaComposite createJavaEclipseLinkBasicCollectionMappingComposite(
-			PropertyValueModel<EclipseLinkBasicCollectionMapping> subjectHolder,
+			PropertyValueModel<EclipseLinkBasicCollectionMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new EclipseLinkBasicCollectionMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new EclipseLinkBasicCollectionMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	public JpaComposite createJavaEclipseLinkVariableOneToOneMappingComposite(
-			PropertyValueModel<EclipseLinkVariableOneToOneMapping> subjectHolder,
+			PropertyValueModel<EclipseLinkVariableOneToOneMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new EclipseLinkVariableOneToOneMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new EclipseLinkVariableOneToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	public JpaComposite createJavaEclipseLinkTransformationMappingComposite(
-			PropertyValueModel<EclipseLinkTransformationMapping> subjectHolder,
+			PropertyValueModel<EclipseLinkTransformationMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new EclipseLinkTransformationMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new EclipseLinkTransformationMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
-
-
-}
-\ No newline at end of file
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkArrayMapping2_3UiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkArrayMapping2_3UiDefinition.java
index 158ee1caab..d1427a16e9 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkArrayMapping2_3UiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkArrayMapping2_3UiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
@@ -45,13 +46,7 @@ public class JavaEclipseLinkArrayMapping2_3UiDefinition
 	}
 
 
-	public JpaComposite buildAttributeMappingComposite(
-			JavaUiFactory factory,
-			PropertyValueModel<EclipseLinkArrayMapping2_3> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-
-		return new EclipseLinkArrayMapping2_3Composite(subjectHolder, enabledModel, parent, widgetFactory);
+	public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<EclipseLinkArrayMapping2_3> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return new EclipseLinkArrayMapping2_3Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkBasicCollectionMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkBasicCollectionMappingUiDefinition.java
index 9f82c7169a..a5496453d4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkBasicCollectionMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkBasicCollectionMappingUiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
@@ -44,14 +45,7 @@ public class JavaEclipseLinkBasicCollectionMappingUiDefinition
 		super();
 	}
 	
-	
-	public JpaComposite buildAttributeMappingComposite(
-			JavaUiFactory factory,
-			PropertyValueModel<EclipseLinkBasicCollectionMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return new EclipseLinkBasicCollectionMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+	public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<EclipseLinkBasicCollectionMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return new EclipseLinkBasicCollectionMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkBasicMapMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkBasicMapMappingUiDefinition.java
index 5d4e91baa0..681c123e79 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkBasicMapMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkBasicMapMappingUiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
@@ -44,14 +45,7 @@ public class JavaEclipseLinkBasicMapMappingUiDefinition
 		super();
 	}
 	
-	
-	public JpaComposite buildAttributeMappingComposite(
-			JavaUiFactory factory,
-			PropertyValueModel<EclipseLinkBasicMapMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return new EclipseLinkBasicMapMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+	public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<EclipseLinkBasicMapMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return new EclipseLinkBasicMapMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkBasicMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkBasicMappingComposite.java
index cdc8e748ab..8019011f18 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkBasicMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkBasicMappingComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.BasicMapping;
@@ -22,21 +23,16 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 
-public class JavaEclipseLinkBasicMappingComposite extends EclipseLinkBasicMappingComposite<BasicMapping>
+public class JavaEclipseLinkBasicMappingComposite
+	extends EclipseLinkBasicMappingComposite<BasicMapping>
 {
-	/**
-	 * Creates a new <code>EclipseLink1_1OrmBasicMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>BasicMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public JavaEclipseLinkBasicMappingComposite(PropertyValueModel<? extends BasicMapping> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-									WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public JavaEclipseLinkBasicMappingComposite(
+			PropertyValueModel<? extends BasicMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkElementCollectionMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkElementCollectionMapping2_0Composite.java
index 926b19da19..2abc55b4a3 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkElementCollectionMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkElementCollectionMapping2_0Composite.java
@@ -9,19 +9,13 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
-import org.eclipse.jpt.common.utility.internal.model.value.CompositeBooleanPropertyValueModel;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
-import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
-import org.eclipse.jpt.jpa.core.context.Converter;
-import org.eclipse.jpt.jpa.core.context.ConvertibleMapping;
 import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaElementCollectionMapping2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConvert;
 import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkElementCollectionMapping2_0;
 import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch;
-import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkConvertCombo;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkElementCollectionMapping2_0Composite;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkJoinFetchComboViewer;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages;
@@ -31,29 +25,20 @@ import org.eclipse.jpt.jpa.ui.internal.jpa2.details.CollectionTable2_0Composite;
 import org.eclipse.jpt.jpa.ui.internal.jpa2.details.JptUiDetailsMessages2_0;
 import org.eclipse.jpt.jpa.ui.internal.jpa2.details.TargetClassChooser;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
 import org.eclipse.ui.forms.widgets.Hyperlink;
-import org.eclipse.ui.forms.widgets.Section;
 
 public class JavaEclipseLinkElementCollectionMapping2_0Composite
 	extends EclipseLinkElementCollectionMapping2_0Composite<JavaElementCollectionMapping2_0>
 {
-	/**
-	 * Creates a new <code>EclipseLink1_1OrmBasicMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>BasicMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public JavaEclipseLinkElementCollectionMapping2_0Composite(PropertyValueModel<? extends JavaElementCollectionMapping2_0> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-									WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public JavaEclipseLinkElementCollectionMapping2_0Composite(
+			PropertyValueModel<? extends JavaElementCollectionMapping2_0> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
@@ -89,63 +74,4 @@ public class JavaEclipseLinkElementCollectionMapping2_0Composite
 			}
 		};
 	}
-
-	@Override
-	protected Composite buildBasicValueTypeSectionClient(Section section) {
-		Composite container = super.buildBasicValueTypeSectionClient(section);
-		PropertyValueModel<Converter> converterHolder = buildConverterHolder();
-
-		// EclipseLink Converter
-		Button elConverterButton = addRadioButton(
-			container, 
-			EclipseLinkUiDetailsMessages.TypeSection_converted, 
-			buildConverterBooleanHolder(EclipseLinkConvert.class), 
-			null);
-		((GridData) elConverterButton.getLayoutData()).horizontalSpan = 2;
-
-		PropertyValueModel<EclipseLinkConvert> convertHolder = buildEclipseLinkConverterHolder(converterHolder);
-		PropertyValueModel<Boolean> convertEnabledModel = CompositeBooleanPropertyValueModel.and(getEnabledModel(), buildEclipseLinkConvertBooleanHolder(convertHolder));
-		Label convertLabel = this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkConvertComposite_converterNameLabel, convertEnabledModel);
-		GridData gridData = new GridData();
-		gridData.horizontalIndent = 20;
-		convertLabel.setLayoutData(gridData);
-		registerSubPane(new EclipseLinkConvertCombo(convertHolder, convertEnabledModel, container, getWidgetFactory()));
-
-		return container;
-	}
-
-	protected PropertyValueModel<Converter> buildConverterHolder() {
-		return new PropertyAspectAdapter<ConvertibleMapping, Converter>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) {
-			@Override
-			protected Converter buildValue_() {
-				return this.subject.getConverter();
-			}
-		};
-	}
-
-	protected ModifiablePropertyValueModel<Boolean> buildConverterBooleanHolder(final Class<? extends Converter> converterType) {
-		return new PropertyAspectAdapter<ConvertibleMapping, Boolean>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) {
-			@Override
-			protected Boolean buildValue_() {
-				Converter converter = this.subject.getConverter();
-				return Boolean.valueOf(converter.getType() == converterType);
-			}
-
-			@Override
-			protected void setValue_(Boolean value) {
-				if (value.booleanValue()) {
-					this.subject.setConverter(converterType);
-				}
-			}
-		};
-	}
-
-	protected PropertyValueModel<EclipseLinkConvert> buildEclipseLinkConverterHolder(PropertyValueModel<Converter> converterHolder) {
-		return new TransformationPropertyValueModel<Converter, EclipseLinkConvert>(converterHolder) {
-			@Override
-			protected EclipseLinkConvert transform_(Converter converter) {
-				return converter.getType() == EclipseLinkConvert.class ? (EclipseLinkConvert) converter : null;
-			}
-		};
-	}
-}
-\ No newline at end of file
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEmbeddable1_2Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEmbeddable1_2Composite.java
index 779da80043..28e1f54760 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEmbeddable1_2Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEmbeddable1_2Composite.java
@@ -9,70 +9,41 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
-import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.jpa.core.context.AccessHolder;
-import org.eclipse.jpt.jpa.core.context.Embeddable;
 import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddable;
-import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory;
 import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
 import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.forms.widgets.Section;
 
-/**
- * This pane does not have any widgets.
- *
- * @see Embeddable
- * @see JavaUiFactory - The factory creating this pane
- * @see EmbeddableUiProvider
- *
- * @version 2.3
- * @since 2.1
- */
-public class JavaEclipseLinkEmbeddable1_2Composite extends AbstractJavaEclipseLinkEmbeddableComposite
+public class JavaEclipseLinkEmbeddable1_2Composite
+	extends AbstractJavaEclipseLinkEmbeddableComposite
 {
-	/**
-	 * Creates a new <code>EmbeddableComposite</code>.
-	 *
-	 * @param subjectHolder The holder of this pane's subject
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public JavaEclipseLinkEmbeddable1_2Composite(PropertyValueModel<? extends JavaEmbeddable> subjectHolder,
-	                           Composite parent,
-	                           WidgetFactory widgetFactory) {
-
-		super(subjectHolder, parent, widgetFactory);
+	public JavaEclipseLinkEmbeddable1_2Composite(
+			PropertyValueModel<? extends JavaEmbeddable> embeddableModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(embeddableModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
 	protected void initializeLayout(Composite container) {
 		this.initializeEmbeddableCollapsibleSection(container);
-		this.initializeConvertersCollapsibleSection(container);
-		this.initializeAdvancedCollapsibleSection(container);
+		super.initializeLayout(container);
 	}
 
 	@Override
-	protected Control initializeEmbeddableSection(Composite container) {
-		container = this.addSubPane(container, 2, 0, 0, 0, 0);
+	protected Control buildEmbeddableSectionClient(Section embeddableSection) {
+		Composite container = this.addSubPane(embeddableSection, 2, 0, 0, 0, 0);
 
 		// Access type widgets
 		this.addLabel(container, JptUiMessages.AccessTypeComposite_access);
-		new AccessTypeComboViewer(this, this.buildAccessHolder(), container);
+		new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container);
 
 		return container;
 	}
-
-	protected PropertyValueModel<AccessHolder> buildAccessHolder() {
-		return new PropertyAspectAdapter<JavaEmbeddable, AccessHolder>(
-			getSubjectHolder())
-		{
-			@Override
-			protected AccessHolder buildValue_() {
-				return this.subject.getPersistentType();
-			}
-		};
-	}
-}
-\ No newline at end of file
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEmbeddableComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEmbeddableComposite.java
index 4e530bdd45..7b1bfb618d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEmbeddableComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEmbeddableComposite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2012 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,36 +9,27 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.jpa.core.context.Embeddable;
 import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddable;
-import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.forms.widgets.Section;
 
-/**
- * This pane does not have any widgets.
- *
- * @see Embeddable
- * @see JavaUiFactory - The factory creating this pane
- * @see EmbeddableUiProvider
- *
- * @version 2.3
- * @since 2.1
- */
-public class JavaEclipseLinkEmbeddableComposite extends AbstractJavaEclipseLinkEmbeddableComposite
+public class JavaEclipseLinkEmbeddableComposite
+	extends AbstractJavaEclipseLinkEmbeddableComposite
 {
-	/**
-	 * Creates a new <code>EmbeddableComposite</code>.
-	 *
-	 * @param subjectHolder The holder of this pane's subject
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public JavaEclipseLinkEmbeddableComposite(PropertyValueModel<? extends JavaEmbeddable> subjectHolder,
-	                           Composite parent,
-	                           WidgetFactory widgetFactory) {
+	public JavaEclipseLinkEmbeddableComposite(
+			PropertyValueModel<? extends JavaEmbeddable> embeddableModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(embeddableModel, parentComposite, widgetFactory, resourceManager);
+	}
 
-		super(subjectHolder, parent, widgetFactory);
+	@Override
+	protected Control buildEmbeddableSectionClient(Section embeddableSection) {
+		throw new UnsupportedOperationException();  // shouldn't happen
 	}
 }
 \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEntity1_2Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEntity1_2Composite.java
index c7fbd63e61..4a87353e71 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEntity1_2Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEntity1_2Composite.java
@@ -9,12 +9,12 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.AccessHolder;
 import org.eclipse.jpt.jpa.core.context.java.JavaEntity;
-import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkEntity;
 import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
 import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer;
 import org.eclipse.jpt.jpa.ui.internal.details.EntityNameCombo;
@@ -26,31 +26,15 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 
-/**
- * The pane used for an EclipseLink1.2 Java entity.
- *
- * @see JavaEclipseLinkEntity
- * @see EclipselinkJpaUiFactory - The factory creating this pane
- *
- * @version 2.3
- * @since 2.2
- */
 public class JavaEclipseLinkEntity1_2Composite
 	extends AbstractJavaEclipseLinkEntityComposite<JavaEntity>
 {
-	/**
-	 * Creates a new <code>EclipseLinkJavaEntityComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>JavaEntity</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
 	public JavaEclipseLinkEntity1_2Composite(
-			PropertyValueModel<? extends JavaEntity> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-
-		super(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<? extends JavaEntity> entityModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(entityModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEntity2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEntity2_0Composite.java
index 6bdc55c5bc..adc68e70b0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEntity2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEntity2_0Composite.java
@@ -9,37 +9,21 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.java.JavaEntity;
-import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkEntity;
 import org.eclipse.swt.widgets.Composite;
 
-/**
- * The pane used for an EclipseLink 2.0 Java entity.
- *
- * @see JavaEclipseLinkEntity
- * @see EclipselinkJpaUiFactory - The factory creating this pane
- *
- * @version 3.1
- * @since 2.2
- */
 public class JavaEclipseLinkEntity2_0Composite
 	extends AbstractJavaEclipseLinkEntity2_xComposite
 {
-	/**
-	 * Creates a new <code>EclipseLinkJavaEntityComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>JavaEntity</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
 	public JavaEclipseLinkEntity2_0Composite(
-			PropertyValueModel<? extends JavaEntity> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-
-		super(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<? extends JavaEntity> entityModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(entityModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEntity2_3Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEntity2_3Composite.java
index 9efe4fc2a2..f01ae1ba2a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEntity2_3Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEntity2_3Composite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -25,21 +26,15 @@ import org.eclipse.ui.forms.events.ExpansionEvent;
 import org.eclipse.ui.forms.widgets.ExpandableComposite;
 import org.eclipse.ui.forms.widgets.Section;
 
-/**
- * The pane used for an EclipseLink 2.3 Java entity.
- *
- * @version 3.1
- * @since 3.1
- */
 public class JavaEclipseLinkEntity2_3Composite
 	extends AbstractJavaEclipseLinkEntity2_xComposite
 {
 	public JavaEclipseLinkEntity2_3Composite(
-			PropertyValueModel<? extends JavaEntity> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-
-		super(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<? extends JavaEntity> entityModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(entityModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEntityComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEntityComposite.java
index 33b4aa98ea..0d03fa523f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEntityComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEntityComposite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2012 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,36 +9,20 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.java.JavaEntity;
-import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkEntity;
 import org.eclipse.swt.widgets.Composite;
 
-/**
- * The pane used for an EclipseLink Java entity.
- *
- * @see JavaEclipseLinkEntity
- * @see EclipselinkJpaUiFactory - The factory creating this pane
- *
- * @version 2.1
- * @since 2.1
- */
 public class JavaEclipseLinkEntityComposite
 	extends AbstractJavaEclipseLinkEntityComposite<JavaEntity>
 {
-	/**
-	 * Creates a new <code>EclipseLinkJavaEntityComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>JavaEntity</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
 	public JavaEclipseLinkEntityComposite(
-			PropertyValueModel<? extends JavaEntity> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<? extends JavaEntity> entityModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(entityModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkIdMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkIdMapping2_0Composite.java
index 157b40223a..1c92b42d00 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkIdMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkIdMapping2_0Composite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.java.JavaIdMapping;
@@ -24,12 +25,12 @@ public class JavaEclipseLinkIdMapping2_0Composite
 	extends EclipseLinkIdMappingComposite<JavaIdMapping>
 {
 	public JavaEclipseLinkIdMapping2_0Composite(
-			PropertyValueModel<? extends JavaIdMapping> subjectHolder,
+			PropertyValueModel<? extends JavaIdMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkIdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkIdMappingComposite.java
index 9ef1ddb7df..24f1837efa 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkIdMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkIdMappingComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.IdMapping;
@@ -19,12 +20,12 @@ public class JavaEclipseLinkIdMappingComposite
 	extends EclipseLinkIdMappingComposite<IdMapping>
 {
 	public JavaEclipseLinkIdMappingComposite(
-			PropertyValueModel<? extends IdMapping> subjectHolder,
+			PropertyValueModel<? extends IdMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-	        WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkManyToManyMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkManyToManyMapping2_0Composite.java
index 01b5616d3c..aef4720eea 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkManyToManyMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkManyToManyMapping2_0Composite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -31,12 +32,12 @@ public class JavaEclipseLinkManyToManyMapping2_0Composite
 	extends EclipseLinkManyToManyMappingComposite<ManyToManyMapping>
 {
 	public JavaEclipseLinkManyToManyMapping2_0Composite(
-			PropertyValueModel<? extends ManyToManyMapping> subjectHolder,
+			PropertyValueModel<? extends ManyToManyMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkManyToOneMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkManyToOneMapping2_0Composite.java
index 5c82afec90..94759b084b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkManyToOneMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkManyToOneMapping2_0Composite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -33,12 +34,12 @@ public class JavaEclipseLinkManyToOneMapping2_0Composite
 	extends AbstractManyToOneMapping2_0Composite<JavaManyToOneMapping, JavaManyToOneRelationship2_0>
 {
 	public JavaEclipseLinkManyToOneMapping2_0Composite(
-			PropertyValueModel<? extends JavaManyToOneMapping> subjectHolder,
+			PropertyValueModel<? extends JavaManyToOneMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-	        WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+	        WidgetFactory widgetFactory,
+	        ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclass1_2Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclass1_2Composite.java
index 87dc67f9da..8d04f01b8f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclass1_2Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclass1_2Composite.java
@@ -9,12 +9,12 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.AccessHolder;
 import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkMappedSuperclass;
 import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
 import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer;
 import org.eclipse.jpt.jpa.ui.internal.details.IdClassChooser;
@@ -23,31 +23,15 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 
-/**
- * The pane used for an EclipseLink Java Mapped Superclass.
- *
- * @see EclipseLinkMappedSuperclass
- * @see EclipselinkJpaUiFactory - The factory creating this pane
- *
- * @version 2.3
- * @since 2.1
- */
 public class JavaEclipseLinkMappedSuperclass1_2Composite
 	extends AbstractJavaEclipseLinkMappedSuperclassComposite
 {
-	/**
-	 * Creates a new <code>MappedSuperclassComposite</code>.
-	 *
-	 * @param subjectHolder The holder of this pane's subject
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
 	public JavaEclipseLinkMappedSuperclass1_2Composite(
-			PropertyValueModel<? extends JavaMappedSuperclass> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<? extends JavaMappedSuperclass> mappedSuperclassModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclass2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclass2_0Composite.java
index 020fb34110..2f88bd4ac4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclass2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclass2_0Composite.java
@@ -9,12 +9,12 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.AccessHolder;
 import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkMappedSuperclass;
 import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
 import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer;
 import org.eclipse.jpt.jpa.ui.internal.details.IdClassChooser;
@@ -23,31 +23,15 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 
-/**
- * The pane used for an EclipseLink Java Mapped Superclass.
- *
- * @see EclipseLinkMappedSuperclass
- * @see EclipselinkJpaUiFactory - The factory creating this pane
- *
- * @version 2.3
- * @since 2.3
- */
 public class JavaEclipseLinkMappedSuperclass2_0Composite
 	extends AbstractJavaEclipseLinkMappedSuperclassComposite
 {
-	/**
-	 * Creates a new <code>MappedSuperclassComposite</code>.
-	 *
-	 * @param subjectHolder The holder of this pane's subject
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
 	public JavaEclipseLinkMappedSuperclass2_0Composite(
-			PropertyValueModel<? extends JavaMappedSuperclass> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<? extends JavaMappedSuperclass> mappedSuperclassModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclass2_1Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclass2_1Composite.java
index 59a9d12570..a6b22f1cc0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclass2_1Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclass2_1Composite.java
@@ -9,12 +9,12 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.AccessHolder;
 import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkMappedSuperclass;
 import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
 import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer;
 import org.eclipse.jpt.jpa.ui.internal.details.IdClassChooser;
@@ -23,24 +23,15 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 
-/**
- * The pane used for an EclipseLink Java Mapped Superclass.
- *
- * @see EclipseLinkMappedSuperclass
- * @see EclipselinkJpaUiFactory - The factory creating this pane
- *
- * @version 3.3
- * @since 3.3
- */
 public class JavaEclipseLinkMappedSuperclass2_1Composite
 	extends AbstractJavaEclipseLinkMappedSuperclassComposite
 {
 	public JavaEclipseLinkMappedSuperclass2_1Composite(
-			PropertyValueModel<? extends JavaMappedSuperclass> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<? extends JavaMappedSuperclass> mappedSuperclassModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
@@ -81,4 +72,4 @@ public class JavaEclipseLinkMappedSuperclass2_1Composite
 	protected Control initializeCachingSection(Composite container) {
 		return new JavaEclipseLinkCaching2_0Composite(this, this.buildCachingHolder(), container).getControl();
 	}
-}
-\ No newline at end of file
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclass2_3Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclass2_3Composite.java
index 4c0ddf0e29..a0bfa31b8b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclass2_3Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclass2_3Composite.java
@@ -9,12 +9,12 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.AccessHolder;
 import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkMappedSuperclass;
 import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkMappedSuperclass;
 import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkMultitenancy2_3;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkMultitenancyComposite;
@@ -32,31 +32,15 @@ import org.eclipse.ui.forms.widgets.ExpandableComposite;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 import org.eclipse.ui.forms.widgets.Section;
 
-/**
- * The pane used for an EclipseLink 2.3 Java Mapped Superclass.
- *
- * @see EclipseLinkMappedSuperclass
- * @see EclipselinkJpaUiFactory - The factory creating this pane
- *
- * @version 3.1
- * @since 3.1
- */
 public class JavaEclipseLinkMappedSuperclass2_3Composite
 	extends AbstractJavaEclipseLinkMappedSuperclassComposite
 {
-	/**
-	 * Creates a new <code>MappedSuperclassComposite</code>.
-	 *
-	 * @param subjectHolder The holder of this pane's subject
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
 	public JavaEclipseLinkMappedSuperclass2_3Composite(
-			PropertyValueModel<? extends JavaMappedSuperclass> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-
-		super(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<? extends JavaMappedSuperclass> mappedSuperclassModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
@@ -126,4 +110,4 @@ public class JavaEclipseLinkMappedSuperclass2_3Composite
 			}
 		};
 	}
-}
-\ No newline at end of file
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclassComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclassComposite.java
index c7cb0b2dec..e081e30b5b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclassComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclassComposite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2012 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,36 +9,20 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkMappedSuperclass;
 import org.eclipse.swt.widgets.Composite;
 
-/**
- * The pane used for an EclipseLink Java Mapped Superclass.
- *
- * @see EclipseLinkMappedSuperclass
- * @see EclipselinkJpaUiFactory - The factory creating this pane
- *
- * @version 2.1
- * @since 2.1
- */
 public class JavaEclipseLinkMappedSuperclassComposite
 	extends AbstractJavaEclipseLinkMappedSuperclassComposite
 {
-	/**
-	 * Creates a new <code>MappedSuperclassComposite</code>.
-	 *
-	 * @param subjectHolder The holder of this pane's subject
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
 	public JavaEclipseLinkMappedSuperclassComposite(
-			PropertyValueModel<? extends JavaMappedSuperclass> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<? extends JavaMappedSuperclass> mappedSuperclassModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
 \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkOneToManyMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkOneToManyMapping2_0Composite.java
index 6ba80b40a0..1bca1dbdc3 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkOneToManyMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkOneToManyMapping2_0Composite.java
@@ -1,14 +1,15 @@
 /*******************************************************************************
-* Copyright (c) 2009, 2012 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
+ * Copyright (c) 2009, 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ *
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -34,12 +35,12 @@ public class JavaEclipseLinkOneToManyMapping2_0Composite
 	extends EclipseLinkOneToManyMappingComposite<JavaOneToManyMapping>
 {
 	public JavaEclipseLinkOneToManyMapping2_0Composite(
-			PropertyValueModel<? extends JavaOneToManyMapping> subjectHolder,
+			PropertyValueModel<? extends JavaOneToManyMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkOneToOneMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkOneToOneMapping2_0Composite.java
index b438e63966..f1d4f3a2ac 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkOneToOneMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkOneToOneMapping2_0Composite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -39,12 +40,12 @@ public class JavaEclipseLinkOneToOneMapping2_0Composite
 	extends AbstractOneToOneMapping2_0Composite<JavaOneToOneMapping, JavaOneToOneRelationship2_0>
 {
 	public JavaEclipseLinkOneToOneMapping2_0Composite(
-			PropertyValueModel<? extends JavaOneToOneMapping> subjectHolder,
+			PropertyValueModel<? extends JavaOneToOneMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+	        WidgetFactory widgetFactory,
+	        ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkStructureMapping2_3UiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkStructureMapping2_3UiDefinition.java
index 9cf6e91a19..680704451b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkStructureMapping2_3UiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkStructureMapping2_3UiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
@@ -44,14 +45,7 @@ public class JavaEclipseLinkStructureMapping2_3UiDefinition
 		super();
 	}
 
-
-	public JpaComposite buildAttributeMappingComposite(
-			JavaUiFactory factory,
-			PropertyValueModel<EclipseLinkStructureMapping2_3> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return new EclipseLinkStructureMapping2_3Composite(subjectHolder, enabledModel, parent, widgetFactory);
+	public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<EclipseLinkStructureMapping2_3> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return new EclipseLinkStructureMapping2_3Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkTransformationMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkTransformationMappingUiDefinition.java
index 8e7dbc145e..dc7ab62928 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkTransformationMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkTransformationMappingUiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
@@ -44,14 +45,7 @@ public class JavaEclipseLinkTransformationMappingUiDefinition
 		super();
 	}
 	
-	
-	public JpaComposite buildAttributeMappingComposite(
-			JavaUiFactory factory,
-			PropertyValueModel<EclipseLinkTransformationMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel, 
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return new EclipseLinkTransformationMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+	public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<EclipseLinkTransformationMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return new EclipseLinkTransformationMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkVariableOneToOneMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkVariableOneToOneMappingUiDefinition.java
index e583209518..a94b200c6b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkVariableOneToOneMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkVariableOneToOneMappingUiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
@@ -44,14 +45,7 @@ public class JavaEclipseLinkVariableOneToOneMappingUiDefinition
 		super();
 	}
 	
-	
-	public JpaComposite buildAttributeMappingComposite(
-			JavaUiFactory factory,
-			PropertyValueModel<EclipseLinkVariableOneToOneMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return new EclipseLinkVariableOneToOneMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+	public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<EclipseLinkVariableOneToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return new EclipseLinkVariableOneToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkVersionMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkVersionMappingComposite.java
index 9b81692e80..4cc6f9e929 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkVersionMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkVersionMappingComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.VersionMapping;
@@ -18,19 +19,13 @@ import org.eclipse.swt.widgets.Composite;
 public class JavaEclipseLinkVersionMappingComposite
 	extends EclipseLinkVersionMappingComposite<VersionMapping>
 {
-	/**
-	 * Creates a new <code>EclipseLinkOrmVersionMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>VersionMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public JavaEclipseLinkVersionMappingComposite(PropertyValueModel<? extends VersionMapping> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-									WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public JavaEclipseLinkVersionMappingComposite(
+			PropertyValueModel<? extends VersionMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractEclipseLinkEntityMappingsDetailsPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractEclipseLinkEntityMappingsDetailsPageManager.java
index 9c9390641e..23cf161fae 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractEclipseLinkEntityMappingsDetailsPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractEclipseLinkEntityMappingsDetailsPageManager.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
@@ -20,7 +21,7 @@ import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkConverters
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages;
 import org.eclipse.jpt.jpa.ui.internal.details.db.CatalogCombo;
 import org.eclipse.jpt.jpa.ui.internal.details.db.SchemaCombo;
-import org.eclipse.jpt.jpa.ui.internal.details.orm.AbstractEntityMappingsDetailsPage;
+import org.eclipse.jpt.jpa.ui.internal.details.orm.AbstractEntityMappingsDetailsPageManager;
 import org.eclipse.jpt.jpa.ui.internal.details.orm.EntityMappingsGeneratorsComposite;
 import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPackageChooser;
 import org.eclipse.jpt.jpa.ui.internal.details.orm.PersistenceUnitMetadataComposite;
@@ -74,30 +75,18 @@ import org.eclipse.ui.forms.widgets.Section;
  * -----------------------------------------------------------------------------</pre>
  *
  * @see EntityMappings
- * @see AbstractEclipseLinkEntityMappingsDetailsPage - The parent container
  * @see CatalogCombo
  * @see EnumFormComboViewer
  * @see EntityMappingsGeneratorsComposite
  * @see OrmPackageChooser
- * @see QueriesComposite
  * @see PersistenceUnitMetadataComposite
  * @see SchemaCombo
- *
- * @version 2.3
- * @since 2.1
  */
-public abstract class AbstractEclipseLinkEntityMappingsDetailsPage extends AbstractEntityMappingsDetailsPage
+public abstract class AbstractEclipseLinkEntityMappingsDetailsPageManager
+	extends AbstractEntityMappingsDetailsPageManager
 {
-	/**
-	 * Creates a new <code>EclipseLinkEntityMappingsDetailsPage</code>.
-	 *
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	protected AbstractEclipseLinkEntityMappingsDetailsPage(Composite parent,
-	                                 WidgetFactory widgetFactory) {
-
-		super(parent, widgetFactory);
+	protected AbstractEclipseLinkEntityMappingsDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		super(parent, widgetFactory, resourceManager);
 	}
 
 	@Override
@@ -136,4 +125,4 @@ public abstract class AbstractEclipseLinkEntityMappingsDetailsPage extends Abstr
 			}
 		};
 	}
-}
-\ No newline at end of file
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractEclipseLinkOrmXmlUiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractEclipseLinkOrmXmlUiFactory.java
new file mode 100644
index 0000000000..348c8ca805
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractEclipseLinkOrmXmlUiFactory.java
@@ -0,0 +1,145 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ *
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
+
+import org.eclipse.jface.resource.ResourceManager;
+import org.eclipse.jpt.common.ui.WidgetFactory;
+import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
+import org.eclipse.jpt.jpa.core.context.orm.OrmBasicMapping;
+import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddable;
+import org.eclipse.jpt.jpa.core.context.orm.OrmEntity;
+import org.eclipse.jpt.jpa.core.context.orm.OrmIdMapping;
+import org.eclipse.jpt.jpa.core.context.orm.OrmManyToManyMapping;
+import org.eclipse.jpt.jpa.core.context.orm.OrmManyToOneMapping;
+import org.eclipse.jpt.jpa.core.context.orm.OrmMappedSuperclass;
+import org.eclipse.jpt.jpa.core.context.orm.OrmOneToManyMapping;
+import org.eclipse.jpt.jpa.core.context.orm.OrmOneToOneMapping;
+import org.eclipse.jpt.jpa.core.context.orm.OrmTransientMapping;
+import org.eclipse.jpt.jpa.core.context.orm.OrmVersionMapping;
+import org.eclipse.jpt.jpa.ui.details.JpaComposite;
+import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingComposite;
+import org.eclipse.jpt.jpa.ui.internal.details.orm.AbstractOrmXmlUiFactory;
+import org.eclipse.swt.widgets.Composite;
+
+public abstract class AbstractEclipseLinkOrmXmlUiFactory
+	extends AbstractOrmXmlUiFactory
+{
+	// ********** type mappings **********
+
+	@Override
+	public JpaComposite createOrmMappedSuperclassComposite(
+			PropertyValueModel<OrmMappedSuperclass> mappedSuperclassModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEclipseLinkMappedSuperclassComposite(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager);
+	}
+
+	@Override
+	public JpaComposite createOrmEntityComposite(
+			PropertyValueModel<OrmEntity> entityModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEclipseLinkEntityComposite(entityModel, parentComposite, widgetFactory, resourceManager);
+	}
+
+	@Override
+	public JpaComposite createOrmEmbeddableComposite(
+			PropertyValueModel<OrmEmbeddable> embeddableModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEclipseLinkEmbeddableComposite(embeddableModel, parentComposite, widgetFactory, resourceManager);
+	}
+
+
+	// ********** attribute mappings **********
+
+	@Override
+	public JpaComposite createOrmIdMappingComposite(
+			PropertyValueModel<OrmIdMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEclipseLinkIdMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
+	}
+
+	@Override
+	public JpaComposite createOrmBasicMappingComposite(
+			PropertyValueModel<OrmBasicMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEclipseLinkBasicMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
+	}
+
+	@Override
+	public JpaComposite createOrmVersionMappingComposite(
+			PropertyValueModel<OrmVersionMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEclipseLinkVersionMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
+	}
+
+	@Override
+	public JpaComposite createOrmManyToOneMappingComposite(
+			PropertyValueModel<OrmManyToOneMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEclipseLinkManyToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
+	}
+
+	@Override
+	public JpaComposite createOrmOneToManyMappingComposite(
+			PropertyValueModel<OrmOneToManyMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEclipseLinkOneToManyMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
+	}
+
+	@Override
+	public JpaComposite createOrmOneToOneMappingComposite(
+			PropertyValueModel<OrmOneToOneMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEclipseLinkOneToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
+	}
+
+	@Override
+	public JpaComposite createOrmManyToManyMappingComposite(
+			PropertyValueModel<OrmManyToManyMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEclipseLinkManyToManyMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
+	}
+
+	@Override
+	public JpaComposite createOrmTransientMappingComposite(
+			PropertyValueModel<OrmTransientMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new TransientMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
+	}
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractOrmEclipseLinkEntity2_xComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractOrmEclipseLinkEntity2_xComposite.java
index 1e0d07db59..b380e13f29 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractOrmEclipseLinkEntity2_xComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractOrmEclipseLinkEntity2_xComposite.java
@@ -1,15 +1,15 @@
 /*******************************************************************************
- *  Copyright (c) 2011, 2012 Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
+ * Copyright (c) 2011, 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ *
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.orm.OrmEntity;
@@ -19,12 +19,15 @@ import org.eclipse.jpt.jpa.ui.internal.jpa2.details.Queries2_0Composite;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 
-public abstract class AbstractOrmEclipseLinkEntity2_xComposite extends AbstractOrmEclipseLinkEntityComposite
+public abstract class AbstractOrmEclipseLinkEntity2_xComposite
+	extends AbstractOrmEclipseLinkEntityComposite
 {
 	protected AbstractOrmEclipseLinkEntity2_xComposite(
-			PropertyValueModel<? extends OrmEntity> subjectHolder,
-			Composite parent, WidgetFactory widgetFactory) {
-		super(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<? extends OrmEntity> entityModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(entityModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractOrmEclipseLinkEntityComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractOrmEclipseLinkEntityComposite.java
index b72784588d..6a68266001 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractOrmEclipseLinkEntityComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractOrmEclipseLinkEntityComposite.java
@@ -1,15 +1,15 @@
 /*******************************************************************************
- *  Copyright (c) 2008, 2012 Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
+ * Copyright (c) 2006, 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ *
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -29,12 +29,15 @@ import org.eclipse.ui.forms.events.ExpansionEvent;
 import org.eclipse.ui.forms.widgets.ExpandableComposite;
 import org.eclipse.ui.forms.widgets.Section;
 
-public abstract class AbstractOrmEclipseLinkEntityComposite extends AbstractOrmEntityComposite
+public abstract class AbstractOrmEclipseLinkEntityComposite
+	extends AbstractOrmEntityComposite
 {
 	protected AbstractOrmEclipseLinkEntityComposite(
-			PropertyValueModel<? extends OrmEntity> subjectHolder,
-			Composite parent, WidgetFactory widgetFactory) {
-		super(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<? extends OrmEntity> entityModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(entityModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractOrmEclipseLinkMappedSuperclassComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractOrmEclipseLinkMappedSuperclassComposite.java
index f62211cc53..7b4a893feb 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractOrmEclipseLinkMappedSuperclassComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractOrmEclipseLinkMappedSuperclassComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -23,7 +24,6 @@ import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkMappedSupe
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkConvertersComposite;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkNonEmbeddableTypeMappingAdvancedComposite;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages;
-import org.eclipse.jpt.jpa.ui.details.JpaComposite;
 import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
 import org.eclipse.jpt.jpa.ui.internal.details.AbstractMappedSuperclassComposite;
 import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer;
@@ -44,13 +44,13 @@ import org.eclipse.ui.forms.widgets.Section;
 
 public abstract class AbstractOrmEclipseLinkMappedSuperclassComposite
 	extends AbstractMappedSuperclassComposite<OrmMappedSuperclass> 
-	implements JpaComposite
 {
 	protected AbstractOrmEclipseLinkMappedSuperclassComposite(
-			PropertyValueModel<? extends OrmMappedSuperclass> subjectHolder,
-			Composite parent, WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<? extends OrmMappedSuperclass> mappedSuperclassModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/BaseEclipseLinkOrmXmlUiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/BaseEclipseLinkOrmXmlUiFactory.java
deleted file mode 100644
index 0d89a0a126..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/BaseEclipseLinkOrmXmlUiFactory.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2012 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
-
-import org.eclipse.jpt.common.ui.WidgetFactory;
-import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.jpa.core.context.orm.OrmBasicMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddable;
-import org.eclipse.jpt.jpa.core.context.orm.OrmEntity;
-import org.eclipse.jpt.jpa.core.context.orm.OrmIdMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmManyToManyMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmManyToOneMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmMappedSuperclass;
-import org.eclipse.jpt.jpa.core.context.orm.OrmOneToManyMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmOneToOneMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmTransientMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmVersionMapping;
-import org.eclipse.jpt.jpa.ui.details.JpaComposite;
-import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingComposite;
-import org.eclipse.jpt.jpa.ui.internal.details.orm.BaseOrmXmlUiFactory;
-import org.eclipse.swt.widgets.Composite;
-
-public abstract class BaseEclipseLinkOrmXmlUiFactory extends BaseOrmXmlUiFactory
-{
-	// **************** orm type mapping composites ****************************
-	
-	@Override
-	public JpaComposite createOrmMappedSuperclassComposite(
-			PropertyValueModel<OrmMappedSuperclass> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEclipseLinkMappedSuperclassComposite(subjectHolder, parent, widgetFactory);
-	}
-	
-	@Override
-	public JpaComposite createOrmEntityComposite(
-			PropertyValueModel<OrmEntity> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEclipseLinkEntityComposite(subjectHolder, parent, widgetFactory);
-	}
-	
-	@Override
-	public JpaComposite createOrmEmbeddableComposite(
-			PropertyValueModel<OrmEmbeddable> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEclipseLinkEmbeddableComposite(subjectHolder, parent, widgetFactory);
-	}
-	
-	
-	// **************** orm attribute mapping composites ***********************
-	
-	@Override
-	public JpaComposite createOrmIdMappingComposite(
-			PropertyValueModel<OrmIdMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEclipseLinkIdMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
-	}	
-	
-	@Override
-	public JpaComposite createOrmBasicMappingComposite(
-			PropertyValueModel<OrmBasicMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEclipseLinkBasicMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
-	}
-	
-	@Override
-	public JpaComposite createOrmVersionMappingComposite(
-			PropertyValueModel<OrmVersionMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEclipseLinkVersionMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
-	}
-	
-	@Override
-	public JpaComposite createOrmManyToOneMappingComposite(
-			PropertyValueModel<OrmManyToOneMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEclipseLinkManyToOneMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
-	}
-	
-	@Override
-	public JpaComposite createOrmOneToManyMappingComposite(
-			PropertyValueModel<OrmOneToManyMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEclipseLinkOneToManyMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
-	}
-	
-	@Override
-	public JpaComposite createOrmOneToOneMappingComposite(
-			PropertyValueModel<OrmOneToOneMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEclipseLinkOneToOneMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
-	}
-	
-	@Override
-	public JpaComposite createOrmManyToManyMappingComposite(
-			PropertyValueModel<OrmManyToManyMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEclipseLinkManyToManyMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
-	}
-	
-	@Override
-	public JpaComposite createOrmTransientMappingComposite(
-			PropertyValueModel<OrmTransientMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new TransientMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLink2_3PersistenceUnitMetadataComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLink2_3PersistenceUnitMetadataComposite.java
index d64e41aecf..77421991e9 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLink2_3PersistenceUnitMetadataComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLink2_3PersistenceUnitMetadataComposite.java
@@ -30,7 +30,7 @@ import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
 import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer;
 import org.eclipse.jpt.jpa.ui.internal.details.db.CatalogCombo;
 import org.eclipse.jpt.jpa.ui.internal.details.db.SchemaCombo;
-import org.eclipse.jpt.jpa.ui.internal.details.orm.EntityMappingsDetailsPage;
+import org.eclipse.jpt.jpa.ui.internal.details.orm.EntityMappingsDetailsPageManager;
 import org.eclipse.jpt.jpa.ui.internal.details.orm.JptUiDetailsOrmMessages;
 import org.eclipse.jpt.jpa.ui.internal.details.orm.PersistenceUnitMetadataComposite;
 import org.eclipse.jpt.jpa.ui.internal.jpa2.Jpa2_0FlagTransformer;
@@ -63,7 +63,7 @@ import org.eclipse.swt.widgets.Group;
  *
  * @see PersistenceUnitMetadata
  * @see OrmPersistenceUnitDefaults
- * @see EntityMappingsDetailsPage - The parent container
+ * @see EntityMappingsDetailsPageManager - The parent container
  * @see CatalogCombo
  * @see SchemaCombo
  * @see EnumFormComboViewer
@@ -143,12 +143,12 @@ public class EclipseLink2_3PersistenceUnitMetadataComposite extends PersistenceU
 		tenantDiscriminatorColumnGroupPane.setLayoutData(gridData);
 
 		this.tenantDiscriminatorColumnsComposite = new TenantDiscriminatorColumnsComposite<OrmPersistenceUnitDefaults>(
-			getPersistenceUnitDefaultsHolder(),
-			buildPaneEnablerHolder(),
-			tenantDiscriminatorColumnGroupPane,
-			getWidgetFactory(),
-			buildTenantDiscriminatorColumnsEditor()
-		);
+				this,
+				this.getPersistenceUnitDefaultsHolder(),
+				this.buildPaneEnablerHolder(),
+				tenantDiscriminatorColumnGroupPane,
+				this.buildTenantDiscriminatorColumnsEditor()
+			);
 	}
 
 	private PropertyValueModel<Boolean> buildPaneEnablerHolder() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkConverterDialog.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkConverterDialog.java
index 0711d7f618..0792c0108d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkConverterDialog.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkConverterDialog.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.internal.widgets.DialogPane;
 import org.eclipse.jpt.common.ui.internal.widgets.ValidatingDialog;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
@@ -16,6 +17,7 @@ import org.eclipse.jpt.common.utility.internal.model.value.StaticListValueModel;
 import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter;
 import org.eclipse.jpt.common.utility.model.value.ListValueModel;
 import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
+import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.common.utility.transformer.Transformer;
 import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverter;
 import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverterContainer;
@@ -39,10 +41,13 @@ public class EclipseLinkConverterDialog
 	// ********** constructors **********
 
 	/**
-	 * Use this constructor to edit an existing conversion value
+	 * Use this constructor to edit an <em>existing</em> conversion value.
 	 */
-	public EclipseLinkConverterDialog(Shell parent, EclipseLinkConverterContainer converterContainer) {
-		super(parent);
+	public EclipseLinkConverterDialog(
+			Shell parentShell,
+			ResourceManager resourceManager,
+			EclipseLinkConverterContainer converterContainer) {
+		super(parentShell, resourceManager, EclipseLinkUiDetailsMessages.EclipseLinkConverterDialog_addConverter);
 		this.converterContainer = converterContainer;
 	}
 
@@ -54,17 +59,6 @@ public class EclipseLinkConverterDialog
 	// ********** open **********
 
 	@Override
-	protected void configureShell(Shell shell) {
-		super.configureShell(shell);
-		shell.setText(this.getTitle());
-	}
-
-	@Override
-	protected String getTitle() {
-		return EclipseLinkUiDetailsMessages.EclipseLinkConverterDialog_addConverter;
-	}
-
-	@Override
 	protected String getDescriptionTitle() {
 		return EclipseLinkUiDetailsMessages.EclipseLinkConverterDialog_addConverterDescriptionTitle;
 	}
@@ -76,7 +70,7 @@ public class EclipseLinkConverterDialog
 	
 	@Override
 	protected DialogPane<EclipseLinkConverterStateObject> buildLayout(Composite container) {
-		return new ConversionValueDialogPane(container);
+		return new ConversionValueDialogPane(this.getSubjectHolder(), container, this.resourceManager);
 	}
 	
 	@Override
@@ -106,12 +100,16 @@ public class EclipseLinkConverterDialog
 		return getSubject().getConverterType();
 	}
 	
-	private class ConversionValueDialogPane extends DialogPane<EclipseLinkConverterStateObject> {
-
+	static class ConversionValueDialogPane
+		extends DialogPane<EclipseLinkConverterStateObject>
+	{
 		private Text nameText;
 
-		ConversionValueDialogPane(Composite parent) {
-			super(EclipseLinkConverterDialog.this.getSubjectHolder(), parent);
+		ConversionValueDialogPane(
+				PropertyValueModel<EclipseLinkConverterStateObject> subjectModel,
+				Composite parentComposite,
+				ResourceManager resourceManager) {
+			super(subjectModel, parentComposite, resourceManager);
 		}
 
 		@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappings2_0DetailsProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappings2_0DetailsProvider.java
index b872475860..903150bffa 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappings2_0DetailsProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappings2_0DetailsProvider.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.core.JptResourceType;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.jpa.core.JpaStructureNode;
@@ -58,10 +59,7 @@ public class EclipseLinkEntityMappings2_0DetailsProvider
 			resourceType.equals(EclipseLinkOrmXml2_2Definition.instance().getResourceType());
 	}
 	
-	public JpaDetailsPageManager<? extends JpaStructureNode> buildDetailsPageManager(
-		Composite parent,
-		WidgetFactory widgetFactory) {
-
-		return new EclipseLinkEntityMappings2_0DetailsPage(parent, widgetFactory);
+	public JpaDetailsPageManager<? extends JpaStructureNode> buildDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return new EclipseLinkEntityMappingsDetailsPageManager2_0(parent, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappings2_3DetailsProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappings2_3DetailsProvider.java
index 215e534a36..b776b0b2ba 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappings2_3DetailsProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappings2_3DetailsProvider.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.core.JptResourceType;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.jpa.core.JpaStructureNode;
@@ -58,10 +59,7 @@ public class EclipseLinkEntityMappings2_3DetailsProvider
 		resourceType.equals(EclipseLinkOrmXml2_5Definition.instance().getResourceType());
 	}
 
-	public JpaDetailsPageManager<? extends JpaStructureNode> buildDetailsPageManager(
-		Composite parent,
-		WidgetFactory widgetFactory) {
-
-		return new EclipseLinkEntityMappings2_3DetailsPage(parent, widgetFactory);
+	public JpaDetailsPageManager<? extends JpaStructureNode> buildDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return new EclipseLinkEntityMappingsDetailsPageManager2_3(parent, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappingsDetailsPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappingsDetailsPageManager.java
index f66ee8c966..20ad33b2d9 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappingsDetailsPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappingsDetailsPageManager.java
@@ -9,9 +9,11 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer;
 import org.eclipse.jpt.jpa.core.context.orm.EntityMappings;
+import org.eclipse.jpt.jpa.ui.internal.details.QueriesComposite;
 import org.eclipse.jpt.jpa.ui.internal.details.db.CatalogCombo;
 import org.eclipse.jpt.jpa.ui.internal.details.db.SchemaCombo;
 import org.eclipse.jpt.jpa.ui.internal.details.orm.EntityMappingsGeneratorsComposite;
@@ -61,7 +63,6 @@ import org.eclipse.swt.widgets.Composite;
  * -----------------------------------------------------------------------------</pre>
  *
  * @see EntityMappings
- * @see EclipseLinkEntityMappingsDetailsPage - The parent container
  * @see CatalogCombo
  * @see EnumFormComboViewer
  * @see EntityMappingsGeneratorsComposite
@@ -69,22 +70,11 @@ import org.eclipse.swt.widgets.Composite;
  * @see QueriesComposite
  * @see PersistenceUnitMetadataComposite
  * @see SchemaCombo
- *
- * @version 2.2
- * @since 2.1
  */
-public class EclipseLinkEntityMappingsDetailsPage extends AbstractEclipseLinkEntityMappingsDetailsPage
+public class EclipseLinkEntityMappingsDetailsPageManager
+	extends AbstractEclipseLinkEntityMappingsDetailsPageManager
 {
-	/**
-	 * Creates a new <code>EclipseLinkEntityMappingsDetailsPage</code>.
-	 *
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public EclipseLinkEntityMappingsDetailsPage(Composite parent,
-	                                 WidgetFactory widgetFactory) {
-
-		super(parent, widgetFactory);
+	public EclipseLinkEntityMappingsDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		super(parent, widgetFactory, resourceManager);
 	}
-
-}
-\ No newline at end of file
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappings2_0DetailsPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappingsDetailsPageManager2_0.java
index 82718d1f47..f2c695e5da 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappings2_0DetailsPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappingsDetailsPageManager2_0.java
@@ -9,9 +9,11 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer;
 import org.eclipse.jpt.jpa.core.context.orm.EntityMappings;
+import org.eclipse.jpt.jpa.ui.internal.details.QueriesComposite;
 import org.eclipse.jpt.jpa.ui.internal.details.db.CatalogCombo;
 import org.eclipse.jpt.jpa.ui.internal.details.db.SchemaCombo;
 import org.eclipse.jpt.jpa.ui.internal.details.orm.EntityMappingsGeneratorsComposite;
@@ -53,7 +55,7 @@ import org.eclipse.swt.widgets.Control;
  * | ------------------------------------------------------------------------- |
  * | ------------------------------------------------------------------------- |
  * | |                                                                       | |
- * | | OrmQueriesComposite                                                   | |
+ * | | QueriesComposite                                                      | |
  * | |                                                                       | |
  * | ------------------------------------------------------------------------- |
  * | ------------------------------------------------------------------------- |
@@ -64,30 +66,19 @@ import org.eclipse.swt.widgets.Control;
  * -----------------------------------------------------------------------------</pre>
  *
  * @see EntityMappings
- * @see EclipseLinkEntityMappings2_0DetailsPage - The parent container
  * @see CatalogCombo
  * @see EnumFormComboViewer
  * @see EntityMappingsGeneratorsComposite
  * @see OrmPackageChooser
- * @see OrmQueriesComposite
+ * @see QueriesComposite
  * @see PersistenceUnitMetadataComposite
  * @see SchemaCombo
- *
- * @version 2.3
- * @since 2.1
  */
-public class EclipseLinkEntityMappings2_0DetailsPage extends AbstractEclipseLinkEntityMappingsDetailsPage
+public class EclipseLinkEntityMappingsDetailsPageManager2_0
+	extends AbstractEclipseLinkEntityMappingsDetailsPageManager
 {
-	/**
-	 * Creates a new <code>EclipseLinkEntityMappingsDetailsPage</code>.
-	 *
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public EclipseLinkEntityMappings2_0DetailsPage(Composite parent,
-	                                 WidgetFactory widgetFactory) {
-
-		super(parent, widgetFactory);
+	public EclipseLinkEntityMappingsDetailsPageManager2_0(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		super(parent, widgetFactory, resourceManager);
 	}
 	
 	@Override
@@ -99,4 +90,4 @@ public class EclipseLinkEntityMappings2_0DetailsPage extends AbstractEclipseLink
 	protected Control initializeQueriesSection(Composite container) {
 		return new Queries2_0Composite(this, this.buildQueryContainerHolder(), container).getControl();
 	}
-}
-\ No newline at end of file
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappings2_3DetailsPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappingsDetailsPageManager2_3.java
index b11f63332f..327fca4303 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappings2_3DetailsPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappingsDetailsPageManager2_3.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages;
 import org.eclipse.jpt.jpa.ui.internal.jpa2.details.Queries2_0Composite;
@@ -66,23 +67,12 @@ import org.eclipse.ui.forms.widgets.Section;
  * | |                                                                       | |
  * | ------------------------------------------------------------------------- |
  * -----------------------------------------------------------------------------</pre>
- *
- *
- * @version 3.1
- * @since 3.1
  */
-public class EclipseLinkEntityMappings2_3DetailsPage extends AbstractEclipseLinkEntityMappingsDetailsPage
+public class EclipseLinkEntityMappingsDetailsPageManager2_3
+	extends AbstractEclipseLinkEntityMappingsDetailsPageManager
 {
-	/**
-	 * Creates a new <code>EclipseLinkEntityMappingsDetailsPage</code>.
-	 *
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public EclipseLinkEntityMappings2_3DetailsPage(Composite parent,
-	                                 WidgetFactory widgetFactory) {
-
-		super(parent, widgetFactory);
+	public EclipseLinkEntityMappingsDetailsPageManager2_3(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		super(parent, widgetFactory, resourceManager);
 	}
 
 	@Override
@@ -132,5 +122,4 @@ public class EclipseLinkEntityMappings2_3DetailsPage extends AbstractEclipseLink
 	protected Control initializeMultitenancySection(Composite container) {
 		return new EclipseLinkEntityMappingsTenantDiscriminatorColumnsComposite(this, container).getControl();
 	}
-
-}
-\ No newline at end of file
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappingsDetailsProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappingsDetailsProvider.java
index 6ddf201262..f849606af2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappingsDetailsProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappingsDetailsProvider.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.core.JptResourceType;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.jpa.core.JpaStructureNode;
@@ -58,10 +59,7 @@ public class EclipseLinkEntityMappingsDetailsProvider
 				|| resourceType.equals(EclipseLinkOrmXml1_2Definition.instance().getResourceType());
 	}
 	
-	public JpaDetailsPageManager<? extends JpaStructureNode> buildDetailsPageManager(
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return new EclipseLinkEntityMappingsDetailsPage(parent, widgetFactory);
+	public JpaDetailsPageManager<? extends JpaStructureNode> buildDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return new EclipseLinkEntityMappingsDetailsPageManager(parent, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappingsTenantDiscriminatorColumnsComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappingsTenantDiscriminatorColumnsComposite.java
index 1120f44de0..db6ef2e413 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappingsTenantDiscriminatorColumnsComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappingsTenantDiscriminatorColumnsComposite.java
@@ -61,11 +61,12 @@ public class EclipseLinkEntityMappingsTenantDiscriminatorColumnsComposite extend
 
 	protected TenantDiscriminatorColumnsComposite<EntityMappings>  buildTenantDiscriminatorColumnsComposite(Composite container) {
 		return new TenantDiscriminatorColumnsComposite<EntityMappings>(
-			getSubjectHolder(),
-			new TenantDiscriminatorColumnPaneEnablerHolder(),
-			container,
-			getWidgetFactory(),
-			buildTenantDiscriminatorColumnsEditor());
+				this,
+				this.getSubjectHolder(),
+				new TenantDiscriminatorColumnPaneEnablerHolder(),
+				container,
+				this.buildTenantDiscriminatorColumnsEditor()
+			);
 	}
 
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml1_1UiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml1_1UiFactory.java
index 72001f7562..a3419cf271 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml1_1UiFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml1_1UiFactory.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.orm.OrmBasicMapping;
@@ -23,88 +24,98 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmVersionMapping;
 import org.eclipse.jpt.jpa.ui.details.JpaComposite;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkOrmXml1_1UiFactory extends BaseEclipseLinkOrmXmlUiFactory
+public class EclipseLinkOrmXml1_1UiFactory
+	extends AbstractEclipseLinkOrmXmlUiFactory
 {
-	// **************** orm attribute mapping composites ***********************
-	
+	// ********** attribute mappings **********
+
 	@Override
 	public JpaComposite createOrmIdMappingComposite(
-			PropertyValueModel<OrmIdMapping> subjectHolder,
+			PropertyValueModel<OrmIdMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEclipseLinkIdMapping1_1Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEclipseLinkIdMapping1_1Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
-	
+
 	@Override
 	public JpaComposite createOrmEmbeddedIdMappingComposite(
-			PropertyValueModel<OrmEmbeddedIdMapping> subjectHolder,
+			PropertyValueModel<OrmEmbeddedIdMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEclipseLinkEmbeddedIdMapping1_1Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEclipseLinkEmbeddedIdMapping1_1Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
-	
+
 	@Override
 	public JpaComposite createOrmBasicMappingComposite(
-			PropertyValueModel<OrmBasicMapping> subjectHolder,
+			PropertyValueModel<OrmBasicMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEclipseLinkBasicMapping1_1Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEclipseLinkBasicMapping1_1Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
-	
+
 	@Override
 	public JpaComposite createOrmVersionMappingComposite(
-			PropertyValueModel<OrmVersionMapping> subjectHolder,
+			PropertyValueModel<OrmVersionMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEclipseLinkVersionMapping1_1Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEclipseLinkVersionMapping1_1Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
-	
+
 	@Override
 	public JpaComposite createOrmManyToOneMappingComposite(
-			PropertyValueModel<OrmManyToOneMapping> subjectHolder,
+			PropertyValueModel<OrmManyToOneMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEclipseLinkManyToOneMapping1_1Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEclipseLinkManyToOneMapping1_1Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
-	
+
 	@Override
 	public JpaComposite createOrmOneToManyMappingComposite(
-			PropertyValueModel<OrmOneToManyMapping> subjectHolder,
+			PropertyValueModel<OrmOneToManyMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEclipseLinkOneToManyMapping1_1Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEclipseLinkOneToManyMapping1_1Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
-	
+
 	@Override
 	public JpaComposite createOrmOneToOneMappingComposite(
-			PropertyValueModel<OrmOneToOneMapping> subjectHolder,
+			PropertyValueModel<OrmOneToOneMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEclipseLinkOneToOneMapping1_1Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEclipseLinkOneToOneMapping1_1Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
-	
+
 	@Override
 	public JpaComposite createOrmManyToManyMappingComposite(
-			PropertyValueModel<OrmManyToManyMapping> subjectHolder,
+			PropertyValueModel<OrmManyToManyMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEclipseLinkManyToManyMapping1_1Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEclipseLinkManyToManyMapping1_1Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
-	
+
 	@Override
 	public JpaComposite createOrmEmbeddedMappingComposite(
-			PropertyValueModel<OrmEmbeddedMapping> subjectHolder,
+			PropertyValueModel<OrmEmbeddedMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEclipseLinkEmbeddedMapping1_1Composite(subjectHolder, enabledModel,parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEclipseLinkEmbeddedMapping1_1Composite(mappingModel, enabledModel,parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_0UiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_0UiFactory.java
index c89eec7d73..8e983cd41f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_0UiFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_0UiFactory.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.orm.OrmBasicMapping;
@@ -27,114 +28,129 @@ import org.eclipse.jpt.jpa.ui.details.JpaComposite;
 import org.eclipse.jpt.jpa.ui.jpa2.details.orm.OrmXmlUiFactory2_0;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkOrmXml2_0UiFactory 
-	extends BaseEclipseLinkOrmXmlUiFactory
+public class EclipseLinkOrmXml2_0UiFactory
+	extends AbstractEclipseLinkOrmXmlUiFactory
 	implements OrmXmlUiFactory2_0
 {
+	// ********** type mappings **********
+
 	@Override
-	public JpaComposite createOrmEntityComposite(
-			PropertyValueModel<OrmEntity> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEclipseLinkEntity2_0Composite(subjectHolder, parent, widgetFactory);
+	public JpaComposite createOrmMappedSuperclassComposite(
+			PropertyValueModel<OrmMappedSuperclass> mappedSuperclassModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEclipseLinkMappedSuperclass2_0Composite(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager);
 	}
-	
+
 	@Override
-	public JpaComposite createOrmMappedSuperclassComposite(
-			PropertyValueModel<OrmMappedSuperclass> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEclipseLinkMappedSuperclass2_0Composite(subjectHolder, parent, widgetFactory);
+	public JpaComposite createOrmEntityComposite(
+			PropertyValueModel<OrmEntity> entityModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEclipseLinkEntity2_0Composite(entityModel, parentComposite, widgetFactory, resourceManager);
 	}
-	
-	// **************** orm attribute mapping composites ***********************
-	
+
+
+	// ********** attribute mappings **********
+
 	@Override
 	public JpaComposite createOrmIdMappingComposite(
-			PropertyValueModel<OrmIdMapping> subjectHolder,
+			PropertyValueModel<OrmIdMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEclipseLinkIdMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEclipseLinkIdMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
-	
+
 	@Override
 	public JpaComposite createOrmEmbeddedMappingComposite(
-			PropertyValueModel<OrmEmbeddedMapping> subjectHolder,
+			PropertyValueModel<OrmEmbeddedMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEclipseLinkEmbeddedMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEclipseLinkEmbeddedMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
-	
+
 	@Override
 	public JpaComposite createOrmEmbeddedIdMappingComposite(
-			PropertyValueModel<OrmEmbeddedIdMapping> subjectHolder,
+			PropertyValueModel<OrmEmbeddedIdMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEclipseLinkEmbeddedIdMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEclipseLinkEmbeddedIdMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
-	
+
 	@Override
 	public JpaComposite createOrmBasicMappingComposite(
-			PropertyValueModel<OrmBasicMapping> subjectHolder,
+			PropertyValueModel<OrmBasicMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEclipseLinkBasicMapping1_1Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEclipseLinkBasicMapping1_1Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
-	
+
 	@Override
 	public JpaComposite createOrmVersionMappingComposite(
-			PropertyValueModel<OrmVersionMapping> subjectHolder,
+			PropertyValueModel<OrmVersionMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEclipseLinkVersionMapping1_1Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEclipseLinkVersionMapping1_1Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
-	
+
 	@Override
 	public JpaComposite createOrmManyToOneMappingComposite(
-			PropertyValueModel<OrmManyToOneMapping> subjectHolder,
+			PropertyValueModel<OrmManyToOneMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEclipseLinkManyToOneMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEclipseLinkManyToOneMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
-	
+
 	@Override
 	public JpaComposite createOrmOneToManyMappingComposite(
-			PropertyValueModel<OrmOneToManyMapping> subjectHolder,
+			PropertyValueModel<OrmOneToManyMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEclipseLinkOneToManyMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEclipseLinkOneToManyMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
-	
+
 	@Override
 	public JpaComposite createOrmOneToOneMappingComposite(
-			PropertyValueModel<OrmOneToOneMapping> subjectHolder,
+			PropertyValueModel<OrmOneToOneMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEclipseLinkOneToOneMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEclipseLinkOneToOneMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
-	
+
 	@Override
 	public JpaComposite createOrmManyToManyMappingComposite(
-			PropertyValueModel<OrmManyToManyMapping> subjectHolder,
+			PropertyValueModel<OrmManyToManyMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEclipseLinkManyToManyMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEclipseLinkManyToManyMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
-	
+
 	public JpaComposite createOrmElementCollectionMapping2_0Composite(
-			PropertyValueModel<OrmElementCollectionMapping2_0> subjectHolder,
+			PropertyValueModel<OrmElementCollectionMapping2_0> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEclipseLinkElementCollectionMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEclipseLinkElementCollectionMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_1UiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_1UiFactory.java
index 9b314371db..d84d3470ea 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_1UiFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_1UiFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2011 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2012 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.orm.OrmMappedSuperclass;
@@ -19,21 +20,27 @@ import org.eclipse.swt.widgets.Composite;
 public class EclipseLinkOrmXml2_1UiFactory 
 	extends EclipseLinkOrmXml2_0UiFactory
 {
+	// ********** type mappings **********
 
 	@Override
-	public JpaComposite createOrmElementCollectionMapping2_0Composite(
-			PropertyValueModel<OrmElementCollectionMapping2_0> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEclipseLinkElementCollectionMapping2_1Composite(subjectHolder, enabledModel, parent, widgetFactory);
+	public JpaComposite createOrmMappedSuperclassComposite(
+			PropertyValueModel<OrmMappedSuperclass> mappedSuperclassModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEclipseLinkMappedSuperclass2_1Composite(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager);
 	}
 
+
+	// ********** attribute mappings **********
+
 	@Override
-	public JpaComposite createOrmMappedSuperclassComposite(
-			PropertyValueModel<OrmMappedSuperclass> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEclipseLinkMappedSuperclass2_1Composite(subjectHolder, parent, widgetFactory);
+	public JpaComposite createOrmElementCollectionMapping2_0Composite(
+			PropertyValueModel<OrmElementCollectionMapping2_0> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEclipseLinkElementCollectionMapping2_1Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_3UiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_3UiFactory.java
index fe0ce5fc9a..1448193272 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_3UiFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_3UiFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2012 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.orm.OrmEntity;
@@ -19,19 +20,23 @@ import org.eclipse.swt.widgets.Composite;
 public class EclipseLinkOrmXml2_3UiFactory 
 	extends EclipseLinkOrmXml2_0UiFactory
 {
+	// ********** type mappings **********
+
 	@Override
-	public JpaComposite createOrmEntityComposite(
-			PropertyValueModel<OrmEntity> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEclipseLinkEntity2_3Composite(subjectHolder, parent, widgetFactory);
+	public JpaComposite createOrmMappedSuperclassComposite(
+			PropertyValueModel<OrmMappedSuperclass> mappedSuperclassModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEclipseLinkMappedSuperclass2_3Composite(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
-	public JpaComposite createOrmMappedSuperclassComposite(
-			PropertyValueModel<OrmMappedSuperclass> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEclipseLinkMappedSuperclass2_3Composite(subjectHolder, parent, widgetFactory);
+	public JpaComposite createOrmEntityComposite(
+			PropertyValueModel<OrmEntity> entityModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEclipseLinkEntity2_3Composite(entityModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXmlUiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXmlUiFactory.java
index 36e300c097..74a9a30d76 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXmlUiFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXmlUiFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2009 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2012 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,7 +9,8 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
-public class EclipseLinkOrmXmlUiFactory extends BaseEclipseLinkOrmXmlUiFactory
+public class EclipseLinkOrmXmlUiFactory
+	extends AbstractEclipseLinkOrmXmlUiFactory
 {
-	//nothing
+	// nothing
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkArrayMapping2_3UiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkArrayMapping2_3UiDefinition.java
index 1893978953..72c354e10b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkArrayMapping2_3UiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkArrayMapping2_3UiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
@@ -44,13 +45,7 @@ public class OrmEclipseLinkArrayMapping2_3UiDefinition
 		super();
 	}
 
-	public JpaComposite buildAttributeMappingComposite(
-			OrmXmlUiFactory factory, 
-			PropertyValueModel<EclipseLinkArrayMapping2_3> subjectHolder, 
-			PropertyValueModel<Boolean> enabledModel, 
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return new EclipseLinkArrayMapping2_3Composite(subjectHolder, enabledModel, parent, widgetFactory);
+	public JpaComposite buildAttributeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<EclipseLinkArrayMapping2_3> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return new EclipseLinkArrayMapping2_3Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicCollectionMapping1_1Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicCollectionMapping1_1Composite.java
deleted file mode 100644
index 86aec0547f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicCollectionMapping1_1Composite.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
-
-import org.eclipse.jpt.common.ui.WidgetFactory;
-import org.eclipse.jpt.common.ui.internal.widgets.Pane;
-import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
-import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.jpa.core.context.AccessHolder;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkBasicCollectionMapping;
-import org.eclipse.jpt.jpa.ui.details.JpaComposite;
-import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
-import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- *
- * @version 2.2
- * @since 2.2
- */
-public class OrmEclipseLinkBasicCollectionMapping1_1Composite extends Pane<EclipseLinkBasicCollectionMapping>
-                                       implements JpaComposite
-{
-	/**
-	 * Creates a new <code>EclipseLinkBasicCollectionMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>IManyToOneMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public OrmEclipseLinkBasicCollectionMapping1_1Composite(PropertyValueModel<? extends EclipseLinkBasicCollectionMapping> subjectHolder,
-	                                 Composite parent,
-	                                 WidgetFactory widgetFactory) {
-
-		super(subjectHolder, parent, widgetFactory);
-	}
-
-	@Override
-	protected Composite addComposite(Composite container) {
-		return this.addSubPane(container, 2, 0, 0, 0, 0);
-	}
-
-	@Override
-	protected void initializeLayout(Composite container) {
-		this.addLabel(container, JptUiMessages.AccessTypeComposite_access);
-		new AccessTypeComboViewer(this, this.buildAccessHolderHolder(), container);
-	}	
-	
-	protected PropertyValueModel<AccessHolder> buildAccessHolderHolder() {
-		return new PropertyAspectAdapter<EclipseLinkBasicCollectionMapping, AccessHolder>(getSubjectHolder()) {
-			@Override
-			protected AccessHolder buildValue_() {
-				return this.subject.getPersistentAttribute();
-			}
-		};
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicCollectionMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicCollectionMappingUiDefinition.java
index ad59afbd01..41e67b83ff 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicCollectionMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicCollectionMappingUiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
@@ -44,14 +45,7 @@ public class OrmEclipseLinkBasicCollectionMappingUiDefinition
 		super();
 	}
 	
-	
-	public JpaComposite buildAttributeMappingComposite(
-			OrmXmlUiFactory factory,
-			PropertyValueModel<EclipseLinkBasicCollectionMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return new EclipseLinkBasicCollectionMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+	public JpaComposite buildAttributeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<EclipseLinkBasicCollectionMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return new EclipseLinkBasicCollectionMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicMapMapping1_1Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicMapMapping1_1Composite.java
deleted file mode 100644
index a49581b295..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicMapMapping1_1Composite.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
-
-import org.eclipse.jpt.common.ui.WidgetFactory;
-import org.eclipse.jpt.common.ui.internal.widgets.Pane;
-import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
-import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.jpa.core.context.AccessHolder;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkBasicMapMapping;
-import org.eclipse.jpt.jpa.ui.details.JpaComposite;
-import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
-import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- *
- * @version 2.2
- * @since 2.2
- */
-public class OrmEclipseLinkBasicMapMapping1_1Composite extends Pane<EclipseLinkBasicMapMapping>
-                                       implements JpaComposite
-{
-	/**
-	 * Creates a new <code>EclipseLinkBasicCollectionMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>IManyToOneMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public OrmEclipseLinkBasicMapMapping1_1Composite(PropertyValueModel<? extends EclipseLinkBasicMapMapping> subjectHolder,
-	                                 Composite parent,
-	                                 WidgetFactory widgetFactory) {
-
-		super(subjectHolder, parent, widgetFactory);
-	}
-
-	@Override
-	protected Composite addComposite(Composite container) {
-		return this.addSubPane(container, 2, 0, 0, 0, 0);
-	}
-
-	@Override
-	protected void initializeLayout(Composite container) {
-		this.addLabel(container, JptUiMessages.AccessTypeComposite_access);
-		new AccessTypeComboViewer(this, this.buildAccessHolderHolder(), container);
-	}	
-	
-	protected PropertyValueModel<AccessHolder> buildAccessHolderHolder() {
-		return new PropertyAspectAdapter<EclipseLinkBasicMapMapping, AccessHolder>(getSubjectHolder()) {
-			@Override
-			protected AccessHolder buildValue_() {
-				return this.subject.getPersistentAttribute();
-			}
-		};
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicMapMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicMapMappingUiDefinition.java
index a034356191..4c29d1e6c3 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicMapMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicMapMappingUiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
@@ -44,14 +45,7 @@ public class OrmEclipseLinkBasicMapMappingUiDefinition
 		super();
 	}
 	
-	
-	public JpaComposite buildAttributeMappingComposite(
-			OrmXmlUiFactory factory,
-			PropertyValueModel<EclipseLinkBasicMapMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return new EclipseLinkBasicMapMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+	public JpaComposite buildAttributeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<EclipseLinkBasicMapMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return new EclipseLinkBasicMapMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicMapping1_1Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicMapping1_1Composite.java
index 7aecc13395..1b29224d6d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicMapping1_1Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicMapping1_1Composite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -30,21 +31,16 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 
-public class OrmEclipseLinkBasicMapping1_1Composite extends EclipseLinkBasicMappingComposite<BasicMapping>
+public class OrmEclipseLinkBasicMapping1_1Composite
+	extends EclipseLinkBasicMappingComposite<BasicMapping>
 {
-	/**
-	 * Creates a new <code>EclipseLink1_1OrmBasicMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>BasicMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public OrmEclipseLinkBasicMapping1_1Composite(PropertyValueModel<? extends BasicMapping> subjectHolder,
-												PropertyValueModel<Boolean> enabledModel,
-												Composite parent,
-												WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public OrmEclipseLinkBasicMapping1_1Composite(
+			PropertyValueModel<? extends BasicMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicMappingComposite.java
index 7e6bab1add..ec590e0371 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicMappingComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.BasicMapping;
@@ -26,21 +27,16 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 
-public class OrmEclipseLinkBasicMappingComposite extends EclipseLinkBasicMappingComposite<BasicMapping>
+public class OrmEclipseLinkBasicMappingComposite
+	extends EclipseLinkBasicMappingComposite<BasicMapping>
 {
-	/**
-	 * Creates a new <code>EclipseLinkOrmBasicMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>BasicMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public OrmEclipseLinkBasicMappingComposite(PropertyValueModel<? extends BasicMapping> subjectHolder,
-		                 		   PropertyValueModel<Boolean> enabledModel,
-	                               Composite parent,
-	                               WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public OrmEclipseLinkBasicMappingComposite(
+			PropertyValueModel<? extends BasicMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkElementCollectionMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkElementCollectionMapping2_0Composite.java
index d9e54c549e..902a1438e7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkElementCollectionMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkElementCollectionMapping2_0Composite.java
@@ -9,18 +9,12 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
-import org.eclipse.jpt.common.utility.internal.model.value.CompositeBooleanPropertyValueModel;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
-import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.AccessHolder;
-import org.eclipse.jpt.jpa.core.context.Converter;
-import org.eclipse.jpt.jpa.core.context.ConvertibleMapping;
 import org.eclipse.jpt.jpa.core.jpa2.context.ElementCollectionMapping2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConvert;
-import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkConvertCombo;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkElementCollectionMapping2_0Composite;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages;
 import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
@@ -33,29 +27,20 @@ import org.eclipse.jpt.jpa.ui.internal.jpa2.details.CollectionTable2_0Composite;
 import org.eclipse.jpt.jpa.ui.internal.jpa2.details.JptUiDetailsMessages2_0;
 import org.eclipse.jpt.jpa.ui.internal.jpa2.details.TargetClassChooser;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
 import org.eclipse.ui.forms.widgets.Hyperlink;
-import org.eclipse.ui.forms.widgets.Section;
 
 public class OrmEclipseLinkElementCollectionMapping2_0Composite
 	extends EclipseLinkElementCollectionMapping2_0Composite<ElementCollectionMapping2_0>
 {
-	/**
-	 * Creates a new <code>EclipseLink1_1OrmBasicMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>BasicMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public OrmEclipseLinkElementCollectionMapping2_0Composite(PropertyValueModel<? extends ElementCollectionMapping2_0> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-	                                WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public OrmEclipseLinkElementCollectionMapping2_0Composite(
+			PropertyValueModel<? extends ElementCollectionMapping2_0> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
@@ -99,63 +84,4 @@ public class OrmEclipseLinkElementCollectionMapping2_0Composite
 			}
 		};
 	}
-
-	@Override
-	protected Composite buildBasicValueTypeSectionClient(Section section) {
-		Composite container = super.buildBasicValueTypeSectionClient(section);
-		PropertyValueModel<Converter> converterHolder = buildConverterHolder();
-
-		// EclipseLink Converter
-		Button elConverterButton = addRadioButton(
-			container, 
-			EclipseLinkUiDetailsMessages.TypeSection_converted, 
-			buildConverterBooleanHolder(EclipseLinkConvert.class), 
-			null);
-		((GridData) elConverterButton.getLayoutData()).horizontalSpan = 2;
-
-		PropertyValueModel<EclipseLinkConvert> convertHolder = buildEclipseLinkConverterHolder(converterHolder);
-		PropertyValueModel<Boolean> convertEnabledModel = CompositeBooleanPropertyValueModel.and(getEnabledModel(), buildEclipseLinkConvertBooleanHolder(convertHolder));
-		Label convertLabel = this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkConvertComposite_converterNameLabel, convertEnabledModel);
-		GridData gridData = new GridData();
-		gridData.horizontalIndent = 20;
-		convertLabel.setLayoutData(gridData);
-		registerSubPane(new EclipseLinkConvertCombo(convertHolder, convertEnabledModel, container, getWidgetFactory()));
-
-		return container;
-	}
-
-	protected PropertyValueModel<Converter> buildConverterHolder() {
-		return new PropertyAspectAdapter<ConvertibleMapping, Converter>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) {
-			@Override
-			protected Converter buildValue_() {
-				return this.subject.getConverter();
-			}
-		};
-	}
-
-	protected ModifiablePropertyValueModel<Boolean> buildConverterBooleanHolder(final Class<? extends Converter> converterType) {
-		return new PropertyAspectAdapter<ConvertibleMapping, Boolean>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) {
-			@Override
-			protected Boolean buildValue_() {
-				Converter converter = this.subject.getConverter();
-				return Boolean.valueOf(converter.getType() == converterType);
-			}
-
-			@Override
-			protected void setValue_(Boolean value) {
-				if (value.booleanValue()) {
-					this.subject.setConverter(converterType);
-				}
-			}
-		};
-	}
-
-	protected PropertyValueModel<EclipseLinkConvert> buildEclipseLinkConverterHolder(PropertyValueModel<Converter> converterHolder) {
-		return new TransformationPropertyValueModel<Converter, EclipseLinkConvert>(converterHolder) {
-			@Override
-			protected EclipseLinkConvert transform_(Converter converter) {
-				return converter.getType() == EclipseLinkConvert.class ? (EclipseLinkConvert) converter : null;
-			}
-		};
-	}
-}
-\ No newline at end of file
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkElementCollectionMapping2_1Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkElementCollectionMapping2_1Composite.java
index 0abf326ec4..9985b33adc 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkElementCollectionMapping2_1Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkElementCollectionMapping2_1Composite.java
@@ -9,20 +9,14 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
-import org.eclipse.jpt.common.utility.internal.model.value.CompositeBooleanPropertyValueModel;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
-import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.AccessHolder;
-import org.eclipse.jpt.jpa.core.context.Converter;
-import org.eclipse.jpt.jpa.core.context.ConvertibleMapping;
 import org.eclipse.jpt.jpa.core.jpa2.context.ElementCollectionMapping2_0;
-import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConvert;
 import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkElementCollectionMapping2_0;
 import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch;
-import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkConvertCombo;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkElementCollectionMapping2_0Composite;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkJoinFetchComboViewer;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages;
@@ -36,29 +30,20 @@ import org.eclipse.jpt.jpa.ui.internal.jpa2.details.CollectionTable2_0Composite;
 import org.eclipse.jpt.jpa.ui.internal.jpa2.details.JptUiDetailsMessages2_0;
 import org.eclipse.jpt.jpa.ui.internal.jpa2.details.TargetClassChooser;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
 import org.eclipse.ui.forms.widgets.Hyperlink;
-import org.eclipse.ui.forms.widgets.Section;
 
 public class OrmEclipseLinkElementCollectionMapping2_1Composite
 	extends EclipseLinkElementCollectionMapping2_0Composite<ElementCollectionMapping2_0>
 {
-	/**
-	 * Creates a new <code>EclipseLink1_1OrmBasicMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>BasicMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public OrmEclipseLinkElementCollectionMapping2_1Composite(PropertyValueModel<? extends ElementCollectionMapping2_0> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-	                              	WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public OrmEclipseLinkElementCollectionMapping2_1Composite(
+			PropertyValueModel<? extends ElementCollectionMapping2_0> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
@@ -115,63 +100,4 @@ public class OrmEclipseLinkElementCollectionMapping2_1Composite
 			}
 		};
 	}
-
-	@Override
-	protected Composite buildBasicValueTypeSectionClient(Section section) {
-		Composite container = super.buildBasicValueTypeSectionClient(section);
-		PropertyValueModel<Converter> converterHolder = buildConverterHolder();
-
-		// EclipseLink Converter
-		Button elConverterButton = addRadioButton(
-			container, 
-			EclipseLinkUiDetailsMessages.TypeSection_converted, 
-			buildConverterBooleanHolder(EclipseLinkConvert.class), 
-			null);
-		((GridData) elConverterButton.getLayoutData()).horizontalSpan = 2;
-
-		PropertyValueModel<EclipseLinkConvert> convertHolder = buildEclipseLinkConverterHolder(converterHolder);
-		PropertyValueModel<Boolean> convertEnabledModel = CompositeBooleanPropertyValueModel.and(getEnabledModel(), buildEclipseLinkConvertBooleanHolder(convertHolder));
-		Label convertLabel = this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkConvertComposite_converterNameLabel, convertEnabledModel);
-		GridData gridData = new GridData();
-		gridData.horizontalIndent = 20;
-		convertLabel.setLayoutData(gridData);
-		registerSubPane(new EclipseLinkConvertCombo(convertHolder, convertEnabledModel, container, getWidgetFactory()));
-
-		return container;
-	}
-
-	protected PropertyValueModel<Converter> buildConverterHolder() {
-		return new PropertyAspectAdapter<ConvertibleMapping, Converter>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) {
-			@Override
-			protected Converter buildValue_() {
-				return this.subject.getConverter();
-			}
-		};
-	}
-
-	protected ModifiablePropertyValueModel<Boolean> buildConverterBooleanHolder(final Class<? extends Converter> converterType) {
-		return new PropertyAspectAdapter<ConvertibleMapping, Boolean>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) {
-			@Override
-			protected Boolean buildValue_() {
-				Converter converter = this.subject.getConverter();
-				return Boolean.valueOf(converter.getType() == converterType);
-			}
-
-			@Override
-			protected void setValue_(Boolean value) {
-				if (value.booleanValue()) {
-					this.subject.setConverter(converterType);
-				}
-			}
-		};
-	}
-
-	protected PropertyValueModel<EclipseLinkConvert> buildEclipseLinkConverterHolder(PropertyValueModel<Converter> converterHolder) {
-		return new TransformationPropertyValueModel<Converter, EclipseLinkConvert>(converterHolder) {
-			@Override
-			protected EclipseLinkConvert transform_(Converter converter) {
-				return converter.getType() == EclipseLinkConvert.class ? (EclipseLinkConvert) converter : null;
-			}
-		};
-	}
-}
-\ No newline at end of file
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddableComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddableComposite.java
index fc053ae83f..d1bc249acb 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddableComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddableComposite.java
@@ -9,97 +9,41 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.jpa.core.context.AccessHolder;
-import org.eclipse.jpt.jpa.core.context.Embeddable;
 import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddable;
 import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkConverterContainer;
 import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkEmbeddable;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkConvertersComposite;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkEmbeddableAdvancedComposite;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages;
-import org.eclipse.jpt.jpa.ui.details.JpaComposite;
-import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
-import org.eclipse.jpt.jpa.ui.internal.details.AbstractEmbeddableComposite;
-import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer;
-import org.eclipse.jpt.jpa.ui.internal.details.orm.JptUiDetailsOrmMessages;
-import org.eclipse.jpt.jpa.ui.internal.details.orm.MetadataCompleteTriStateCheckBox;
-import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmJavaClassChooser;
+import org.eclipse.jpt.jpa.ui.internal.details.orm.AbstractOrmEmbeddableComposite;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.forms.events.ExpansionAdapter;
 import org.eclipse.ui.forms.events.ExpansionEvent;
 import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.Hyperlink;
 import org.eclipse.ui.forms.widgets.Section;
 
-/**
- * This pane does not have any widgets.
- *
- * @see Embeddable
- * @see EmbeddableUiProvider
- *
- * @version 2.3
- * @since 2.1
- */
 public class OrmEclipseLinkEmbeddableComposite
-	extends AbstractEmbeddableComposite<OrmEmbeddable>
-	implements JpaComposite
+	extends AbstractOrmEmbeddableComposite
 {
-	/**
-	 * Creates a new <code>EmbeddableComposite</code>.
-	 *
-	 * @param subjectHolder The holder of this pane's subject
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public OrmEclipseLinkEmbeddableComposite(PropertyValueModel<? extends OrmEmbeddable> subjectHolder,
-	                           Composite parent,
-	                           WidgetFactory widgetFactory) {
-
-		super(subjectHolder, parent, widgetFactory);
+	public OrmEclipseLinkEmbeddableComposite(
+			PropertyValueModel<? extends OrmEmbeddable> embeddableModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(embeddableModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
 	protected void initializeLayout(Composite container) {
-		this.initializeEmbeddableCollapsibleSection(container);
-		initializeConvertersCollapsibleSection(container);
-		initializeAdvancedCollapsibleSection(container);
-	}
-
-	@Override
-	protected Control initializeEmbeddableSection(Composite container) {
-		container = this.addSubPane(container, 2, 0, 0, 0, 0);
-
-		// Java class widgets
-		Hyperlink javaClassHyperlink = this.addHyperlink(container, JptUiDetailsOrmMessages.OrmJavaClassChooser_javaClass);
-		new OrmJavaClassChooser(this, getSubjectHolder(), container, javaClassHyperlink);
-
-		// Access type widgets
-		this.addLabel(container, JptUiMessages.AccessTypeComposite_access);
-		new AccessTypeComboViewer(this, this.buildAccessHolder(), container);
-
-		// Metadata complete widgets
-		MetadataCompleteTriStateCheckBox metadataCompleteComposite = new MetadataCompleteTriStateCheckBox(this, getSubjectHolder(), container);
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.horizontalSpan = 2;
-		metadataCompleteComposite.getControl().setLayoutData(gridData);
-
-		return container;
-	}
-	
-	protected PropertyValueModel<AccessHolder> buildAccessHolder() {
-		return new PropertyAspectAdapter<OrmEmbeddable, AccessHolder>(
-			getSubjectHolder())
-		{
-			@Override
-			protected AccessHolder buildValue_() {
-				return this.subject.getPersistentType();
-			}
-		};
+		super.initializeLayout(container);
+		this.initializeConvertersCollapsibleSection(container);
+		this.initializeAdvancedCollapsibleSection(container);
 	}
 
 	protected void initializeConvertersCollapsibleSection(Composite container) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddedIdMapping1_1Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddedIdMapping1_1Composite.java
index 75efb18467..19d4ed19f2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddedIdMapping1_1Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddedIdMapping1_1Composite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -31,12 +32,12 @@ public class OrmEclipseLinkEmbeddedIdMapping1_1Composite
 	extends AbstractEmbeddedIdMappingComposite<EmbeddedIdMapping>
 {
 	public OrmEclipseLinkEmbeddedIdMapping1_1Composite(
-			PropertyValueModel<? extends EmbeddedIdMapping> subjectHolder,
+			PropertyValueModel<? extends EmbeddedIdMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddedIdMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddedIdMapping2_0Composite.java
index e38a76eb10..2928f27005 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddedIdMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddedIdMapping2_0Composite.java
@@ -1,15 +1,15 @@
 /*******************************************************************************
- *  Copyright (c) 2010, 2012  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
+ * Copyright (c) 2010, 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ *
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping;
@@ -29,12 +29,12 @@ public class OrmEclipseLinkEmbeddedIdMapping2_0Composite
 	extends OrmEclipseLinkEmbeddedIdMapping1_1Composite
 {
 	public OrmEclipseLinkEmbeddedIdMapping2_0Composite(
-			PropertyValueModel<? extends EmbeddedIdMapping> subjectHolder,
+			PropertyValueModel<? extends EmbeddedIdMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddedMapping1_1Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddedMapping1_1Composite.java
index d28f75f763..3b45ca3b1b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddedMapping1_1Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddedMapping1_1Composite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -26,38 +27,16 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | EmbeddedAttributeOverridesComposite                                   | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see EmbeddedMapping
- *
- * @version 2.3
- * @since 2.2
- */
 public class OrmEclipseLinkEmbeddedMapping1_1Composite
 	extends AbstractEmbeddedMappingComposite<EmbeddedMapping>
 {
-	/**
-	 * Creates a new <code>EmbeddedMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>EmbeddedMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public OrmEclipseLinkEmbeddedMapping1_1Composite(PropertyValueModel<? extends EmbeddedMapping> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-	                                WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public OrmEclipseLinkEmbeddedMapping1_1Composite(
+			PropertyValueModel<? extends EmbeddedMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddedMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddedMapping2_0Composite.java
index 4e4f5ffdba..8279b032f4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddedMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddedMapping2_0Composite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -18,7 +19,6 @@ import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsM
 import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
 import org.eclipse.jpt.jpa.ui.internal.details.AbstractEmbeddedMappingComposite;
 import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer;
-import org.eclipse.jpt.jpa.ui.internal.details.java.BaseJavaUiFactory;
 import org.eclipse.jpt.jpa.ui.internal.details.orm.JptUiDetailsOrmMessages;
 import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmMappingNameText;
 import org.eclipse.jpt.jpa.ui.internal.jpa2.details.EmbeddedMapping2_0OverridesComposite;
@@ -27,39 +27,16 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | EmbeddedAttributeOverridesComposite                                   | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see EmbeddedMapping
- * @see BaseJavaUiFactory - The factory creating this pane
- *
- * @version 2.3
- * @since 2.2
- */
 public class OrmEclipseLinkEmbeddedMapping2_0Composite
 	extends AbstractEmbeddedMappingComposite<EmbeddedMapping>
 {
-	/**
-	 * Creates a new <code>EmbeddedMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>EmbeddedMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public OrmEclipseLinkEmbeddedMapping2_0Composite(PropertyValueModel<? extends EmbeddedMapping> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-	                                WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public OrmEclipseLinkEmbeddedMapping2_0Composite(
+			PropertyValueModel<? extends EmbeddedMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEntity2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEntity2_0Composite.java
index 280bd08ab1..4eba113784 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEntity2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEntity2_0Composite.java
@@ -1,26 +1,29 @@
 /*******************************************************************************
- *  Copyright (c) 2009, 2011 Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
+ * Copyright (c) 2009, 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ *
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.orm.OrmEntity;
 import org.eclipse.swt.widgets.Composite;
 
-public class OrmEclipseLinkEntity2_0Composite extends AbstractOrmEclipseLinkEntity2_xComposite
+public class OrmEclipseLinkEntity2_0Composite
+	extends AbstractOrmEclipseLinkEntity2_xComposite
 {
 	public OrmEclipseLinkEntity2_0Composite(
-			PropertyValueModel<? extends OrmEntity> subjectHolder,
-			Composite parent, WidgetFactory widgetFactory) {
-		super(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<? extends OrmEntity> entityModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(entityModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEntity2_3Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEntity2_3Composite.java
index 183e5e2532..2dc74dbf2c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEntity2_3Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEntity2_3Composite.java
@@ -1,15 +1,15 @@
 /*******************************************************************************
- *  Copyright (c) 2011, 2012 Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
+ * Copyright (c) 2011, 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ *
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -26,12 +26,15 @@ import org.eclipse.ui.forms.events.ExpansionEvent;
 import org.eclipse.ui.forms.widgets.ExpandableComposite;
 import org.eclipse.ui.forms.widgets.Section;
 
-public class OrmEclipseLinkEntity2_3Composite extends AbstractOrmEclipseLinkEntity2_xComposite
+public class OrmEclipseLinkEntity2_3Composite
+	extends AbstractOrmEclipseLinkEntity2_xComposite
 {
 	public OrmEclipseLinkEntity2_3Composite(
-			PropertyValueModel<? extends OrmEntity> subjectHolder,
-			Composite parent, WidgetFactory widgetFactory) {
-		super(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<? extends OrmEntity> entityModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(entityModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEntityComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEntityComposite.java
index 5a694741b2..20b27daff1 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEntityComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEntityComposite.java
@@ -1,26 +1,29 @@
 /*******************************************************************************
- *  Copyright (c) 2008, 2009 Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
+ * Copyright (c) 2008, 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ *
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.orm.OrmEntity;
 import org.eclipse.swt.widgets.Composite;
 
-public class OrmEclipseLinkEntityComposite extends AbstractOrmEclipseLinkEntityComposite
+public class OrmEclipseLinkEntityComposite
+	extends AbstractOrmEclipseLinkEntityComposite
 {
 	public OrmEclipseLinkEntityComposite(
-			PropertyValueModel<? extends OrmEntity> subjectHolder,
-			Composite parent, WidgetFactory widgetFactory) {
-		super(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<? extends OrmEntity> entityModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(entityModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkIdMapping1_1Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkIdMapping1_1Composite.java
index 464c50ad60..fe2b08f442 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkIdMapping1_1Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkIdMapping1_1Composite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -31,12 +32,12 @@ public class OrmEclipseLinkIdMapping1_1Composite
 	extends EclipseLinkIdMappingComposite<IdMapping>
 {
 	public OrmEclipseLinkIdMapping1_1Composite(
-			PropertyValueModel<? extends IdMapping> subjectHolder,
+			PropertyValueModel<? extends IdMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-	        WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkIdMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkIdMapping2_0Composite.java
index 2a8594e2a4..87da6b5bab 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkIdMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkIdMapping2_0Composite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.IdMapping;
@@ -30,12 +31,12 @@ public class OrmEclipseLinkIdMapping2_0Composite
 	extends OrmEclipseLinkIdMapping1_1Composite
 {
 	public OrmEclipseLinkIdMapping2_0Composite(
-			PropertyValueModel<? extends IdMapping> subjectHolder,
+			PropertyValueModel<? extends IdMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkIdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkIdMappingComposite.java
index 843c43ab95..dc800a1aef 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkIdMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkIdMappingComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.IdMapping;
@@ -27,12 +28,12 @@ public class OrmEclipseLinkIdMappingComposite
 	extends EclipseLinkIdMappingComposite<IdMapping>
 {
 	public OrmEclipseLinkIdMappingComposite(
-			PropertyValueModel<? extends IdMapping> subjectHolder,
+			PropertyValueModel<? extends IdMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-	        WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToManyMapping1_1Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToManyMapping1_1Composite.java
index 3e2383028a..04b6b52a36 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToManyMapping1_1Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToManyMapping1_1Composite.java
@@ -9,9 +9,9 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.jpa.core.context.ManyToManyMapping;
 import org.eclipse.jpt.jpa.core.context.orm.OrmManyToManyMapping;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkJoinFetchComboViewer;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkManyToManyMappingComposite;
@@ -21,8 +21,6 @@ import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer;
 import org.eclipse.jpt.jpa.ui.internal.details.CascadeComposite;
 import org.eclipse.jpt.jpa.ui.internal.details.FetchTypeComboViewer;
 import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages;
-import org.eclipse.jpt.jpa.ui.internal.details.ManyToManyJoiningStrategyPane;
-import org.eclipse.jpt.jpa.ui.internal.details.OrderingComposite;
 import org.eclipse.jpt.jpa.ui.internal.details.TargetEntityClassChooser;
 import org.eclipse.jpt.jpa.ui.internal.details.orm.JptUiDetailsOrmMessages;
 import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmMappingNameText;
@@ -31,63 +29,16 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | TargetEntityComposite                                                 | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | JoiningStrategyComposite                                              | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | FetchTypeComposite                                                    | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | CascadeComposite                                                      | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | OrderingComposite                                                     | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see {@link ManyToManyMapping}
- * @see {@link TargetEntityClassChooser}
- * @see {@link ManyToManyJoiningStrategyPane}
- * @see {@link FetchTypeComboViewer}
- * @see {@link CascadeComposite}
- * @see {@link OrderingComposite}
- *
- * @version 2.3
- * @since 2.2
- */
 public class OrmEclipseLinkManyToManyMapping1_1Composite
 	extends EclipseLinkManyToManyMappingComposite<OrmManyToManyMapping>
 {
-	/**
-	 * Creates a new <code>ManyToManyMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>IManyToManyMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public OrmEclipseLinkManyToManyMapping1_1Composite(PropertyValueModel<? extends OrmManyToManyMapping> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-	                                WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public OrmEclipseLinkManyToManyMapping1_1Composite(
+			PropertyValueModel<? extends OrmManyToManyMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToManyMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToManyMapping2_0Composite.java
index d7073e216b..5aac494765 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToManyMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToManyMapping2_0Composite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.orm.OrmManyToManyMapping;
@@ -33,12 +34,12 @@ public class OrmEclipseLinkManyToManyMapping2_0Composite
 	extends EclipseLinkManyToManyMappingComposite<OrmManyToManyMapping>
 {
 	public OrmEclipseLinkManyToManyMapping2_0Composite(
-			PropertyValueModel<? extends OrmManyToManyMapping> subjectHolder,
+			PropertyValueModel<? extends OrmManyToManyMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-	        WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToManyMappingComposite.java
index 8c2eb22874..b7e290e825 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToManyMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToManyMappingComposite.java
@@ -9,9 +9,9 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.jpa.core.context.ManyToManyMapping;
 import org.eclipse.jpt.jpa.core.context.orm.OrmManyToManyMapping;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkJoinFetchComboViewer;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkManyToManyMappingComposite;
@@ -19,8 +19,6 @@ import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsM
 import org.eclipse.jpt.jpa.ui.internal.details.CascadeComposite;
 import org.eclipse.jpt.jpa.ui.internal.details.FetchTypeComboViewer;
 import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages;
-import org.eclipse.jpt.jpa.ui.internal.details.ManyToManyJoiningStrategyPane;
-import org.eclipse.jpt.jpa.ui.internal.details.OrderingComposite;
 import org.eclipse.jpt.jpa.ui.internal.details.TargetEntityClassChooser;
 import org.eclipse.jpt.jpa.ui.internal.details.orm.JptUiDetailsOrmMessages;
 import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmMappingNameText;
@@ -29,63 +27,16 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | TargetEntityComposite                                                 | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | JoiningStrategyComposite                                              | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | FetchTypeComposite                                                    | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | CascadeComposite                                                      | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | OrderingComposite                                                     | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see {@link ManyToManyMapping}
- * @see {@link TargetEntityClassChooser}
- * @see {@link ManyToManyJoiningStrategyPane}
- * @see {@link FetchTypeComboViewer}
- * @see {@link CascadeComposite}
- * @see {@link OrderingComposite}
- *
- * @version 2.3
- * @since 2.2
- */
 public class OrmEclipseLinkManyToManyMappingComposite
 	extends EclipseLinkManyToManyMappingComposite<OrmManyToManyMapping>
 {
-	/**
-	 * Creates a new <code>ManyToManyMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>IManyToManyMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public OrmEclipseLinkManyToManyMappingComposite(PropertyValueModel<? extends OrmManyToManyMapping> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-	                                 WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public OrmEclipseLinkManyToManyMappingComposite(
+			PropertyValueModel<? extends OrmManyToManyMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToOneMapping1_1Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToOneMapping1_1Composite.java
index be0b8b2838..3236cc2054 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToOneMapping1_1Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToOneMapping1_1Composite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -32,63 +33,16 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | TargetEntityComposite                                                 | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | JoiningStrategyComposite                                              | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | FetchTypeComposite                                                    | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | OptionalComposite                                                     | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | CascadeComposite                                                      | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see {@link ManyToOneMapping}
- * @see {@link TargetEntityClassChooser}
- * @see {@link ManyToOneJoiningStrategyPane}
- * @see {@link FetchTypeComboViewer}
- * @see {@link OptionalComposite}
- * @see {@link CascadeComposite}
- *
- * @version 2.3
- * @since 2.2
- */
 public class OrmEclipseLinkManyToOneMapping1_1Composite
 	extends EclipseLinkManyToOneMappingComposite<ManyToOneMapping>
 {
-	/**
-	 * Creates a new <code>EclipseLink1_1ManyToOneMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>ManyToOneMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public OrmEclipseLinkManyToOneMapping1_1Composite(PropertyValueModel<? extends ManyToOneMapping> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-	                                 WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public OrmEclipseLinkManyToOneMapping1_1Composite(
+			PropertyValueModel<? extends ManyToOneMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+	        WidgetFactory widgetFactory,
+	        ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToOneMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToOneMapping2_0Composite.java
index 86ddbdaa7c..884d490ac5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToOneMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToOneMapping2_0Composite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -38,12 +39,12 @@ public class OrmEclipseLinkManyToOneMapping2_0Composite
 	extends AbstractManyToOneMapping2_0Composite<ManyToOneMapping, ManyToOneRelationship2_0>
 {
 	public OrmEclipseLinkManyToOneMapping2_0Composite(
-			PropertyValueModel<? extends ManyToOneMapping> subjectHolder,
+			PropertyValueModel<? extends ManyToOneMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-	        WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+	        WidgetFactory widgetFactory,
+	        ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToOneMappingComposite.java
index e667440f60..84498b3ae9 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToOneMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToOneMappingComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -30,63 +31,16 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | TargetEntityComposite                                                 | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | JoiningStrategyComposite                                              | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | FetchTypeComposite                                                    | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | OptionalComposite                                                     | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | CascadeComposite                                                      | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see {@link ManyToOneMapping}
- * @see {@link TargetEntityClassChooser}
- * @see {@link ManyToOneJoiningStrategyPane}
- * @see {@link FetchTypeComboViewer}
- * @see {@link OptionalComposite}
- * @see {@link CascadeComposite}
- *
- * @version 2.3
- * @since 2.2
- */
 public class OrmEclipseLinkManyToOneMappingComposite
 	extends EclipseLinkManyToOneMappingComposite<ManyToOneMapping>
 {
-	/**
-	 * Creates a new <code>EclipseLink1_1ManyToOneMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>ManyToOneMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public OrmEclipseLinkManyToOneMappingComposite(PropertyValueModel<? extends ManyToOneMapping> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-	                                WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public OrmEclipseLinkManyToOneMappingComposite(
+			PropertyValueModel<? extends ManyToOneMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+	        WidgetFactory widgetFactory,
+	        ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclass2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclass2_0Composite.java
index d827e7588a..3849aad483 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclass2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclass2_0Composite.java
@@ -1,15 +1,15 @@
 /*******************************************************************************
- *  Copyright (c) 2009, 2012 Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
+ * Copyright (c) 2008, 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ *
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.orm.OrmMappedSuperclass;
@@ -20,10 +20,11 @@ public class OrmEclipseLinkMappedSuperclass2_0Composite
 	extends AbstractOrmEclipseLinkMappedSuperclassComposite
 {
 	public OrmEclipseLinkMappedSuperclass2_0Composite(
-			PropertyValueModel<? extends OrmMappedSuperclass> subjectHolder,
-			Composite parent, WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<? extends OrmMappedSuperclass> mappedSuperclassModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclass2_1Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclass2_1Composite.java
index b70434d881..c08f2b5f36 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclass2_1Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclass2_1Composite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -26,13 +27,14 @@ import org.eclipse.ui.forms.widgets.ExpandableComposite;
 import org.eclipse.ui.forms.widgets.Section;
 
 public class OrmEclipseLinkMappedSuperclass2_1Composite
-	extends AbstractOrmEclipseLinkMappedSuperclassComposite {
-
+	extends AbstractOrmEclipseLinkMappedSuperclassComposite
+{
 	public OrmEclipseLinkMappedSuperclass2_1Composite(
-			PropertyValueModel<? extends OrmMappedSuperclass> subjectHolder, 
-			Composite parent, WidgetFactory widgetFactory) {
-
-		super(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<? extends OrmMappedSuperclass> mappedSuperclassModel, 
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclass2_3Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclass2_3Composite.java
index e845ebf3d5..c20b22e901 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclass2_3Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclass2_3Composite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -29,13 +30,14 @@ import org.eclipse.ui.forms.widgets.ExpandableComposite;
 import org.eclipse.ui.forms.widgets.Section;
 
 public class OrmEclipseLinkMappedSuperclass2_3Composite
-	extends AbstractOrmEclipseLinkMappedSuperclassComposite {
-
+	extends AbstractOrmEclipseLinkMappedSuperclassComposite
+{
 	public OrmEclipseLinkMappedSuperclass2_3Composite(
-			PropertyValueModel<? extends OrmMappedSuperclass> subjectHolder, 
-			Composite parent, WidgetFactory widgetFactory) {
-
-		super(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<? extends OrmMappedSuperclass> mappedSuperclassModel, 
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclassComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclassComposite.java
index c1b6e3fa23..626b924fd2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclassComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclassComposite.java
@@ -1,15 +1,15 @@
 /*******************************************************************************
- *  Copyright (c) 2008, 2011 Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
+ * Copyright (c) 2008, 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ *
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.orm.OrmMappedSuperclass;
@@ -19,9 +19,10 @@ public class OrmEclipseLinkMappedSuperclassComposite
 	extends AbstractOrmEclipseLinkMappedSuperclassComposite
 {
 	public OrmEclipseLinkMappedSuperclassComposite(
-			PropertyValueModel<? extends OrmMappedSuperclass> subjectHolder,
-			Composite parent, WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<? extends OrmMappedSuperclass> mappedSuperclassModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToManyMapping1_1Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToManyMapping1_1Composite.java
index af1adee3fd..a046539648 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToManyMapping1_1Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToManyMapping1_1Composite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -31,16 +32,16 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 
-
 public class OrmEclipseLinkOneToManyMapping1_1Composite
 	extends EclipseLinkOneToManyMappingComposite<OneToManyMapping>
 {
 	public OrmEclipseLinkOneToManyMapping1_1Composite(
-			PropertyValueModel<? extends OneToManyMapping> subjectHolder,
+			PropertyValueModel<? extends OneToManyMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToManyMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToManyMapping2_0Composite.java
index b291477c23..21e3f5614c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToManyMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToManyMapping2_0Composite.java
@@ -1,14 +1,15 @@
 /*******************************************************************************
-* Copyright (c) 2009, 2012 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
+ * Copyright (c) 2009, 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ *
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -35,17 +36,16 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 
-
 public class OrmEclipseLinkOneToManyMapping2_0Composite
 	extends EclipseLinkOneToManyMappingComposite<OneToManyMapping>
 {
 	public OrmEclipseLinkOneToManyMapping2_0Composite(
-			PropertyValueModel<? extends OneToManyMapping> subjectHolder,
+			PropertyValueModel<? extends OneToManyMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToManyMappingComposite.java
index 2390dacc2d..d5db154585 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToManyMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToManyMappingComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -34,11 +35,12 @@ public class OrmEclipseLinkOneToManyMappingComposite
 	extends EclipseLinkOneToManyMappingComposite<OneToManyMapping>
 {
 	public OrmEclipseLinkOneToManyMappingComposite(
-			PropertyValueModel<? extends OneToManyMapping> subjectHolder,
+			PropertyValueModel<? extends OneToManyMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToOneMapping1_1Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToOneMapping1_1Composite.java
index 0905086660..55a560f51f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToOneMapping1_1Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToOneMapping1_1Composite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -34,82 +35,16 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | TargetEntityComposite                                                 | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | AccessTypeComposite                                                   | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | OneToOneJoiningStrategyPane                                           | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | FetchTypeComposite                                                    | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | EclipseLinkJoinFetchComposite                                         | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | OptionalComposite                                                     | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | EclipseLinkPrivateOwnedComposite                                      | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | CascadeComposite                                                      | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see OneToOneMapping
- * @see AccessTypeComposite
- * @see CascadeComposite
- * @see EclipseLinkJoinFetchComboViewer
- * @see EclipseLinkPrivateOwnedCheckBox
- * @see FetchTypeComboViewer
- * @see MappedByPane
- * @see OneToOneJoiningStrategyPane
- * @see OptionalComposite
- * @see TargetEntityClassChooser
- *
- * @version 2.3
- * @since 2.2
- */
 public class OrmEclipseLinkOneToOneMapping1_1Composite
-extends EclipseLinkOneToOneMappingComposite<OneToOneMapping>
+	extends EclipseLinkOneToOneMappingComposite<OneToOneMapping>
 {
-	/**
-	 * Creates a new <code>Eclipselink1_1OneToOneMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>IOneToOneMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public OrmEclipseLinkOneToOneMapping1_1Composite(PropertyValueModel<? extends OneToOneMapping> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-	                                WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public OrmEclipseLinkOneToOneMapping1_1Composite(
+			PropertyValueModel<? extends OneToOneMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+	        WidgetFactory widgetFactory,
+	        ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToOneMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToOneMapping2_0Composite.java
index 6a3bc231cc..697d350b47 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToOneMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToOneMapping2_0Composite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -44,12 +45,12 @@ public class OrmEclipseLinkOneToOneMapping2_0Composite
 	extends AbstractOneToOneMapping2_0Composite<OneToOneMapping, OneToOneRelationship2_0>
 {
 	public OrmEclipseLinkOneToOneMapping2_0Composite(
-			PropertyValueModel<? extends OneToOneMapping> subjectHolder,
+			PropertyValueModel<? extends OneToOneMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+	        WidgetFactory widgetFactory,
+	        ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToOneMappingComposite.java
index da930dd4c0..f43a61cd16 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToOneMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToOneMappingComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -32,82 +33,16 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | TargetEntityComposite                                                 | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | AccessTypeComposite                                                   | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | OneToOneJoiningStrategyPane                                           | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | FetchTypeComposite                                                    | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | EclipseLinkJoinFetchComposite                                         | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | OptionalComposite                                                     | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | EclipseLinkPrivateOwnedComposite                                      | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | CascadeComposite                                                      | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see OneToOneMapping
- * @see AccessTypeComposite
- * @see CascadeComposite
- * @see EclipseLinkJoinFetchComboViewer
- * @see EclipseLinkPrivateOwnedCheckBox
- * @see FetchTypeComboViewer
- * @see MappedByPane
- * @see OneToOneJoiningStrategyPane
- * @see OptionalComposite
- * @see TargetEntityClassChooser
- *
- * @version 2.2
- * @since 2.2
- */
 public class OrmEclipseLinkOneToOneMappingComposite
-extends EclipseLinkOneToOneMappingComposite<OneToOneMapping>
+	extends EclipseLinkOneToOneMappingComposite<OneToOneMapping>
 {
-	/**
-	 * Creates a new <code>Eclipselink1_1OneToOneMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>IOneToOneMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public OrmEclipseLinkOneToOneMappingComposite(PropertyValueModel<? extends OneToOneMapping> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-	                                WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public OrmEclipseLinkOneToOneMappingComposite(
+			PropertyValueModel<? extends OneToOneMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+	        WidgetFactory widgetFactory,
+	        ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkStructureMapping2_3UiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkStructureMapping2_3UiDefinition.java
index 81d66a90eb..6ca35e2d19 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkStructureMapping2_3UiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkStructureMapping2_3UiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
@@ -44,13 +45,7 @@ public class OrmEclipseLinkStructureMapping2_3UiDefinition
 		super();
 	}
 
-	public JpaComposite buildAttributeMappingComposite(
-			OrmXmlUiFactory factory, 
-			PropertyValueModel<EclipseLinkStructureMapping2_3> subjectHolder, 
-			PropertyValueModel<Boolean> enabledModel, 
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return new EclipseLinkStructureMapping2_3Composite(subjectHolder, enabledModel, parent, widgetFactory);
+	public JpaComposite buildAttributeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<EclipseLinkStructureMapping2_3> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return new EclipseLinkStructureMapping2_3Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkTransformationMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkTransformationMappingUiDefinition.java
index eef7a31258..3cefcea512 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkTransformationMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkTransformationMappingUiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
@@ -44,14 +45,7 @@ public class OrmEclipseLinkTransformationMappingUiDefinition
 		super();
 	}
 	
-	
-	public JpaComposite buildAttributeMappingComposite(
-			OrmXmlUiFactory factory,
-			PropertyValueModel<EclipseLinkTransformationMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return new EclipseLinkTransformationMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+	public JpaComposite buildAttributeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<EclipseLinkTransformationMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return new EclipseLinkTransformationMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkVariableOneToOneMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkVariableOneToOneMappingUiDefinition.java
index e459f3deaa..563eb33f11 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkVariableOneToOneMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkVariableOneToOneMappingUiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
@@ -44,14 +45,7 @@ public class OrmEclipseLinkVariableOneToOneMappingUiDefinition
 		super();
 	}
 	
-	
-	public JpaComposite buildAttributeMappingComposite(
-			OrmXmlUiFactory factory,
-			PropertyValueModel<EclipseLinkVariableOneToOneMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return new EclipseLinkVariableOneToOneMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+	public JpaComposite buildAttributeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<EclipseLinkVariableOneToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return new EclipseLinkVariableOneToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkVersionMapping1_1Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkVersionMapping1_1Composite.java
index a4092f02c9..3152a8bcb3 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkVersionMapping1_1Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkVersionMapping1_1Composite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -30,19 +31,13 @@ import org.eclipse.ui.forms.widgets.Hyperlink;
 public class OrmEclipseLinkVersionMapping1_1Composite
 	extends EclipseLinkVersionMappingComposite<VersionMapping>
 {
-	/**
-	 * Creates a new <code>EclipseLinkOrmVersionMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>VersionMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public OrmEclipseLinkVersionMapping1_1Composite(PropertyValueModel<? extends VersionMapping> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-									WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public OrmEclipseLinkVersionMapping1_1Composite(
+			PropertyValueModel<? extends VersionMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkVersionMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkVersionMappingComposite.java
index 0e9516f689..8ded1ffa43 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkVersionMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkVersionMappingComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.VersionMapping;
@@ -26,19 +27,13 @@ import org.eclipse.ui.forms.widgets.Hyperlink;
 public class OrmEclipseLinkVersionMappingComposite
 	extends EclipseLinkVersionMappingComposite<VersionMapping>
 {
-	/**
-	 * Creates a new <code>EclipseLinkOrmVersionMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>VersionMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public OrmEclipseLinkVersionMappingComposite(PropertyValueModel<? extends VersionMapping> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-									WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public OrmEclipseLinkVersionMappingComposite(
+			PropertyValueModel<? extends VersionMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EclipseLinkPersistenceUnitCachingEditorPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EclipseLinkPersistenceUnitCachingEditorPage.java
index 37b4183ff4..c1e3690ab1 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EclipseLinkPersistenceUnitCachingEditorPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EclipseLinkPersistenceUnitCachingEditorPage.java
@@ -1,15 +1,16 @@
 /*******************************************************************************
-* Copyright (c) 2007, 2012 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
+ * Copyright (c) 2007, 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.caching;
 
 import java.util.Collection;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
@@ -25,14 +26,14 @@ import org.eclipse.ui.forms.widgets.ExpandableComposite;
 import org.eclipse.ui.forms.widgets.Section;
 
 public class EclipseLinkPersistenceUnitCachingEditorPage<T extends Caching>
-								extends Pane<T>
+	extends Pane<T>
 {
 	public EclipseLinkPersistenceUnitCachingEditorPage(
 			PropertyValueModel<T> subjectModel,
-			Composite parent,
-            WidgetFactory widgetFactory) {
-
-		super(subjectModel, parent, widgetFactory);
+			Composite parentComposite,
+            WidgetFactory widgetFactory,
+            ResourceManager resourceManager) {
+		super(subjectModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EclipseLinkPersistenceUnitCachingEditorPageDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EclipseLinkPersistenceUnitCachingEditorPageDefinition.java
index b2facfae40..98b0181074 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EclipseLinkPersistenceUnitCachingEditorPageDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EclipseLinkPersistenceUnitCachingEditorPageDefinition.java
@@ -1,19 +1,21 @@
 /*******************************************************************************
-* Copyright (c) 2007, 2012 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
+ * Copyright (c) 2007, 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.caching;
 
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
+import org.eclipse.jpt.common.utility.internal.transformer.AbstractTransformer;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.jpa.core.JpaStructureNode;
+import org.eclipse.jpt.common.utility.transformer.Transformer;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
 import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.Caching;
 import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit;
@@ -45,12 +47,12 @@ public class EclipseLinkPersistenceUnitCachingEditorPageDefinition
 		super();
 	}
 
-	public String getPageText() {
-		return EclipseLinkUiMessages.PersistenceXmlCachingTab_title;
+	public ImageDescriptor getTitleImageDescriptor() {
+		return null;
 	}
 
-	public ImageDescriptor getPageImageDescriptor() {
-		return null;
+	public String getTitleText() {
+		return EclipseLinkUiMessages.PersistenceXmlCachingTab_title;
 	}
 
 	public String getHelpID() {
@@ -58,16 +60,22 @@ public class EclipseLinkPersistenceUnitCachingEditorPageDefinition
 	}
 
 	@Override
-	public void buildEditorPageContent(Composite parent, WidgetFactory widgetFactory, PropertyValueModel<JpaStructureNode> jpaRootStructureNodeModel) {
-		new EclipseLinkPersistenceUnitCachingEditorPage<Caching>(this.buildCachingModel(jpaRootStructureNodeModel), parent, widgetFactory);
+	protected void buildEditorPageContent(Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager, PropertyValueModel<PersistenceUnit> persistenceUnitModel) {
+		new EclipseLinkPersistenceUnitCachingEditorPage<Caching>(buildCachingModel(persistenceUnitModel), parentComposite, widgetFactory, resourceManager);
 	}
-	
-	private PropertyValueModel<Caching> buildCachingModel(PropertyValueModel<JpaStructureNode> jpaRootStructureNodeModel) {
-		return new TransformationPropertyValueModel<PersistenceUnit, Caching>(this.buildPersistenceUnitModel(jpaRootStructureNodeModel)) {
-			@Override
-			protected Caching transform_(PersistenceUnit value) {
-				return ((EclipseLinkPersistenceUnit) value).getCaching();
-			}
-		};
+
+	public static PropertyValueModel<Caching> buildCachingModel(PropertyValueModel<PersistenceUnit> persistenceUnitModel) {
+		return new TransformationPropertyValueModel<PersistenceUnit, Caching>(persistenceUnitModel, CACHING_TRANSFORMER);
+	}
+
+	public static final Transformer<PersistenceUnit, Caching> CACHING_TRANSFORMER = new CachingTransformer();
+
+	public static class CachingTransformer
+		extends AbstractTransformer<PersistenceUnit, Caching>
+	{
+		@Override
+		protected Caching transform_(PersistenceUnit persistenceUnit) {
+			return ((EclipseLinkPersistenceUnit) persistenceUnit).getCaching();
+		}
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkPersistenceUnitConnectionEditorPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkPersistenceUnitConnectionEditorPage.java
index c9c373a436..b6ab360c9a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkPersistenceUnitConnectionEditorPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkPersistenceUnitConnectionEditorPage.java
@@ -10,9 +10,9 @@
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.connection;
 
 import java.util.Collection;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.JptCommonUiMessages;
-import org.eclipse.jpt.common.ui.internal.utility.swt.SWTTools;
 import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer;
 import org.eclipse.jpt.common.ui.internal.widgets.IntegerCombo;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
@@ -35,14 +35,15 @@ import org.eclipse.ui.forms.widgets.ExpandableComposite;
 import org.eclipse.ui.forms.widgets.Section;
 
 public class EclipseLinkPersistenceUnitConnectionEditorPage
-	extends Pane<Connection> {
-
+	extends Pane<Connection>
+{
 	public EclipseLinkPersistenceUnitConnectionEditorPage(
-			PropertyValueModel<Connection> subjectHolder,
-            Composite parent,
-            WidgetFactory widgetFactory) {
-
-		super(subjectHolder, parent, widgetFactory);
+		PropertyValueModel<Connection> connectionModel,
+		Composite parentComposite,
+		WidgetFactory widgetFactory,
+		ResourceManager resourceManager
+	) {
+		super(connectionModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
@@ -83,7 +84,7 @@ public class EclipseLinkPersistenceUnitConnectionEditorPage
 		);
 		IntegerCombo<?> combo = addCacheStatementsSizeCombo(client);
 
-		this.installControlEnabler(cacheStatementsHolder, combo);
+		this.controlEnabledState(cacheStatementsHolder, combo.getControl());
 
 
 		TriStateCheckBox nativeSqlCheckBox = this.addTriStateCheckBoxWithDefault(
@@ -342,8 +343,4 @@ public class EclipseLinkPersistenceUnitConnectionEditorPage
 			}
 		};
 	}
-
-	private void installControlEnabler(ModifiablePropertyValueModel<Boolean> cacheStatementsHolder, IntegerCombo<?> combo) {
-		SWTTools.controlEnabledState(cacheStatementsHolder, combo.getControl());
-	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkPersistenceUnitConnectionEditorPageDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkPersistenceUnitConnectionEditorPageDefinition.java
index 092ff71f17..4b239e7e8c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkPersistenceUnitConnectionEditorPageDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkPersistenceUnitConnectionEditorPageDefinition.java
@@ -10,10 +10,12 @@
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.connection;
 
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
+import org.eclipse.jpt.common.utility.internal.transformer.AbstractTransformer;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.jpa.core.JpaStructureNode;
+import org.eclipse.jpt.common.utility.transformer.Transformer;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
 import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.Connection;
 import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit;
@@ -45,12 +47,12 @@ public class EclipseLinkPersistenceUnitConnectionEditorPageDefinition
 		super();
 	}
 
-	public String getPageText() {
-		return EclipseLinkUiMessages.PersistenceXmlConnectionTab_title;
+	public ImageDescriptor getTitleImageDescriptor() {
+		return null;
 	}
 
-	public ImageDescriptor getPageImageDescriptor() {
-		return null;
+	public String getTitleText() {
+		return EclipseLinkUiMessages.PersistenceXmlConnectionTab_title;
 	}
 
 	public String getHelpID() {
@@ -58,16 +60,22 @@ public class EclipseLinkPersistenceUnitConnectionEditorPageDefinition
 	}
 
 	@Override
-	public void buildEditorPageContent(Composite parent, WidgetFactory widgetFactory, PropertyValueModel<JpaStructureNode> jpaRootStructureNodeModel) {
-		new EclipseLinkPersistenceUnitConnectionEditorPage(this.buildConnectionModel(jpaRootStructureNodeModel), parent, widgetFactory);
+	protected void buildEditorPageContent(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager, PropertyValueModel<PersistenceUnit> persistenceUnitModel) {
+		new EclipseLinkPersistenceUnitConnectionEditorPage(buildConnectionModel(persistenceUnitModel), parent, widgetFactory, resourceManager);
 	}
 
-	private PropertyValueModel<Connection> buildConnectionModel(PropertyValueModel<JpaStructureNode> jpaRootStructureNodeModel) {
-		return new TransformationPropertyValueModel<PersistenceUnit, Connection>(this.buildPersistenceUnitModel(jpaRootStructureNodeModel)) {
-			@Override
-			protected Connection transform_(PersistenceUnit value) {
-				return ((EclipseLinkPersistenceUnit) value).getConnection();
-			}
-		};
+	public static PropertyValueModel<Connection> buildConnectionModel(PropertyValueModel<PersistenceUnit> persistenceUnitModel) {
+		return new TransformationPropertyValueModel<PersistenceUnit, Connection>(persistenceUnitModel, CONNECTION_TRANSFORMER);
+	}
+
+	public static final Transformer<PersistenceUnit, Connection> CONNECTION_TRANSFORMER = new ConnectionTransformer();
+
+	public static class ConnectionTransformer
+		extends AbstractTransformer<PersistenceUnit, Connection>
+	{
+		@Override
+		protected Connection transform_(PersistenceUnit persistenceUnit) {
+			return ((EclipseLinkPersistenceUnit) persistenceUnit).getConnection();
+		}
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkPersistenceUnitCustomizationEditorPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkPersistenceUnitCustomizationEditorPage.java
index 3a943b7bd7..aaaecca50f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkPersistenceUnitCustomizationEditorPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkPersistenceUnitCustomizationEditorPage.java
@@ -10,6 +10,7 @@
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.customization;
 
 import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.JptCommonUiMessages;
 import org.eclipse.jpt.common.ui.internal.widgets.ClassChooserPane;
@@ -37,10 +38,10 @@ public class EclipseLinkPersistenceUnitCustomizationEditorPage<T extends Customi
 {
 	public EclipseLinkPersistenceUnitCustomizationEditorPage(
 			PropertyValueModel<T> subjectModel,
-			Composite parent,
-            WidgetFactory widgetFactory) {
-
-		super(subjectModel, parent, widgetFactory);
+			Composite parentComposite,
+            WidgetFactory widgetFactory,
+            ResourceManager resourceManager) {
+		super(subjectModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkPersistenceUnitCustomizationEditorPageDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkPersistenceUnitCustomizationEditorPageDefinition.java
index 9ea912ee72..67a303a33f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkPersistenceUnitCustomizationEditorPageDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkPersistenceUnitCustomizationEditorPageDefinition.java
@@ -10,10 +10,12 @@
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.customization;
 
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
+import org.eclipse.jpt.common.utility.internal.transformer.AbstractTransformer;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.jpa.core.JpaStructureNode;
+import org.eclipse.jpt.common.utility.transformer.Transformer;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
 import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.Customization;
 import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit;
@@ -45,12 +47,12 @@ public class EclipseLinkPersistenceUnitCustomizationEditorPageDefinition
 		super();
 	}
 
-	public String getPageText() {
-		return EclipseLinkUiMessages.PersistenceXmlCustomizationTab_title;
+	public ImageDescriptor getTitleImageDescriptor() {
+		return null;
 	}
 
-	public ImageDescriptor getPageImageDescriptor() {
-		return null;
+	public String getTitleText() {
+		return EclipseLinkUiMessages.PersistenceXmlCustomizationTab_title;
 	}
 
 	public String getHelpID() {
@@ -58,19 +60,22 @@ public class EclipseLinkPersistenceUnitCustomizationEditorPageDefinition
 	}
 
 	@Override
-	public void buildEditorPageContent(Composite parent, WidgetFactory widgetFactory, PropertyValueModel<JpaStructureNode> jpaRootStructureNodeModel) {
-		new EclipseLinkPersistenceUnitCustomizationEditorPage<Customization>(
-				this.buildCustomizationHolder(jpaRootStructureNodeModel), 
-				parent,
-				widgetFactory);
+	protected void buildEditorPageContent(Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager, PropertyValueModel<PersistenceUnit> persistenceUnitModel) {
+		new EclipseLinkPersistenceUnitCustomizationEditorPage<Customization>(buildCustomizationModel(persistenceUnitModel), parentComposite, widgetFactory, resourceManager);
 	}
 
-	private PropertyValueModel<Customization> buildCustomizationHolder(PropertyValueModel<JpaStructureNode> jpaRootStructureNodeModel) {
-		return new TransformationPropertyValueModel<PersistenceUnit, Customization>(this.buildPersistenceUnitModel(jpaRootStructureNodeModel)) {
-			@Override
-			protected Customization transform_(PersistenceUnit value) {
-				return ((EclipseLinkPersistenceUnit) value).getCustomization();
-			}
-		};
+	public static PropertyValueModel<Customization> buildCustomizationModel(PropertyValueModel<PersistenceUnit> persistenceUnitModel) {
+		return new TransformationPropertyValueModel<PersistenceUnit, Customization>(persistenceUnitModel, CUSTOMIZATION_TRANSFORMER);
+	}
+
+	public static final Transformer<PersistenceUnit, Customization> CUSTOMIZATION_TRANSFORMER = new CustomizationTransformer();
+
+	public static class CustomizationTransformer
+		extends AbstractTransformer<PersistenceUnit, Customization>
+	{
+		@Override
+		protected Customization transform_(PersistenceUnit persistenceUnit) {
+			return ((EclipseLinkPersistenceUnit) persistenceUnit).getCustomization();
+		}
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitGeneralEditorPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitGeneralEditorPage.java
index e96f17fef5..d8cb77e729 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitGeneralEditorPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitGeneralEditorPage.java
@@ -9,6 +9,7 @@
  *******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.general;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
@@ -19,22 +20,21 @@ import org.eclipse.swt.widgets.Control;
 public class EclipseLinkPersistenceUnitGeneralEditorPage
 	extends PersistenceUnitGeneralEditorPage
 {
-
 	public EclipseLinkPersistenceUnitGeneralEditorPage(
 			PropertyValueModel<PersistenceUnit> subjectHolder,
             Composite parent,
-            WidgetFactory widgetFactory) {
-
-		super(subjectHolder, parent, widgetFactory);
+            WidgetFactory widgetFactory,
+            ResourceManager resourceManager) {
+		super(subjectHolder, parent, widgetFactory, resourceManager);
 	}
 
 	@Override
-	protected Control buildMappingFilesComposite(Composite parent) {
-		return new EclipseLinkPersistenceUnitMappingFilesComposite(this, parent).getControl();
+	protected Control buildMappingFilesComposite(Composite parentComposite) {
+		return new EclipseLinkPersistenceUnitMappingFilesComposite(this, parentComposite).getControl();
 	}
 
 	@Override
-	protected Control buildJarFilesComposite(Composite parent) {
-		return new EclipseLinkPersistenceUnitJarFilesComposite(this, parent).getControl();
+	protected Control buildJarFilesComposite(Composite parentComposite) {
+		return new EclipseLinkPersistenceUnitJarFilesComposite(this, parentComposite).getControl();
 	}
-}
-\ No newline at end of file
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitGeneralEditorPageDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitGeneralEditorPageDefinition.java
index 4aaf11bd9c..0a6e5bafb9 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitGeneralEditorPageDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitGeneralEditorPageDefinition.java
@@ -10,9 +10,10 @@
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.general;
 
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.jpa.core.JpaStructureNode;
+import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
 import org.eclipse.jpt.jpa.ui.editors.JpaEditorPageDefinition;
 import org.eclipse.jpt.jpa.ui.internal.jpa2.persistence.PersistenceUnitEditorPageDefinition;
 import org.eclipse.jpt.jpa.ui.internal.persistence.PersistenceUnitGeneralEditorPageDefinition;
@@ -40,20 +41,20 @@ public class EclipseLinkPersistenceUnitGeneralEditorPageDefinition
 		super();
 	}
 
-	@Override
-	public void buildEditorPageContent(Composite parent, WidgetFactory widgetFactory, PropertyValueModel<JpaStructureNode> jpaRootStructureNodeModel) {
-		new EclipseLinkPersistenceUnitGeneralEditorPage(this.buildPersistenceUnitModel(jpaRootStructureNodeModel), parent, widgetFactory);
-	}
-
-	public String getPageText() {
-		return PersistenceUnitGeneralEditorPageDefinition.instance().getPageText();
+	public ImageDescriptor getTitleImageDescriptor() {
+		return PersistenceUnitGeneralEditorPageDefinition.instance().getTitleImageDescriptor();
 	}
 
-	public ImageDescriptor getPageImageDescriptor() {
-		return PersistenceUnitGeneralEditorPageDefinition.instance().getPageImageDescriptor();
+	public String getTitleText() {
+		return PersistenceUnitGeneralEditorPageDefinition.instance().getTitleText();
 	}
 
 	public String getHelpID() {
 		return PersistenceUnitGeneralEditorPageDefinition.instance().getHelpID();
 	}
+
+	@Override
+	protected void buildEditorPageContent(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager, PropertyValueModel<PersistenceUnit> persistenceUnitModel) {
+		new EclipseLinkPersistenceUnitGeneralEditorPage(persistenceUnitModel, parent, widgetFactory, resourceManager);
+	}
 }
 \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitJarFilesComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitJarFilesComposite.java
index 89b9b89088..4deaf5bb18 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitJarFilesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitJarFilesComposite.java
@@ -14,18 +14,17 @@ import org.eclipse.jpt.common.core.internal.utility.ProjectTools;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
 import org.eclipse.jpt.jpa.ui.internal.persistence.ArchiveFileSelectionDialog;
-import org.eclipse.jpt.jpa.ui.internal.persistence.PersistenceUnitJarFilesComposite;
 import org.eclipse.jpt.jpa.ui.internal.persistence.ArchiveFileSelectionDialog.DeploymentPathCalculator;
+import org.eclipse.jpt.jpa.ui.internal.persistence.PersistenceUnitJarFilesComposite;
 import org.eclipse.swt.widgets.Composite;
 
 public class EclipseLinkPersistenceUnitJarFilesComposite
 	extends PersistenceUnitJarFilesComposite
 {
 	public EclipseLinkPersistenceUnitJarFilesComposite(
-			Pane<? extends PersistenceUnit> parentPane,
-			Composite parent) {
-
-		super(parentPane, parent);
+			Pane<? extends PersistenceUnit> parent,
+			Composite parentComposite) {
+		super(parent, parentComposite);
 	}
 	
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitMappingFilesComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitMappingFilesComposite.java
index 1c76275e6b..1e38f453f2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitMappingFilesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitMappingFilesComposite.java
@@ -10,52 +10,27 @@
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.general;
 
 import org.eclipse.jpt.common.ui.internal.JptCommonUiMessages;
-import org.eclipse.jpt.common.ui.internal.widgets.AddRemoveListPane;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
-import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
+import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
 import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit;
 import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.GeneralProperties;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.EclipseLinkUiMessages;
 import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
-import org.eclipse.jpt.jpa.ui.internal.persistence.PersistenceUnitGeneralEditorPageDefinition;
 import org.eclipse.jpt.jpa.ui.internal.persistence.PersistenceUnitMappingFilesComposite;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.widgets.Composite;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | AddRemoveListPane                                                     | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see PersistenceUnit
- * @see PersistenceUnitGeneralEditorPageDefinition - The parent container
- * @see AddRemoveListPane
- *
- * @version 2.0
- * @since 2.0
- */
-public class EclipseLinkPersistenceUnitMappingFilesComposite extends PersistenceUnitMappingFilesComposite
+public class EclipseLinkPersistenceUnitMappingFilesComposite
+	extends PersistenceUnitMappingFilesComposite
 {
-	/**
-	 * Creates a new <code>PersistenceUnitMappingFilesComposite</code>.
-	 *
-	 * @param parentPane The parent pane of this one
-	 * @param parent The parent container
-	 */
-	public EclipseLinkPersistenceUnitMappingFilesComposite(Pane<? extends PersistenceUnit> parentPane,
-	                                            Composite parent) {
-
-		super(parentPane, parent);
+	public EclipseLinkPersistenceUnitMappingFilesComposite(
+			Pane<? extends PersistenceUnit> parent,
+			Composite parentComposite) {
+		super(parent, parentComposite);
 	}
 
 	@Override
@@ -99,9 +74,9 @@ public class EclipseLinkPersistenceUnitMappingFilesComposite extends Persistence
 	private PropertyValueModel<String> buildExcludeEclipselinkOrmStringHolder() {
 		return new TransformationPropertyValueModel<Boolean, String>(buildDefaultExcludeEclipselinkOrmHolder()) {
 			@Override
-			protected String transform(Boolean value) {
-				if (value != null) {
-					String defaultStringValue = value.booleanValue() ? JptCommonUiMessages.Boolean_True : JptCommonUiMessages.Boolean_False;
+			protected String transform(Boolean b) {
+				if (b != null) {
+					String defaultStringValue = b.booleanValue() ? JptCommonUiMessages.Boolean_True : JptCommonUiMessages.Boolean_False;
 					return NLS.bind(EclipseLinkUiMessages.PersistenceXmlGeneralTab_excludeEclipselinkOrmWithDefault, defaultStringValue);
 				}
 				return EclipseLinkUiMessages.PersistenceXmlGeneralTab_excludeEclipselinkOrm;
@@ -123,4 +98,4 @@ public class EclipseLinkPersistenceUnitMappingFilesComposite extends Persistence
 			}
 		};
 	}
-}
-\ No newline at end of file
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkLoggingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkLoggingComposite.java
index b073c23ac6..f6f3215cd7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkLoggingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkLoggingComposite.java
@@ -10,7 +10,6 @@
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.options;
 
 import java.util.Collection;
-import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.JptCommonUiMessages;
 import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer;
 import org.eclipse.jpt.common.ui.internal.widgets.FileChooserComboPane;
@@ -29,17 +28,14 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 
-/**
- * EclipseLinkLoggingComposite
- */
 public class EclipseLinkLoggingComposite<T extends Logging>
 	extends Pane<T>
 {
 	public EclipseLinkLoggingComposite(
-				PropertyValueModel<T> subjectHolder,
-				Composite parent,
-				WidgetFactory widgetFactory) {
-		super(subjectHolder, parent, widgetFactory);
+			Pane<?> parent,
+			PropertyValueModel<T> subjectModel,
+			Composite parentComposite) {
+		super(parent, subjectModel, parentComposite);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkPersistenceUnitOptionsEditorPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkPersistenceUnitOptionsEditorPage.java
index 0e219581bd..12410e2710 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkPersistenceUnitOptionsEditorPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkPersistenceUnitOptionsEditorPage.java
@@ -12,8 +12,8 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.options;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Iterator;
-
 import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.JptCommonUiMessages;
 import org.eclipse.jpt.common.ui.internal.util.SWTUtil;
@@ -55,19 +55,19 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.forms.widgets.ExpandableComposite;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 import org.eclipse.ui.forms.widgets.Section;
-
 import com.ibm.icu.text.Collator;
 
-public class EclipseLinkPersistenceUnitOptionsEditorPage  extends Pane<PersistenceUnit>{
-
+public class EclipseLinkPersistenceUnitOptionsEditorPage
+	extends Pane<PersistenceUnit>
+{
 	private PropertyValueModel<Options> optionsHolder;
 
 	public EclipseLinkPersistenceUnitOptionsEditorPage(
-			PropertyValueModel<PersistenceUnit> subjectModel,
-            Composite parent,
-            WidgetFactory widgetFactory) {
-
-		super(subjectModel, parent, widgetFactory);
+			PropertyValueModel<PersistenceUnit> persistenceUnitModel,
+            Composite parentComposite,
+            WidgetFactory widgetFactory,
+            ResourceManager resourceManager) {
+		super(persistenceUnitModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
@@ -181,11 +181,11 @@ public class EclipseLinkPersistenceUnitOptionsEditorPage  extends Pane<Persisten
 	}
 
 	protected Control initializeLoggingSection(Section section) {			
-		return new EclipseLinkLoggingComposite<Logging>(this.buildLoggingHolder(), section, getWidgetFactory()).getControl();
+		return new EclipseLinkLoggingComposite<Logging>(this, this.buildLoggingHolder(), section).getControl();
 	}
 
-	protected Control initializeSchemaGenerationSection(Section section) {			
-		return new PersistenceXmlSchemaGenerationComposite(this.buildSchemaGenerationHolder(), section, getWidgetFactory()).getControl();
+	protected Control initializeSchemaGenerationSection(Section section) {
+		return new PersistenceXmlSchemaGenerationComposite(this, this.buildSchemaGenerationHolder(), section).getControl();
 	}
 
 	protected Control initializeMiscellaneousSection(Section section) {			
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkPersistenceUnitOptionsEditorPageDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkPersistenceUnitOptionsEditorPageDefinition.java
index 099fc928e3..7434769603 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkPersistenceUnitOptionsEditorPageDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkPersistenceUnitOptionsEditorPageDefinition.java
@@ -10,9 +10,10 @@
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.options;
 
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.jpa.core.JpaStructureNode;
+import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.EclipseLinkHelpContextIds;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.EclipseLinkUiMessages;
 import org.eclipse.jpt.jpa.ui.editors.JpaEditorPageDefinition;
@@ -41,12 +42,12 @@ public class EclipseLinkPersistenceUnitOptionsEditorPageDefinition
 		super();
 	}
 
-	public String getPageText() {
-		return EclipseLinkUiMessages.PersistenceXmlOptionsTab_title;
+	public ImageDescriptor getTitleImageDescriptor() {
+		return null;
 	}
 
-	public ImageDescriptor getPageImageDescriptor() {
-		return null;
+	public String getTitleText() {
+		return EclipseLinkUiMessages.PersistenceXmlOptionsTab_title;
 	}
 
 	public String getHelpID() {
@@ -54,7 +55,7 @@ public class EclipseLinkPersistenceUnitOptionsEditorPageDefinition
 	}
 
 	@Override
-	public void buildEditorPageContent(Composite parent, WidgetFactory widgetFactory, PropertyValueModel<JpaStructureNode> jpaRootStructureNodeModel) {
-		new EclipseLinkPersistenceUnitOptionsEditorPage(this.buildPersistenceUnitModel(jpaRootStructureNodeModel), parent, widgetFactory);
+	protected void buildEditorPageContent(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager, PropertyValueModel<PersistenceUnit> persistenceUnitModel) {
+		new EclipseLinkPersistenceUnitOptionsEditorPage(persistenceUnitModel, parent, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/PersistenceXmlSchemaGenerationComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/PersistenceXmlSchemaGenerationComposite.java
index 79fdf74751..0f5dc36154 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/PersistenceXmlSchemaGenerationComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/PersistenceXmlSchemaGenerationComposite.java
@@ -10,7 +10,6 @@
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.options;
 
 import java.util.Collection;
-import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.JptCommonUiMessages;
 import org.eclipse.jpt.common.ui.internal.util.SWTUtil;
 import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer;
@@ -31,19 +30,11 @@ import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 
-/**
- * PersistenceXmlSchemaGenerationTab
- */
 public class PersistenceXmlSchemaGenerationComposite
 	extends Pane<SchemaGeneration>
 {
-	// ********** constructors/initialization **********
-	public PersistenceXmlSchemaGenerationComposite(
-				PropertyValueModel<SchemaGeneration> subjectHolder,
-				Composite parent,
-				WidgetFactory widgetFactory) {
-
-		super(subjectHolder, parent, widgetFactory);
+	public PersistenceXmlSchemaGenerationComposite(Pane<?> parent, PropertyValueModel<SchemaGeneration> schemaGenModel, Composite parentComposite) {
+		super(parent, schemaGenModel, parentComposite);
 	}
 
 	protected String getHelpID() {
@@ -357,4 +348,4 @@ public class PersistenceXmlSchemaGenerationComposite
 			}
 		};
 	}
-}
-\ No newline at end of file
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkLogging2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkLogging2_0Composite.java
index b37b56cb97..0fb6fd16da 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkLogging2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkLogging2_0Composite.java
@@ -10,9 +10,9 @@
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.v2_0.persistence;
 
 import java.util.Collection;
-import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.JptCommonUiMessages;
 import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer;
+import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.ui.internal.widgets.TriStateCheckBox;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
@@ -31,17 +31,14 @@ import org.eclipse.ui.forms.events.ExpansionEvent;
 import org.eclipse.ui.forms.widgets.ExpandableComposite;
 import org.eclipse.ui.forms.widgets.Section;
 
-/**
- *  EclipseLinkLogging2_0Composite
- */
-public class EclipseLinkLogging2_0Composite extends EclipseLinkLoggingComposite<Logging2_0>
+public class EclipseLinkLogging2_0Composite
+	extends EclipseLinkLoggingComposite<Logging2_0>
 {
-
 	public EclipseLinkLogging2_0Composite(
-				PropertyValueModel<Logging2_0> subjectHolder,
-				Composite parent,
-				WidgetFactory widgetFactory) {
-		super(subjectHolder, parent, widgetFactory);
+			Pane<?> parent,
+			PropertyValueModel<Logging2_0> subjectModel,
+			Composite parentComposite) {
+		super(parent, subjectModel, parentComposite);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkLogging2_4Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkLogging2_4Composite.java
index 1fabf5575d..e31d2e729a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkLogging2_4Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkLogging2_4Composite.java
@@ -1,18 +1,17 @@
 /*******************************************************************************
-* Copyright (c) 2012 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
+ * Copyright (c) 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.v2_0.persistence;
 
 import java.util.Collection;
-
-import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer;
+import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.Logging2_0;
 import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.Logging2_4;
@@ -22,17 +21,14 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.forms.widgets.Section;
 
-/**
- *  EclipseLinkLogging2_4Composite
- */
-
-public class EclipseLinkLogging2_4Composite extends EclipseLinkLogging2_0Composite {
-
+public class EclipseLinkLogging2_4Composite
+	extends EclipseLinkLogging2_0Composite
+{
 	public EclipseLinkLogging2_4Composite(
-			PropertyValueModel<Logging2_0> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		super(subjectHolder, parent, widgetFactory);
+			Pane<?> parent,
+			PropertyValueModel<Logging2_0> subjectModel,
+			Composite parentComposite) {
+		super(parent, subjectModel, parentComposite);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitCaching2_0EditorPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitCaching2_0EditorPage.java
index f732e6fd4d..2139412df9 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitCaching2_0EditorPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitCaching2_0EditorPage.java
@@ -1,24 +1,25 @@
 /*******************************************************************************
-* Copyright (c) 2009, 2012 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
+ * Copyright (c) 2009, 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.v2_0.persistence;
 
 import java.util.Collection;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
-import org.eclipse.jpt.common.ui.internal.utility.swt.SWTTools;
 import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer;
 import org.eclipse.jpt.common.ui.internal.widgets.IntegerCombo;
-import org.eclipse.jpt.common.utility.internal.model.value.CompositeBooleanPropertyValueModel;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
+import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter;
 import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
+import org.eclipse.jpt.common.utility.transformer.Transformer;
 import org.eclipse.jpt.jpa.core.jpa2.context.persistence.PersistenceUnit2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.persistence.options.SharedCacheMode;
 import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.CacheType;
@@ -40,10 +41,10 @@ public class EclipseLinkPersistenceUnitCaching2_0EditorPage
 {
 	public EclipseLinkPersistenceUnitCaching2_0EditorPage(
 			PropertyValueModel<Caching> subjectModel,
-			Composite parent,
-            WidgetFactory widgetFactory) {
-
-		super(subjectModel, parent, widgetFactory);
+			Composite parentComposite,
+            WidgetFactory widgetFactory,
+            ResourceManager resourceManager) {
+		super(subjectModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
@@ -85,8 +86,8 @@ public class EclipseLinkPersistenceUnitCaching2_0EditorPage
 		Label flushClearCacheLabel = this.addLabel(client, EclipseLinkUiMessages.PersistenceXmlCachingTab_FlushClearCacheLabel);
 		Combo flushClearCacheCombo = this.addFlushClearCacheCombo(client).getControl();
 
-		SWTTools.controlEnabledState(
-			this.buildSharedCacheModeEnablerModel(persistenceUnitModel),
+		this.controlEnabledState(
+			this.buildSharedCacheModeEnabledModel(persistenceUnitModel),
 			cacheTypeLabel,
 			cacheTypeCombo,
 			cacheSizeLabel,
@@ -160,16 +161,8 @@ public class EclipseLinkPersistenceUnitCaching2_0EditorPage
 		};
 	}
 
-	@SuppressWarnings("unchecked")
-	private PropertyValueModel<Boolean> buildSharedCacheModeEnablerModel(PropertyValueModel<PersistenceUnit2_0> persistenceUnitModel) {
-		return CompositeBooleanPropertyValueModel.and(
-			this.getEnabledModel(), 
-			new TransformationPropertyValueModel<SharedCacheMode, Boolean>(this.buildSharedCacheModeModel(persistenceUnitModel)) {
-				@Override
-				protected Boolean transform(SharedCacheMode value) {
-					return Boolean.valueOf(value != SharedCacheMode.NONE);
-				}
-			});
+	private PropertyValueModel<Boolean> buildSharedCacheModeEnabledModel(PropertyValueModel<PersistenceUnit2_0> persistenceUnitModel) {
+		return new TransformationPropertyValueModel<SharedCacheMode, Boolean>(this.buildSharedCacheModeModel(persistenceUnitModel), SHARED_CACHE_MODE_ENABLED_TRANSFORMER);
 	}
 
 	private PropertyValueModel<SharedCacheMode> buildSharedCacheModeModel(PropertyValueModel<PersistenceUnit2_0> persistenceUnitModel) {
@@ -184,6 +177,16 @@ public class EclipseLinkPersistenceUnitCaching2_0EditorPage
 		};
 	}
 
+	private static final Transformer<SharedCacheMode, Boolean> SHARED_CACHE_MODE_ENABLED_TRANSFORMER = new SharedCacheModeEnabledTransformer();
+	/* CU private */ static class SharedCacheModeEnabledTransformer
+		extends TransformerAdapter<SharedCacheMode, Boolean>
+	{
+		@Override
+		public Boolean transform(SharedCacheMode mode) {
+			return Boolean.valueOf(mode != SharedCacheMode.NONE);
+		}
+	}
+
 	protected EnumFormComboViewer<Caching, CacheType> buildDefaultCacheTypeCombo(Composite container) {
 		return new EnumFormComboViewer<Caching, CacheType>(this, container) {
 			@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitCaching2_0EditorPageDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitCaching2_0EditorPageDefinition.java
index 4696fccef9..cbbc90041e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitCaching2_0EditorPageDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitCaching2_0EditorPageDefinition.java
@@ -1,22 +1,19 @@
 /*******************************************************************************
-* Copyright (c) 2009, 2012 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
+ * Copyright (c) 2009, 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.v2_0.persistence;
 
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
-import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.jpa.core.JpaStructureNode;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.Caching;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.caching.EclipseLinkPersistenceUnitCachingEditorPageDefinition;
 import org.eclipse.jpt.jpa.ui.editors.JpaEditorPageDefinition;
 import org.eclipse.jpt.jpa.ui.internal.jpa2.persistence.PersistenceUnitEditorPageDefinition;
@@ -44,29 +41,24 @@ public class EclipseLinkPersistenceUnitCaching2_0EditorPageDefinition
 		super();
 	}
 
-	@Override
-	public void buildEditorPageContent(Composite parent, WidgetFactory widgetFactory, PropertyValueModel<JpaStructureNode> jpaRootStructureNodeModel) {
-		new EclipseLinkPersistenceUnitCaching2_0EditorPage(this.buildCachingModel(jpaRootStructureNodeModel), parent, widgetFactory);
+	public ImageDescriptor getTitleImageDescriptor() {
+		return this.getCachingEditorPageDefinition().getTitleImageDescriptor();
 	}
 
-	private PropertyValueModel<Caching> buildCachingModel(PropertyValueModel<JpaStructureNode> jpaRootStructureNodeModel) {
-		return new TransformationPropertyValueModel<PersistenceUnit, Caching>(this.buildPersistenceUnitModel(jpaRootStructureNodeModel)) {
-			@Override
-			protected Caching transform_(PersistenceUnit value) {
-				return ((EclipseLinkPersistenceUnit) value).getCaching();
-			}
-		};
+	public String getTitleText() {
+		return this.getCachingEditorPageDefinition().getTitleText();
 	}
 
-	public String getPageText() {
-		return EclipseLinkPersistenceUnitCachingEditorPageDefinition.instance().getPageText();
+	public String getHelpID() {
+		return this.getCachingEditorPageDefinition().getHelpID();
 	}
 
-	public String getHelpID() {
-		return EclipseLinkPersistenceUnitCachingEditorPageDefinition.instance().getHelpID();
+	private JpaEditorPageDefinition getCachingEditorPageDefinition() {
+		return EclipseLinkPersistenceUnitCachingEditorPageDefinition.instance();
 	}
 
-	public ImageDescriptor getPageImageDescriptor() {
-		return EclipseLinkPersistenceUnitCachingEditorPageDefinition.instance().getPageImageDescriptor();
+	@Override
+	protected void buildEditorPageContent(Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager, PropertyValueModel<PersistenceUnit> persistenceUnitModel) {
+		new EclipseLinkPersistenceUnitCaching2_0EditorPage(EclipseLinkPersistenceUnitCachingEditorPageDefinition.buildCachingModel(persistenceUnitModel), parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitCustomization2_0EditorPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitCustomization2_0EditorPage.java
index f58df389fc..eee4e21e28 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitCustomization2_0EditorPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitCustomization2_0EditorPage.java
@@ -9,23 +9,24 @@
 *******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.v2_0.persistence;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.Customization;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.customization.EclipseLinkPersistenceUnitCustomizationEditorPage;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkPersistenceUnitCustomization2_0EditorPage extends EclipseLinkPersistenceUnitCustomizationEditorPage<Customization>
+public class EclipseLinkPersistenceUnitCustomization2_0EditorPage
+	extends EclipseLinkPersistenceUnitCustomizationEditorPage<Customization>
 {
 	public EclipseLinkPersistenceUnitCustomization2_0EditorPage(
 		PropertyValueModel<Customization> subjectModel,
-		Composite parent,
-        WidgetFactory widgetFactory) {
-
-		super(subjectModel, parent, widgetFactory);
+			Composite parentComposite,
+            WidgetFactory widgetFactory,
+            ResourceManager resourceManager) {
+		super(subjectModel, parentComposite, widgetFactory, resourceManager);
 	}
 
-
 	@Override
 	protected void buildEntityListComposite(Composite parent) {
 		// do nothing
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitCustomization2_0EditorPageDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitCustomization2_0EditorPageDefinition.java
index 727ad31d01..5b57a91f3c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitCustomization2_0EditorPageDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitCustomization2_0EditorPageDefinition.java
@@ -10,13 +10,10 @@
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.v2_0.persistence;
 
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
-import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.jpa.core.JpaStructureNode;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.Customization;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.customization.EclipseLinkPersistenceUnitCustomizationEditorPageDefinition;
 import org.eclipse.jpt.jpa.ui.editors.JpaEditorPageDefinition;
 import org.eclipse.jpt.jpa.ui.internal.jpa2.persistence.PersistenceUnitEditorPageDefinition;
@@ -44,33 +41,20 @@ public class EclipseLinkPersistenceUnitCustomization2_0EditorPageDefinition
 		super();
 	}
 
-	@Override
-	public void buildEditorPageContent(Composite parent, WidgetFactory widgetFactory, PropertyValueModel<JpaStructureNode> jpaRootStructureNodeModel) {
-		new EclipseLinkPersistenceUnitCustomization2_0EditorPage(
-				this.buildCustomizationModel(jpaRootStructureNodeModel), 
-				parent, 
-				widgetFactory);
-	}
-
-	private PropertyValueModel<Customization> buildCustomizationModel(PropertyValueModel<JpaStructureNode> jpaRootStructureNodeModel) {
-		return new TransformationPropertyValueModel<PersistenceUnit, Customization>(this.buildPersistenceUnitModel(jpaRootStructureNodeModel)) {
-			@Override
-			protected Customization transform_(PersistenceUnit value) {
-				return ((EclipseLinkPersistenceUnit) value).getCustomization();
-			}
-		};
+	public ImageDescriptor getTitleImageDescriptor() {
+		return EclipseLinkPersistenceUnitCustomizationEditorPageDefinition.instance().getTitleImageDescriptor();
 	}
 
-	public String getPageText() {
-		return EclipseLinkPersistenceUnitCustomizationEditorPageDefinition.instance().getPageText();
+	public String getTitleText() {
+		return EclipseLinkPersistenceUnitCustomizationEditorPageDefinition.instance().getTitleText();
 	}
 
 	public String getHelpID() {
 		return EclipseLinkPersistenceUnitCustomizationEditorPageDefinition.instance().getHelpID();
 	}
 
-	public ImageDescriptor getPageImageDescriptor() {
-		return EclipseLinkPersistenceUnitCustomizationEditorPageDefinition.instance().getPageImageDescriptor();
+	@Override
+	protected void buildEditorPageContent(Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager, PropertyValueModel<PersistenceUnit> persistenceUnitModel) {
+		new EclipseLinkPersistenceUnitCustomization2_0EditorPage(EclipseLinkPersistenceUnitCustomizationEditorPageDefinition.buildCustomizationModel(persistenceUnitModel), parentComposite, widgetFactory, resourceManager);
 	}
-
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitOptions2_0EditorPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitOptions2_0EditorPage.java
index 6ad6c46435..07c9b2b859 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitOptions2_0EditorPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitOptions2_0EditorPage.java
@@ -10,7 +10,6 @@
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.v2_0.persistence;
 
 import java.util.Collection;
-
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.IType;
@@ -19,6 +18,7 @@ import org.eclipse.jdt.core.search.IJavaSearchScope;
 import org.eclipse.jdt.core.search.SearchEngine;
 import org.eclipse.jdt.ui.IJavaElementSearchConstants;
 import org.eclipse.jdt.ui.JavaUI;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.window.Window;
@@ -65,11 +65,11 @@ class EclipseLinkPersistenceUnitOptions2_0EditorPage
 	private PropertyValueModel<Options2_0> optionsModel;
 
 	public EclipseLinkPersistenceUnitOptions2_0EditorPage(
-			PropertyValueModel<PersistenceUnit> subjectModel,
-            Composite parent,
-            WidgetFactory widgetFactory) {
-
-		super(subjectModel, parent, widgetFactory);
+			PropertyValueModel<PersistenceUnit> persistenceUnitModel,
+            Composite parentComposite,
+            WidgetFactory widgetFactory,
+            ResourceManager resourceManager) {
+		super(persistenceUnitModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
@@ -116,7 +116,7 @@ class EclipseLinkPersistenceUnitOptions2_0EditorPage
 
 	@Override
 	protected Control initializeLoggingSection(Section section) {			
-		return new EclipseLinkLogging2_0Composite(this.buildLoggingModel(), section, getWidgetFactory()).getControl();
+		return new EclipseLinkLogging2_0Composite(this, this.buildLoggingModel(), section).getControl();
 	}
 
 	protected PropertyValueModel<Logging2_0> buildLoggingModel() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitOptions2_0EditorPageDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitOptions2_0EditorPageDefinition.java
index d5b38345d3..f858f06714 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitOptions2_0EditorPageDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitOptions2_0EditorPageDefinition.java
@@ -1,18 +1,19 @@
 /*******************************************************************************
-* Copyright (c) 2009, 2012 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
+ * Copyright (c) 2009, 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.v2_0.persistence;
 
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.jpa.core.JpaStructureNode;
+import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.options.EclipseLinkPersistenceUnitOptionsEditorPageDefinition;
 import org.eclipse.jpt.jpa.ui.editors.JpaEditorPageDefinition;
 import org.eclipse.jpt.jpa.ui.internal.jpa2.persistence.PersistenceUnitEditorPageDefinition;
@@ -40,20 +41,20 @@ public class EclipseLinkPersistenceUnitOptions2_0EditorPageDefinition
 		super();
 	}
 
-	@Override
-	public void buildEditorPageContent(Composite parent, WidgetFactory widgetFactory, PropertyValueModel<JpaStructureNode> jpaRootStructureNodeModel) {
-		new EclipseLinkPersistenceUnitOptions2_0EditorPage(this.buildPersistenceUnitModel(jpaRootStructureNodeModel), parent, widgetFactory);
-	}
-
-	public String getPageText() {
-		return EclipseLinkPersistenceUnitOptionsEditorPageDefinition.instance().getPageText();
+	public ImageDescriptor getTitleImageDescriptor() {
+		return EclipseLinkPersistenceUnitOptionsEditorPageDefinition.instance().getTitleImageDescriptor();
 	}
 
-	public ImageDescriptor getPageImageDescriptor() {
-		return EclipseLinkPersistenceUnitOptionsEditorPageDefinition.instance().getPageImageDescriptor();
+	public String getTitleText() {
+		return EclipseLinkPersistenceUnitOptionsEditorPageDefinition.instance().getTitleText();
 	}
 
 	public String getHelpID() {
 		return EclipseLinkPersistenceUnitOptionsEditorPageDefinition.instance().getHelpID();
 	}
+
+	@Override
+	protected void buildEditorPageContent(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager, PropertyValueModel<PersistenceUnit> persistenceUnitModel) {
+		new EclipseLinkPersistenceUnitOptions2_0EditorPage(persistenceUnitModel, parent, widgetFactory, resourceManager);
+	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitOptions2_4EditorPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitOptions2_4EditorPage.java
index e6e76b6532..75b0ebfdc9 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitOptions2_4EditorPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitOptions2_4EditorPage.java
@@ -9,6 +9,7 @@
  *******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.v2_0.persistence;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
@@ -17,18 +18,18 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.forms.widgets.Section;
 
 class EclipseLinkPersistenceUnitOptions2_4EditorPage 
-	extends EclipseLinkPersistenceUnitOptions2_0EditorPage {
-
+	extends EclipseLinkPersistenceUnitOptions2_0EditorPage
+{
 	public EclipseLinkPersistenceUnitOptions2_4EditorPage(
-			PropertyValueModel<PersistenceUnit> subjectModel,
-            Composite parent,
-            WidgetFactory widgetFactory) {
-
-		super(subjectModel, parent, widgetFactory);
+			PropertyValueModel<PersistenceUnit> persistenceUnitModel,
+            Composite parentComposite,
+            WidgetFactory widgetFactory,
+            ResourceManager resourceManager) {
+		super(persistenceUnitModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
 	protected Control initializeLoggingSection(Section section) {			
-		return new EclipseLinkLogging2_4Composite(this.buildLoggingModel(), section, getWidgetFactory()).getControl();
+		return new EclipseLinkLogging2_4Composite(this, this.buildLoggingModel(), section).getControl();
 	}
 }
 \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitOptions2_4EditorPageDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitOptions2_4EditorPageDefinition.java
index d9e29703f0..70c98731a7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitOptions2_4EditorPageDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitOptions2_4EditorPageDefinition.java
@@ -1,18 +1,19 @@
 /*******************************************************************************
-* Copyright (c) 2012 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
+ * Copyright (c) 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.v2_0.persistence;
 
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.jpa.core.JpaStructureNode;
+import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.options.EclipseLinkPersistenceUnitOptionsEditorPageDefinition;
 import org.eclipse.jpt.jpa.ui.editors.JpaEditorPageDefinition;
 import org.eclipse.jpt.jpa.ui.internal.jpa2.persistence.PersistenceUnitEditorPageDefinition;
@@ -40,20 +41,20 @@ public class EclipseLinkPersistenceUnitOptions2_4EditorPageDefinition
 		super();
 	}
 
-	@Override
-	public void buildEditorPageContent(Composite parent, WidgetFactory widgetFactory, PropertyValueModel<JpaStructureNode> jpaRootStructureNodeModel) {
-		new EclipseLinkPersistenceUnitOptions2_4EditorPage(this.buildPersistenceUnitModel(jpaRootStructureNodeModel), parent, widgetFactory);
-	}
-
-	public String getPageText() {
-		return EclipseLinkPersistenceUnitOptionsEditorPageDefinition.instance().getPageText();
+	public ImageDescriptor getTitleImageDescriptor() {
+		return EclipseLinkPersistenceUnitOptionsEditorPageDefinition.instance().getTitleImageDescriptor();
 	}
 
-	public ImageDescriptor getPageImageDescriptor() {
-		return EclipseLinkPersistenceUnitOptionsEditorPageDefinition.instance().getPageImageDescriptor();
+	public String getTitleText() {
+		return EclipseLinkPersistenceUnitOptionsEditorPageDefinition.instance().getTitleText();
 	}
 
 	public String getHelpID() {
 		return EclipseLinkPersistenceUnitOptionsEditorPageDefinition.instance().getHelpID();
 	}
+
+	@Override
+	protected void buildEditorPageContent(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager, PropertyValueModel<PersistenceUnit> persistenceUnitModel) {
+		new EclipseLinkPersistenceUnitOptions2_4EditorPage(persistenceUnitModel, parent, widgetFactory, resourceManager);
+	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/EclipseLinkDynamicEntityWizard.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/EclipseLinkDynamicEntityWizard.java
index e5451c3797..a0ac62daa5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/EclipseLinkDynamicEntityWizard.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/EclipseLinkDynamicEntityWizard.java
@@ -24,7 +24,7 @@ import org.eclipse.jpt.jpa.core.context.JpaContextNode;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.EclipseLinkUiMessages;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.entity.data.model.DynamicEntityDataModelProvider;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.plugin.JptJpaEclipseLinkUiPlugin;
-import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 import org.eclipse.jpt.jpa.ui.internal.wizards.entity.data.model.IEntityDataModelProperties;
 import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
 import org.eclipse.ui.INewWizard;
@@ -46,7 +46,7 @@ public class EclipseLinkDynamicEntityWizard extends DataModelWizard implements I
 	public EclipseLinkDynamicEntityWizard(IDataModel model) {
 		super(model);
         setWindowTitle(EclipseLinkUiMessages.EclipseLinkDynamicEntityWizard_title);
-        setDefaultPageImageDescriptor(JptJpaEclipseLinkUiPlugin.instance().buildImageDescriptor(JptUiIcons.ENTITY_WIZ_BANNER));
+        setDefaultPageImageDescriptor(JptJpaUiImages.ENTITY_BANNER);
 	}
 
 	/**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/gen/GenerateDynamicEntitiesFromSchemaWizard.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/gen/GenerateDynamicEntitiesFromSchemaWizard.java
index d67905da00..01898f2120 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/gen/GenerateDynamicEntitiesFromSchemaWizard.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/gen/GenerateDynamicEntitiesFromSchemaWizard.java
@@ -42,10 +42,10 @@ import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.ide.IDE;
 
-public class GenerateDynamicEntitiesFromSchemaWizard extends GenerateEntitiesFromSchemaWizard 
-	implements INewWizard  {	
-	
-	public static final String HELP_CONTEXT_ID = JptJpaEclipseLinkUiPlugin.instance().getPluginID() + ".GenerateEntitiesFromSchemaWizard"; //$NON-NLS-1$
+public class GenerateDynamicEntitiesFromSchemaWizard
+	extends GenerateEntitiesFromSchemaWizard
+{	
+	private static final String HELP_CONTEXT_ID = JptJpaEclipseLinkUiPlugin.instance().getPluginID() + ".GenerateEntitiesFromSchemaWizard"; //$NON-NLS-1$
 
 	// ********** constructor **********
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.gen/property_files/jpt_gen.properties b/jpa/plugins/org.eclipse.jpt.jpa.gen/property_files/jpt_gen.properties
index edcf95a951..60f4e79f00 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.gen/property_files/jpt_gen.properties
+++ b/jpa/plugins/org.eclipse.jpt.jpa.gen/property_files/jpt_gen.properties
@@ -17,4 +17,4 @@ Delete_Folder_Error = "The directory {0} could not be deleted."
 Delete_File_Error = "The file {0} could not be deleted."
 File_Read_Only_Error= "The file {0} could not be modified because write access is denied.\nPlease make sure that the file is not marked as readonly in the file system."
 
-Templates_notFound = Unable to find JPA entities generation templates in plugin: {0}
-\ No newline at end of file
+Templates_notFound = Unable to find JPA entities generation templates
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.gen/src/org/eclipse/jpt/jpa/gen/internal/PackageGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.gen/src/org/eclipse/jpt/jpa/gen/internal/PackageGenerator.java
index f3b222cdad..6f4ee3e82d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.gen/src/org/eclipse/jpt/jpa/gen/internal/PackageGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.gen/src/org/eclipse/jpt/jpa/gen/internal/PackageGenerator.java
@@ -200,7 +200,7 @@ public class PackageGenerator {
 		Path path = new Path( templatesPath);
 		URL url = FileLocator.find(bundle, path, null);
 		if (url == null) {
-			throw new CoreException(JptJpaGenPlugin.instance().buildErrorStatus(JptGenMessages.Templates_notFound, JptJpaGenPlugin.instance().getPluginID() + '/' + templatesPath));
+			throw new CoreException(JptJpaGenPlugin.instance().buildErrorStatus(JptGenMessages.Templates_notFound));
 		}		
 		URL templUrl = FileLocator.resolve(url);
 		
@@ -214,7 +214,7 @@ public class PackageGenerator {
 		
 
 		if (templDir == null || !templDir.exists()) {
-			throw new CoreException(JptJpaGenPlugin.instance().buildErrorStatus(JptGenMessages.Templates_notFound, JptJpaGenPlugin.instance().getPluginID()));
+			throw new CoreException(JptJpaGenPlugin.instance().buildErrorStatus(JptGenMessages.Templates_notFound));
 		}
 		return templDir;
 	}
@@ -301,7 +301,7 @@ public class PackageGenerator {
 			javaFile.refreshLocal(1, sm.newChild(1));
 			
 		} catch (Throwable e) {
-			JptJpaGenPlugin.instance().logError(e, JptGenMessages.Templates_notFound, JptJpaGenPlugin.instance().getPluginID());
+			JptJpaGenPlugin.instance().logError(e, JptGenMessages.Templates_notFound);
 		}
 	}
 	
@@ -468,7 +468,7 @@ public class PackageGenerator {
 		    xmlFile.refreshLocal(1, null);
 			
 		} catch (Throwable e) {
-			JptJpaGenPlugin.instance().logError(e, JptGenMessages.Templates_notFound, JptJpaGenPlugin.instance().getPluginID());
+			JptJpaGenPlugin.instance().logError(e, JptGenMessages.Templates_notFound);
 		}
 	}
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/build.properties b/jpa/plugins/org.eclipse.jpt.jpa.ui/build.properties
index ecb8737890..4e150bb508 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/build.properties
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/build.properties
@@ -13,10 +13,9 @@ output.. = bin/
 bin.includes = .,\
                META-INF/,\
                about.html,\
-               icons/,\
+               images/,\
                plugin.xml,\
                plugin.properties,\
-               images/,\
                .options
 jars.compile.order = .
 src.includes = schema/,\
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/column.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/column.gif
deleted file mode 100644
index 5f5def7ac3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/column.gif
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/table.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/table.gif
deleted file mode 100644
index 4b61312883..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/table.gif
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/list-of-values.png b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/list-of-values.png
deleted file mode 100644
index 8081fd9293..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/list-of-values.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/dtool16/new_entity_wiz.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/new-entity-disabled.gif
index 55f7cc932f..55f7cc932f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/dtool16/new_entity_wiz.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/new-entity-disabled.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/etool16/new_entity_wiz.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/new-entity.gif
index 8533ca10fb..8533ca10fb 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/etool16/new_entity_wiz.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/new-entity.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/dtool16/new_jpa_file_wiz.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/new-jpa-file-disabled.gif
index 610f6042d0..610f6042d0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/dtool16/new_jpa_file_wiz.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/new-jpa-file-disabled.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/etool16/new_jpa_file_wiz.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/new-jpa-file.gif
index 6e0042e98c..6e0042e98c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/etool16/new_jpa_file_wiz.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/new-jpa-file.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/dtool16/new_jpaproject_wiz.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/new-jpa-project-disabled.gif
index 633768f35d..633768f35d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/dtool16/new_jpaproject_wiz.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/new-jpa-project-disabled.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/etool16/new_jpaproject_wiz.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/new-jpa-project.gif
index 12da8074ae..12da8074ae 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/etool16/new_jpaproject_wiz.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/new-jpa-project.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/warningstd.png b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/warningstd.png
deleted file mode 100644
index a7b471c2d3..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/buttons/warningstd.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/export-as-img-hover.png b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/export-as-img-hover.png
deleted file mode 100644
index 0751b3267c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/export-as-img-hover.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/export-as-img.png b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/export-as-img.png
deleted file mode 100644
index 5fb4dc2a2c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/export-as-img.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/header_left_bg.png b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/header_left_bg.png
deleted file mode 100644
index abfffe4bc7..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/header_left_bg.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/header_mid_bg.png b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/header_mid_bg.png
deleted file mode 100644
index caa828d3c0..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/header_mid_bg.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/header_right_bg.png b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/header_right_bg.png
deleted file mode 100644
index bd7414470c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/header_right_bg.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/print-hover.png b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/print-hover.png
deleted file mode 100644
index 468a09b5de..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/print-hover.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/print.png b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/print.png
deleted file mode 100644
index ee15ba107e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/print.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/shadow-bottom.png b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/shadow-bottom.png
deleted file mode 100644
index d84b339401..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/shadow-bottom.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/shadow-lower-left.png b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/shadow-lower-left.png
deleted file mode 100644
index fa25df32e8..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/shadow-lower-left.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/shadow-lower-right.png b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/shadow-lower-right.png
deleted file mode 100644
index a58c953f1a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/shadow-lower-right.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/shadow-side.png b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/shadow-side.png
deleted file mode 100644
index 585ed6a9e4..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/shadow-side.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/shadow-upper-right.png b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/shadow-upper-right.png
deleted file mode 100644
index ccabb96f5c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/shadow-upper-right.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/toolbar_bg.png b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/toolbar_bg.png
deleted file mode 100644
index c483a49336..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/diagram/toolbar_bg.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/etool16/jpa_facet.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/jpa-facet.gif
index c0ab917511..c0ab917511 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/etool16/jpa_facet.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/jpa-facet.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/basic.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/basic.gif
index a547d743e7..a547d743e7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/basic.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/basic.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/column.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/column.gif
index 5f1551ba96..5f5def7ac3 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/column.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/column.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/element-collection.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/element-collection.gif
index 64706d215f..64706d215f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/element-collection.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/element-collection.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/embeddable.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/embeddable.gif
index 8856f78874..8856f78874 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/embeddable.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/embeddable.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/embedded-id.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/embedded-id.gif
index c1c8e210e7..c1c8e210e7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/embedded-id.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/embedded-id.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/embedded.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/embedded.gif
index c2ae66497a..c2ae66497a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/embedded.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/embedded.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/columnKey.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/entity-gen-column-key.gif
index 4f385155d6..4f385155d6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/columnKey.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/entity-gen-column-key.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/entity-gen-column.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/entity-gen-column.gif
new file mode 100644
index 0000000000..5f1551ba96
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/entity-gen-column.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/table_obj.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/entity-gen-table-object.gif
index e2ccabb383..e2ccabb383 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/table_obj.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/entity-gen-table-object.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/entity-gen-table.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/entity-gen-table.gif
new file mode 100644
index 0000000000..a99388a9af
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/entity-gen-table.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/entity-mappings.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/entity-mappings.gif
index c349c962e2..c349c962e2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/entity-mappings.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/entity-mappings.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/entity.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/entity.gif
index d606f482e2..d606f482e2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/entity.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/entity.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/enum_obj.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/enum.gif
index 15535f52f5..15535f52f5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/enum_obj.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/enum.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/forward.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/forward.gif
deleted file mode 100644
index 562bd70b5c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/forward.gif
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/id.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/id.gif
index a205ec38ab..a205ec38ab 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/id.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/id.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/jpa-content.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/jpa-content.gif
index c0ab917511..c0ab917511 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/jpa-content.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/jpa-content.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/jpa-file.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/jpa-file.gif
index b4e9f4724b..b4e9f4724b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/jpa-file.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/jpa-file.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/jpa-jar-file.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/jpa-jar-file.gif
index e92828d2d9..e92828d2d9 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/jpa-jar-file.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/jpa-jar-file.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/jpql.function.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/jpql-function.gif
index c94434c95e..c94434c95e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/jpql.function.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/jpql-function.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/jpql.identifier.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/jpql-identifier.gif
index b6d82ff0dd..b6d82ff0dd 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/jpql.identifier.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/jpql-identifier.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/jpql.variable.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/jpql-variable.gif
index a5c6124de5..a5c6124de5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/jpql.variable.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/jpql-variable.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/many-to-many.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/many-to-many.gif
index 48885b21fe..48885b21fe 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/many-to-many.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/many-to-many.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/many-to-one.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/many-to-one.gif
index 2e1e2b9387..2e1e2b9387 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/many-to-one.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/many-to-one.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/mapped-superclass.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/mapped-superclass.gif
index 8cc37645c0..8cc37645c0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/mapped-superclass.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/mapped-superclass.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/moveRight.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/moveRight.gif
deleted file mode 100644
index 7a1511dd8e..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/moveRight.gif
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/null-attribute-mapping.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/null-attribute-mapping.gif
index 70a9c23541..70a9c23541 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/null-attribute-mapping.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/null-attribute-mapping.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/null-type-mapping.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/null-type-mapping.gif
index 6279478c51..6279478c51 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/null-type-mapping.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/null-type-mapping.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/one-to-many.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/one-to-many.gif
index 1e90027861..1e90027861 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/one-to-many.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/one-to-many.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/one-to-one.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/one-to-one.gif
index 578ec36aa3..578ec36aa3 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/one-to-one.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/one-to-one.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/persistence-unit.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/persistence-unit.gif
index 9cc45f6945..9cc45f6945 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/persistence-unit.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/persistence-unit.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/persistence.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/persistence.gif
index d1f616d64f..d1f616d64f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/persistence.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/persistence.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/table.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/table.gif
index a99388a9af..4b61312883 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/table.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/table.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/transient.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/transient.gif
index cc5d83db20..cc5d83db20 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/transient.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/transient.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/version.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/version.gif
index 202a8104f4..202a8104f4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/obj16/version.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/objects/version.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/save-image-16.png b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/save-image-16.png
deleted file mode 100644
index eca4774fec..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/images/save-image-16.png
+++ /dev/null
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/eview16/jpa_details.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/views/jpa-details.gif
index 3280138b67..3280138b67 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/eview16/jpa_details.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/views/jpa-details.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/eview16/jpa_perspective.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/views/jpa-perspective.gif
index c0ab917511..c0ab917511 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/eview16/jpa_perspective.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/views/jpa-perspective.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/eview16/jpa_structure.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/views/jpa-structure.gif
index 682c90a589..682c90a589 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/eview16/jpa_structure.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/views/jpa-structure.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/wizban/new_entity_wizban.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/wizards/entity-banner.gif
index b1d934cb87..b1d934cb87 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/wizban/new_entity_wizban.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/wizards/entity-banner.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/wizban/new_jpa_file_wizban.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/wizards/jpa-file-banner.gif
index e84622322a..e84622322a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/wizban/new_jpa_file_wizban.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/wizards/jpa-file-banner.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/wizban/new_jpa_prj_wiz.gif b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/wizards/jpa-project-banner.gif
index 4f52bb65bc..4f52bb65bc 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/icons/full/wizban/new_jpa_prj_wiz.gif
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/images/wizards/jpa-project-banner.gif
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/plugin.xml b/jpa/plugins/org.eclipse.jpt.jpa.ui/plugin.xml
index 133c4bee2e..0e23a5e81c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/plugin.xml
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/plugin.xml
@@ -141,7 +141,7 @@
 		name="%JpaProposalCategory">
 
 		<proposalCategory
-			icon="$nl$/icons/full/eview16/jpa_perspective.gif">
+			icon="$nl$/images/views/jpa-perspective.gif">
 			<enablement>
 				<with variable="project">
 					<adapt type="org.eclipse.core.resources.IProject">
@@ -188,7 +188,7 @@
        id="org.eclipse.jpt.jpa.ui.xml.jpaCompletionProposal">
 
 		<proposalCategory 
-	           icon="$nl$/icons/full/eview16/jpa_perspective.gif"
+	           icon="$nl$/images/views/jpa-perspective.gif"
 	           id="org.eclipse.jpt.jpa.ui.xml.jpaProposalCategory"
 	           name="%JpaProposalCategory">
 		</proposalCategory>
@@ -246,8 +246,8 @@
 			label="%JptCreationActionSet.label">
 			<action
 				class="org.eclipse.jpt.jpa.ui.internal.wizards.NewEntityDropDownAction"
-				disabledIcon="icons/full/etool16/new_entity_wiz.gif"
-				icon="icons/full/etool16/new_entity_wiz.gif"
+				disabledIcon="$nl$/images/buttons/new-entity-disabled.gif"
+				icon="$nl$/images/buttons/new-entity.gif"
 				id="org.eclipse.jpt.jpa.ui.NewEntityAction"
 				label="%NewEntityAction.label"
 				style="pulldown"
@@ -352,7 +352,7 @@
 		<editor
 			class="org.eclipse.jpt.jpa.ui.internal.editors.JpaXmlEditor"
 			contributorClass="org.eclipse.jpt.jpa.ui.internal.editors.JpaXmlEditorContributor"
-			icon="$nl$/icons/full/obj16/jpa-file.gif"
+			icon="$nl$/images/objects/jpa-file.gif"
 			id="org.eclipse.jpt.jpa.ui.internal.editors.PersistenceEditor"
 			name="%persistenceEditor">
       		<contentTypeBinding contentTypeId="org.eclipse.jpt.jpa.core.content.persistence"/>
@@ -700,7 +700,7 @@
 				id="org.eclipse.jpt.jpa.ui.persistentTypeMapAs"
 				label="%mapAs"
 				mnemonic="%mapAsMnemonic"
-				icon="$nl$/icons/full/eview16/jpa_perspective.gif">
+				icon="$nl$/images/views/jpa-perspective.gif">
 				<visibleWhen>
 					<iterate ifEmpty="false">
 						<instanceof value="org.eclipse.jpt.jpa.core.context.PersistentType"/>
@@ -716,7 +716,7 @@
 				id="org.eclipse.jpt.jpa.ui.persistentAttributeMapAs"
 				label="%mapAs"
 				mnemonic="%mapAsMnemonic"
-				icon="$nl$/icons/full/eview16/jpa_perspective.gif">
+				icon="$nl$/images/views/jpa-perspective.gif">
 				<visibleWhen>
 					<iterate ifEmpty="false">
 						<instanceof value="org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute"/>
@@ -759,7 +759,7 @@
 			name="%jpaNavigatorContent" 
 			priority="higher"
 			appearsBefore="org.eclipse.jst.servlet.ui.EnhancedJavaRendering"
-			icon="icons/full/obj16/jpa-content.gif"
+			icon="$nl$/images/objects/jpa-content.gif"
 			activeByDefault="true"
 			contentProvider="org.eclipse.jpt.jpa.ui.internal.navigator.JpaNavigatorContentProvider"
 			labelProvider="org.eclipse.jpt.common.ui.internal.jface.NavigatorLabelProvider">
@@ -858,7 +858,7 @@
 		<wizard
 			id="org.eclipse.jpt.jpa.ui.wizard.newJpaProject"
 			name="%newJpaProjectWizardName"
-			icon="icons/full/etool16/new_jpaproject_wiz.gif"
+			icon="$nl$/images/buttons/new-jpa-file.gif"
 			category="org.eclipse.jpt.jpa"
 			project="true"
 			finalPerspective="org.eclipse.jpt.ui.jpaPerspective">
@@ -871,7 +871,7 @@
 		<wizard
             id="org.eclipse.jpt.jpa.ui.wizard.newEntity"
 			name="%newJpaEntityWizardName"
-			icon="icons/full/etool16/new_entity_wiz.gif"
+			icon="$nl$/images/buttons/new-entity.gif"
 			category="org.eclipse.jpt.jpa">
 			<description>%newJpaEntityWizardDesc</description>
 			<class class="org.eclipse.jpt.jpa.ui.internal.wizards.entity.EntityWizard"> 
@@ -884,7 +884,7 @@
 		<wizard
 			category="org.eclipse.jpt.jpa"
 			class="org.eclipse.jpt.jpa.ui.internal.wizards.gen.GenerateEntitiesFromSchemaWizard"
-			icon="platform:/plugin/org.eclipse.jpt.jpa.ui/icons/full/etool16/new_entity_wiz.gif"
+			icon="$nl$/images/buttons/new-entity.gif"
 			id="org.eclipse.jpt.jpa.ui.wizard.newEntitiesFromTables"
 			name="%newJpaEntityFromTableWizardName">
 			<description>%newJpaEntityFromTableWizardDesc</description>
@@ -894,7 +894,7 @@
 		<wizard
             id="org.eclipse.jpt.jpa.ui.wizard.newMappingFile"
 			name="%newJpaMappingFileWizardName"
-			icon="icons/full/etool16/new_jpa_file_wiz.gif"
+			icon="$nl$/images/buttons/new-jpa-file.gif"
 			category="org.eclipse.jpt.jpa">
 			<description>%newJpaMappingFileWizardDesc</description>
 			<class class="org.eclipse.jpt.jpa.ui.internal.wizards.orm.MappingFileWizard"> 
@@ -913,9 +913,9 @@
 		point="org.eclipse.ui.perspectives">
 		
 		<perspective
-			class="org.eclipse.jpt.jpa.ui.internal.perspective.JpaPerspectiveFactory"
-			icon="icons/full/eview16/jpa_perspective.gif"
 			id="org.eclipse.jpt.ui.jpaPerspective"
+			class="org.eclipse.jpt.jpa.ui.internal.perspective.JpaPerspectiveFactory"
+			icon="$nl$/images/views/jpa-perspective.gif"
 			name="%jpaPerspective">
 			<description>%jpaPerspectiveDescription</description>
 		</perspective>
@@ -1144,14 +1144,14 @@
 	        id="org.eclipse.jpt.ui.jpaStructureView"
 	        category="org.eclipse.jpt.jpa.ui"
 	        class="org.eclipse.jpt.jpa.ui.internal.views.JpaStructureView"
-	        icon="icons/full/eview16/jpa_structure.gif"
+	        icon="$nl$/images/views/jpa-structure.gif"
 	        name="%jpaStructure"/>
 			
 		<view
 			id="org.eclipse.jpt.ui.jpaDetailsView"
 			category="org.eclipse.jpt.jpa.ui"
 	        class="org.eclipse.jpt.jpa.ui.internal.views.JpaDetailsView"
-	        icon="icons/full/eview16/jpa_details.gif"
+	        icon="$nl$/images/views/jpa-details.gif"
 			name="%jpaDetails"/>
 		
 	</extension>	
@@ -1160,7 +1160,7 @@
 	<!-- ***** WTP facet framework ***** -->
 
 	<extension point="org.eclipse.wst.common.project.facet.ui.images">
-		<image facet="jpt.jpa" path="icons/full/etool16/jpa_facet.gif"/>
+		<image facet="jpt.jpa" path="$nl$/images/jpa-facet.gif"/>
 	</extension>
 	
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/JpaPlatformUi.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/JpaPlatformUi.java
index eb6efd342f..92d30711e8 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/JpaPlatformUi.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/JpaPlatformUi.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jpt.common.core.JptResourceType;
 import org.eclipse.jpt.common.ui.WidgetFactory;
@@ -71,12 +72,13 @@ public interface JpaPlatformUi {
 	ItemTreeStateProviderFactoryProvider getStructureViewFactoryProvider(JpaFile jpaFile);
 
 
-	// ********** details providers **********
+	// ********** details page managers **********
 
 	JpaDetailsPageManager<? extends JpaStructureNode> buildJpaDetailsPageManager(
 			Composite parent,
 			JpaStructureNode structureNode,
-			WidgetFactory widgetFactory);
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager);
 
 
 	// ********** file ui definitions **********
@@ -94,7 +96,8 @@ public interface JpaPlatformUi {
 			String mappingKey, 
 			Composite parent, 
 			PropertyValueModel<TypeMapping> mappingHolder,
-			WidgetFactory widgetFactory);
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager);
 
 	Iterable<MappingUiDefinition<PersistentType, ? extends TypeMapping>> getTypeMappingUiDefinitions(JptResourceType resourceType);
 
@@ -109,9 +112,10 @@ public interface JpaPlatformUi {
 			JptResourceType resourceType, 
 			String mappingKey, 
 			Composite parent,
-			PropertyValueModel<AttributeMapping> mappingHolder,
+			PropertyValueModel<AttributeMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			WidgetFactory widgetFactory);
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager);
 
 	Iterable<MappingUiDefinition<ReadOnlyPersistentAttribute, ? extends AttributeMapping>> getAttributeMappingUiDefinitions(JptResourceType resourceType);
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/JpaWorkbench.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/JpaWorkbench.java
index 3a579d77a6..7df6f83450 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/JpaWorkbench.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/JpaWorkbench.java
@@ -9,6 +9,8 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui;
 
+import org.eclipse.jface.resource.ResourceManager;
+import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.IWorkbench;
 
 /**
@@ -43,7 +45,36 @@ public interface JpaWorkbench {
 	IWorkbench getWorkbench();
 
 	/**
-	 * Return the manager for the workspace's JPA platform UIs.
+	 * Return the manager for the workbench's JPA platform UIs.
 	 */
 	JpaPlatformUiManager getJpaPlatformUiManager();
+
+
+	// ********** resources **********
+
+	/**
+	 * Return a new "local" resource manager. The resource manager's parent
+	 * will be the JPA workbench's resource manager, allowing any resources
+	 * to be shared across the JPA workbench. The client must dispose the
+	 * resource manager as appropriate.
+	 * 
+	 * @see #getResourceManager(Control)
+	 * @see org.eclipse.jpt.common.ui.internal.JptUIPlugin#buildImageDescriptor(String)
+	 */
+	ResourceManager buildLocalResourceManager();
+
+	/**
+	 * Return the resource manager associated with the specified control. The
+	 * control's resource manager's parent will be the JPA workbench's resource
+	 * manager, allowing any resources to be shared across the JPA workbench.
+	 * The returned resource manager will dispose itself when the specified
+	 * control is disposed, freeing the client from the obligation of disposing
+	 * the manager.
+	 * 
+	 * @see #buildLocalResourceManager()
+	 * @see org.eclipse.jface.resource.LocalResourceManager#LocalResourceManager(ResourceManager, Control)
+	 * @see org.eclipse.jpt.common.ui.internal.JptUIPlugin#buildImageDescriptor(String)
+	 * @see Control#getData(String)
+	 */
+	ResourceManager getResourceManager(Control control);
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/JptJpaUiImages.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/JptJpaUiImages.java
new file mode 100644
index 0000000000..b8bbd4c5a5
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/JptJpaUiImages.java
@@ -0,0 +1,130 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.jpa.ui;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jpt.common.ui.JptCommonUiImages;
+import org.eclipse.jpt.jpa.ui.internal.plugin.JptJpaUiPlugin;
+
+/**
+ * Actually, just the image descriptors....
+ * <p>
+ * Code should use these constants to acquire (and release) the images provided
+ * by Dali. The images should be managed by a
+ * {@link org.eclipse.jface.resource.ResourceManager "local" resource manager}
+ * supplied by the {@link org.eclipse.jpt.jpa.ui.JpaWorkbench JpaWorkbench}.
+ * <p>
+ * Also, the {@link org.eclipse.ui.IWorkbench#getSharedImages() Eclipse workbench}
+ * supplies more general purpose
+ * {@link org.eclipse.ui.ISharedImages images}.
+ * 
+ * @see org.eclipse.jpt.jpa.ui.JpaWorkbench#buildLocalResourceManager()
+ * @see org.eclipse.jpt.jpa.ui.JpaWorkbench#getResourceManager(org.eclipse.swt.widgets.Control)
+ * @see JptCommonUiImages
+ */
+@SuppressWarnings("nls")
+public final class JptJpaUiImages {
+
+	// ********** directories **********
+
+	private static final String IMAGES_ = JptCommonUiImages.IMAGES_;
+	private static final String OBJECTS_ = JptCommonUiImages.OBJECTS_;
+	private static final String VIEWS_ = JptCommonUiImages.VIEWS_;
+	private static final String WIZARDS_ = JptCommonUiImages.WIZARDS_;
+
+
+	// ********** general **********
+
+	public static final ImageDescriptor JPA_FACET = buildImageDescriptor(IMAGES_ + "jpa-facet.gif");
+	public static final ImageDescriptor JPA_CONTENT = buildImageDescriptor(OBJECTS_ + "jpa-content.gif");
+	public static final ImageDescriptor JPA_FILE = buildImageDescriptor(OBJECTS_ + "jpa-file.gif");
+	public static final ImageDescriptor JAR_FILE = buildImageDescriptor(OBJECTS_ + "jpa-jar-file.gif");
+	public static final ImageDescriptor ENUM = buildImageDescriptor(OBJECTS_ + "enum.gif");
+
+
+	// ********** views **********
+
+	public static final ImageDescriptor JPA_PERSPECTIVE = buildImageDescriptor(VIEWS_ + "jpa-perspective.gif");
+	public static final ImageDescriptor JPA_STRUCTURE_VIEW = buildImageDescriptor(VIEWS_ + "jpa-structure.gif");
+	public static final ImageDescriptor JPA_DETAILS_VIEW = buildImageDescriptor(VIEWS_ + "jpa-details.gif");
+
+
+	// ********** wizard banners **********
+
+	public static final ImageDescriptor JPA_PROJECT_BANNER = buildImageDescriptor(WIZARDS_ + "jpa-project-banner.gif");
+	public static final ImageDescriptor ENTITY_BANNER = buildImageDescriptor(WIZARDS_ + "entity-banner.gif");
+	public static final ImageDescriptor JPA_FILE_BANNER = buildImageDescriptor(WIZARDS_ + "jpa-file-banner.gif");
+
+
+	// ********** persistence.xml **********
+
+	public static final ImageDescriptor PERSISTENCE = buildImageDescriptor(OBJECTS_ + "persistence.gif");
+	public static final ImageDescriptor PERSISTENCE_UNIT = buildImageDescriptor(OBJECTS_ + "persistence-unit.gif");
+	public static final ImageDescriptor MAPPING_FILE_REF = buildImageDescriptor(OBJECTS_ + "jpa-file.gif");
+	public static final ImageDescriptor CLASS_REF = buildImageDescriptor(OBJECTS_ + "null-type-mapping.gif");
+	public static final ImageDescriptor JAR_FILE_REF = buildImageDescriptor(OBJECTS_ + "jpa-jar-file.gif");
+
+
+	// ********** orm.xml **********
+
+	public static final ImageDescriptor ENTITY_MAPPINGS = buildImageDescriptor(OBJECTS_ + "entity-mappings.gif");
+
+
+	// ********** orm.xml/Java **********
+
+	public static final ImageDescriptor ENTITY = buildImageDescriptor(OBJECTS_ + "entity.gif");
+	public static final ImageDescriptor EMBEDDABLE = buildImageDescriptor(OBJECTS_ + "embeddable.gif");
+	public static final ImageDescriptor MAPPED_SUPERCLASS = buildImageDescriptor(OBJECTS_ + "mapped-superclass.gif");
+	public static final ImageDescriptor NULL_TYPE_MAPPING = buildImageDescriptor(OBJECTS_ + "null-type-mapping.gif");
+	public static final ImageDescriptor ID = buildImageDescriptor(OBJECTS_ + "id.gif");
+	public static final ImageDescriptor EMBEDDED_ID = buildImageDescriptor(OBJECTS_ + "embedded-id.gif");
+	public static final ImageDescriptor BASIC = buildImageDescriptor(OBJECTS_ + "basic.gif");
+	public static final ImageDescriptor VERSION = buildImageDescriptor(OBJECTS_ + "version.gif");
+	public static final ImageDescriptor MANY_TO_ONE = buildImageDescriptor(OBJECTS_ + "many-to-one.gif");
+	public static final ImageDescriptor ONE_TO_MANY = buildImageDescriptor(OBJECTS_ + "one-to-many.gif");
+	public static final ImageDescriptor ONE_TO_ONE = buildImageDescriptor(OBJECTS_ + "one-to-one.gif");
+	public static final ImageDescriptor MANY_TO_MANY = buildImageDescriptor(OBJECTS_ + "many-to-many.gif");
+	public static final ImageDescriptor ELEMENT_COLLECTION = buildImageDescriptor(OBJECTS_ + "element-collection.gif");
+	public static final ImageDescriptor EMBEDDED = buildImageDescriptor(OBJECTS_ + "embedded.gif");
+	public static final ImageDescriptor TRANSIENT = buildImageDescriptor(OBJECTS_ + "transient.gif");
+	public static final ImageDescriptor NULL_ATTRIBUTE_MAPPING = buildImageDescriptor(OBJECTS_ + "null-attribute-mapping.gif");
+
+
+	// ********** JPQL content assist **********
+
+	public static final ImageDescriptor JPQL_FUNCTION = buildImageDescriptor(OBJECTS_ + "jpql-function.gif");
+	public static final ImageDescriptor JPQL_IDENTIFIER = buildImageDescriptor(OBJECTS_ + "jpql-identifier.gif");
+	public static final ImageDescriptor JPQL_VARIABLE = buildImageDescriptor(OBJECTS_ + "jpql-variable.gif");
+
+
+	// ********** entity generation database **********
+
+	public static final ImageDescriptor TABLE = buildImageDescriptor(OBJECTS_ + "table.gif");
+	public static final ImageDescriptor COLUMN = buildImageDescriptor(OBJECTS_ + "column.gif");
+
+
+	// ********** entity generation database **********
+
+	public static final ImageDescriptor ENTITY_GEN_TABLE = buildImageDescriptor(OBJECTS_ + "entity-gen-table.gif");
+	public static final ImageDescriptor ENTITY_GEN_TABLE_OBJECT = buildImageDescriptor(OBJECTS_ + "entity-gen-table-object.gif");
+	public static final ImageDescriptor ENTITY_GEN_COLUMN = buildImageDescriptor(OBJECTS_ + "entity-gen-column.gif");
+	public static final ImageDescriptor ENTITY_GEN_KEY_COLUMN = buildImageDescriptor(OBJECTS_ + "entity-gen-column-key.gif");
+
+
+	// ********** misc **********
+
+	private static ImageDescriptor buildImageDescriptor(String path) {
+		return JptJpaUiPlugin.instance().buildImageDescriptor(path);
+	}
+
+	private JptJpaUiImages() {
+		throw new UnsupportedOperationException();
+	}
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/MappingResourceUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/MappingResourceUiDefinition.java
index 216ded6763..81f42ee626 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/MappingResourceUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/MappingResourceUiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.AttributeMapping;
@@ -21,7 +22,7 @@ import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition;
 import org.eclipse.swt.widgets.Composite;
 
 /**
- * UI definitions for a specific
+ * UI definitions for a specific mapping file
  * {@link org.eclipse.jpt.common.core.JptResourceType resource type}.
  * <p>
  * Provisional API: This interface is part of an interim API that is still
@@ -36,22 +37,29 @@ public interface MappingResourceUiDefinition
 	// ********** type mappings **********
 
 	/**
-	 * 
+	 * Build a type mapping composite for the specified mapping.
 	 */
-	JpaComposite buildTypeMappingComposite(String mappingKey, PropertyValueModel<TypeMapping> mappingHolder, Composite parent, WidgetFactory widgetFactory);
-	
+	JpaComposite buildTypeMappingComposite(
+			String mappingKey,
+			PropertyValueModel<TypeMapping> mappingModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager
+		);
+
 	/**
-	 * 
+	 * Return the resource's type mapping UI definitions.
 	 */
 	Iterable<MappingUiDefinition<PersistentType, ? extends TypeMapping>> getTypeMappingUiDefinitions();
-	
+
 	/**
-	 * 
+	 * Return the resource's type mapping UI definition for the specified
+	 * mapping.
 	 */
 	MappingUiDefinition<PersistentType, ? extends TypeMapping> getTypeMappingUiDefinition(String mappingKey);
-	
+
 	/**
-	 * Return a default type mapping ui provider or null
+	 * Return the resource's default type mapping UI definition.
 	 */
 	DefaultMappingUiDefinition<PersistentType, ? extends TypeMapping> getDefaultTypeMappingUiDefinition();
 
@@ -59,23 +67,31 @@ public interface MappingResourceUiDefinition
 	// ********** attribute mappings **********
 
 	/**
-	 * 
+	 * Build an attribute mapping composite for the specified mapping.
 	 */
-	JpaComposite buildAttributeMappingComposite(String mappingKey, PropertyValueModel<AttributeMapping> mappingHolder, PropertyValueModel<Boolean> enabledModel, Composite parent, WidgetFactory widgetFactory);
-	
+	JpaComposite buildAttributeMappingComposite(
+			String mappingKey,
+			PropertyValueModel<AttributeMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager
+		);
+
 	/**
 	 * Return the resource's attribute mapping UI definitions.
 	 */
 	Iterable<MappingUiDefinition<ReadOnlyPersistentAttribute, ? extends AttributeMapping>> getAttributeMappingUiDefinitions();
-	
+
 	/**
-	 * Return the resource's attribute mapping UI definitions.
+	 * Return the resource's attribute mapping UI definition for the specified
+	 * mapping.
 	 */
 	MappingUiDefinition<ReadOnlyPersistentAttribute, ? extends AttributeMapping> getAttributeMappingUiDefinition(String mappingKey);
-	
+
 	/**
-	 * Return a default attribute mapping ui definition for the given key or null
+	 * Return the resource's default attribute mapping UI definition
+	 * for the specified mapping.
 	 */
 	DefaultMappingUiDefinition<ReadOnlyPersistentAttribute, ? extends AttributeMapping> getDefaultAttributeMappingUiDefinition(String mappingKey);
-	
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/ResourceUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/ResourceUiDefinition.java
index db68ac6874..d6229d624a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/ResourceUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/ResourceUiDefinition.java
@@ -38,13 +38,12 @@ public interface ResourceUiDefinition {
 	ItemTreeStateProviderFactoryProvider getStructureViewFactoryProvider();
 
 	/**
-	 * Return the <code>JpaEditorPageDefinition</code>'s to be displayed
+	 * Return the JPA editor page definitions to be displayed
 	 * as tabs for an editor for the resource.
 	 * <p>
-	 * Currently we only have a persistence.xml editor
+	 * Currently Dali has only a <code>persistence.xml</code> editor.
 	 * 
 	 * @see org.eclipse.jpt.jpa.ui.internal.editors.JpaXmlEditor
 	 */
 	ListIterable<JpaEditorPageDefinition> getEditorPageDefinitions();
-
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/DefaultMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/DefaultMappingUiDefinition.java
index 1706c2a908..cfd2e54a12 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/DefaultMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/DefaultMappingUiDefinition.java
@@ -20,9 +20,8 @@ public interface DefaultMappingUiDefinition<M, T>
 	extends MappingUiDefinition<M, T>
 {
 	/**
-	 * Returns a unique string that corresponds to the key of the mapping in the
-	 * core.  For a default mapping the method getKey() will return null since
-	 * that is for the specified mapping.  This will return the default mapping key, not null
+	 * Return a key corresponding to the key to be used when the mapping's
+	 * specified key is <code>null</code>.
 	 */
 	String getDefaultKey();
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/JpaDetailsPageManager.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/JpaDetailsPageManager.java
index e0537e443a..43f43d517b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/JpaDetailsPageManager.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/JpaDetailsPageManager.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.jpa.core.JpaStructureNode;
 import org.eclipse.swt.widgets.Composite;
@@ -48,6 +49,6 @@ public interface JpaDetailsPageManager<T extends JpaStructureNode> {
 	void setSubject(Object subject);
 
 	interface Factory {
-		<T extends JpaStructureNode> JpaDetailsPageManager<T> buildPageManager(Composite parent, WidgetFactory widgetFactory);
+		<T extends JpaStructureNode> JpaDetailsPageManager<T> buildPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/JpaDetailsProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/JpaDetailsProvider.java
index e9427862c1..31da38d7a8 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/JpaDetailsProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/JpaDetailsProvider.java
@@ -9,13 +9,14 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.jpa.core.JpaStructureNode;
 import org.eclipse.swt.widgets.Composite;
 
 /**
  * This provider is responsible for creating the {@link JpaDetailsPageManager}
- * responsible for showing the information for a structure node ID.
+ * responsible for showing the information for a JPA structure node.
  * <p>
  * Provisional API: This interface is part of an interim API that is still
  * under development and expected to change significantly before reaching
@@ -36,11 +37,12 @@ public interface JpaDetailsProvider {
 	boolean providesDetails(JpaStructureNode structureNode);
 
 	/**
-	 * Build a new details page manager with the specified parent and widget
-	 * factory.
+	 * Build a new details page manager with the specified parent, widget
+	 * factory, and resource manager.
 	 */
 	// TODO pass in JpaUiFactory so these pages can be built using the factory and overridden?
 	JpaDetailsPageManager<? extends JpaStructureNode> buildDetailsPageManager(
 			Composite parent,
-			WidgetFactory widgetFactory);
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager);
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/MappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/MappingUiDefinition.java
index c94c6a883e..e94112b4d5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/MappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/MappingUiDefinition.java
@@ -9,11 +9,14 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.details;
 
-import org.eclipse.swt.graphics.Image;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jpt.common.utility.internal.transformer.AbstractTransformer;
+import org.eclipse.jpt.common.utility.transformer.Transformer;
 
 /**
- * A mapping UI definition provides the labels and images for the (type or
- * attribute) mapping type indicated by {@link #getKey()}.
+ * A mapping UI definition provides the {@link #getLabel() label} and
+ * {@link #getImageDescriptor() image descriptor} for the
+ * (type or attribute) mapping type indicated by {@link #getKey()}.
  * <p>
  * Provisional API: This interface is part of an interim API that is still
  * under development and expected to change significantly before reaching
@@ -27,7 +30,7 @@ import org.eclipse.swt.graphics.Image;
 public interface MappingUiDefinition<M, T> {
 
 	/**
-	 * Return a key that corresponds to the mapping's key.
+	 * Return a key corresponding to the mapping's key.
 	 * 
 	 * @see org.eclipse.jpt.jpa.core.context.java.JavaTypeMappingDefinition#getKey()
 	 * @see org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition#getKey()
@@ -37,27 +40,40 @@ public interface MappingUiDefinition<M, T> {
 	String getKey();
 
 	/**
-	 * Return a string that indicates the mapping type.
+	 * Return a string corresponding to the mapping type.
 	 */
 	String getLabel();
 
+	Transformer<MappingUiDefinition, String> LABEL_TRANSFORMER = new LabelTransformer();
+	class LabelTransformer
+		extends AbstractTransformer<MappingUiDefinition, String>
+	{
+		@Override
+		public String transform_(MappingUiDefinition def) {
+			return def.getLabel();
+		}
+	}
+
 	/**
-	 * Return a string that indicates the mapping type and can be used
+	 * Return a string that corresponds to the mapping type and can be used
 	 * in the mapping change link label.
 	 */
 	String getLinkLabel();
 
 	/**
-	 * Return a "normal" image that indicates the mapping type.
-	 * @see #getGhostImage()
+	 * Return an image descriptor corresponding to the mapping type.
 	 */
-	Image getImage();
+	ImageDescriptor getImageDescriptor();
 
-	/**
-	 * Return a "ghost" image that indicates the mapping type.
-	 * @see #getImage()
-	 */
-	Image getGhostImage();
+	Transformer<MappingUiDefinition, ImageDescriptor> IMAGE_DESCRIPTOR_TRANSFORMER = new ImageDescriptorTransformer();
+	class ImageDescriptorTransformer
+		extends AbstractTransformer<MappingUiDefinition, ImageDescriptor>
+	{
+		@Override
+		public ImageDescriptor transform_(MappingUiDefinition def) {
+			return def.getImageDescriptor();
+		}
+	}
 
 	/**
 	 * Return whether the mapping type represented by this definition is enabled for the given
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/java/DefaultJavaAttributeMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/java/DefaultJavaAttributeMappingUiDefinition.java
index 98f781bea6..be40df986e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/java/DefaultJavaAttributeMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/java/DefaultJavaAttributeMappingUiDefinition.java
@@ -20,8 +20,8 @@ import org.eclipse.jpt.jpa.ui.details.DefaultMappingUiDefinition;
  * pioneering adopters on the understanding that any code that uses this API
  * will almost certainly be broken (repeatedly) as the API evolves.
  */
-public interface DefaultJavaAttributeMappingUiDefinition<T extends AttributeMapping> 
-	extends JavaAttributeMappingUiDefinition<T>, DefaultMappingUiDefinition<ReadOnlyPersistentAttribute, T>
+public interface DefaultJavaAttributeMappingUiDefinition<M extends AttributeMapping> 
+	extends JavaAttributeMappingUiDefinition<M>, DefaultMappingUiDefinition<ReadOnlyPersistentAttribute, M>
 {
-	
+	// combine interfaces
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/java/DefaultJavaTypeMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/java/DefaultJavaTypeMappingUiDefinition.java
index 0336b9e18d..a90b1655ee 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/java/DefaultJavaTypeMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/java/DefaultJavaTypeMappingUiDefinition.java
@@ -20,8 +20,8 @@ import org.eclipse.jpt.jpa.ui.details.DefaultMappingUiDefinition;
  * pioneering adopters on the understanding that any code that uses this API
  * will almost certainly be broken (repeatedly) as the API evolves.
  */
-public interface DefaultJavaTypeMappingUiDefinition<T extends TypeMapping>
-	extends JavaTypeMappingUiDefinition<T>, DefaultMappingUiDefinition<PersistentType, T>
+public interface DefaultJavaTypeMappingUiDefinition<M extends TypeMapping>
+	extends JavaTypeMappingUiDefinition<M>, DefaultMappingUiDefinition<PersistentType, M>
 {
-	
+	// combine interfaces
 }
 \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/java/JavaAttributeMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/java/JavaAttributeMappingUiDefinition.java
index e3b3da63c2..b7510a4d6b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/java/JavaAttributeMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/java/JavaAttributeMappingUiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.AttributeMapping;
@@ -24,21 +25,19 @@ import org.eclipse.swt.widgets.Composite;
  * pioneering adopters on the understanding that any code that uses this API
  * will almost certainly be broken (repeatedly) as the API evolves.
  */
-public interface JavaAttributeMappingUiDefinition<T extends AttributeMapping>
-	extends MappingUiDefinition<ReadOnlyPersistentAttribute, T>
+public interface JavaAttributeMappingUiDefinition<M extends AttributeMapping>
+	extends MappingUiDefinition<ReadOnlyPersistentAttribute, M>
 {
 	/**
-	 * Creates <code>JpaComposite</code> that corresponds to this mapping type.
-	 * This will be displayed by the <code>PersistentAttributeDetailsPage</code>
-	 * when the mapping key matches the key given by this provider. The
-	 * composites will be stored in a Map with the mapping key as the key.
-	 *
-	 * @param factory The UI factory responsible to create the right composite
-	 * for any mapping type
-	 * @param mappingModel The model of the mapping being displayed
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create the various widgets
-	 * @return The composite displaying the information for a certain mapping
+	 * Create a JPA composite corresponding to the definition's mapping type.
+	 * This will be displayed by the JPA details view
+	 * when the mapping key matches the definition's key.
 	 */
-	JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<T> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parent, WidgetFactory widgetFactory);
+	JpaComposite buildAttributeMappingComposite(
+			JavaUiFactory factory,
+			PropertyValueModel<M> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager);
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/java/JavaTypeMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/java/JavaTypeMappingUiDefinition.java
index 74202a75b0..34c1c17616 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/java/JavaTypeMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/java/JavaTypeMappingUiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.PersistentType;
@@ -24,21 +25,18 @@ import org.eclipse.swt.widgets.Composite;
  * pioneering adopters on the understanding that any code that uses this API
  * will almost certainly be broken (repeatedly) as the API evolves.
  */
-public interface JavaTypeMappingUiDefinition<T extends TypeMapping>
-	extends MappingUiDefinition<PersistentType, T>
+public interface JavaTypeMappingUiDefinition<M extends TypeMapping>
+	extends MappingUiDefinition<PersistentType, M>
 {
 	/**
-	 * Creates <code>JpaComposite</code> that corresponds to this mapping type.
-	 * This will be displayed by the <code>PersistentTypeDetailsPage</code> when
-	 * the mapping key matches the key given by this provider. The composites
-	 * will be stored in a Map with the mapping key as the key.
-	 *
-	 * @param factory The UI factory responsible to create the right composite
-	 * for any mapping type
-	 * @param mappingModel The model of the mapping being displayed
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create the various widgets
-	 * @return The composite displaying the information for a certain mapping
+	 * Create a JPA composite corresponding to the definition's mapping type.
+	 * This will be displayed by the JPA details view
+	 * when the mapping key matches the definition's key.
 	 */
-	JpaComposite buildTypeMappingComposite(JavaUiFactory factory, PropertyValueModel<T> mappingModel, Composite parent, WidgetFactory widgetFactory);
+	JpaComposite buildTypeMappingComposite(
+			JavaUiFactory factory,
+			PropertyValueModel<M> mappingModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager);
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/java/JavaUiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/java/JavaUiFactory.java
index 7e8a111122..e427956b7e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/java/JavaUiFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/java/JavaUiFactory.java
@@ -3,12 +3,13 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
+ * 
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.java.JavaBasicMapping;
@@ -24,252 +25,113 @@ import org.eclipse.jpt.jpa.core.context.java.JavaOneToManyMapping;
 import org.eclipse.jpt.jpa.core.context.java.JavaOneToOneMapping;
 import org.eclipse.jpt.jpa.core.context.java.JavaTransientMapping;
 import org.eclipse.jpt.jpa.core.context.java.JavaVersionMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddable;
-import org.eclipse.jpt.jpa.core.context.orm.OrmEntity;
-import org.eclipse.jpt.jpa.core.context.orm.OrmMappedSuperclass;
 import org.eclipse.jpt.jpa.ui.details.JpaComposite;
 import org.eclipse.swt.widgets.Composite;
 
 /**
- * Use {@link JavaUiFactory} to create any java JPA composites
+ * Use a Java UI factory to create any Java JPA composites.
  * <p>
  * Provisional API: This interface is part of an interim API that is still under
  * development and expected to change significantly before reaching stability.
  * It is available at this early stage to solicit feedback from pioneering
  * adopters on the understanding that any code that uses this API will almost
  * certainly be broken (repeatedly) as the API evolves.
- *
- *
+ * 
  * @version 3.0
  * @since 3.0
  */
-public interface JavaUiFactory
-{	
-	
-	// **************** java type mapping composites ***************************
-	
-	/**
-	 * Creates a new <code>JpaComposite</code> used to edit a <code>JavaMappedSuperclass</code>.
-	 *
-	 * @param subjectHolder The holder of the mapped superclass
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create the widgets
-	 * @return A new <code>JpaComposite</code>
-	 */
+public interface JavaUiFactory {
+
+	// ********** type mappings **********
+
 	JpaComposite createJavaMappedSuperclassComposite(
-		PropertyValueModel<JavaMappedSuperclass> subjectHolder,
-		Composite parent,
-		WidgetFactory widgetFactory);
-	
-	/**
-	 * Creates a new <code>JpaComposite</code> used to edit an <code>JavaEntity</code>.
-	 *
-	 * @param subjectHolder The holder of the java entity
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create the widgets
-	 * @return A new <code>JpaComposite</code>
-	 */
+		PropertyValueModel<JavaMappedSuperclass> mappedSuperclassModel,
+		Composite parentComposite,
+		WidgetFactory widgetFactory,
+		ResourceManager resourceManager);
+
 	JpaComposite createJavaEntityComposite(
-		PropertyValueModel<JavaEntity> subjectHolder,
-		Composite parent,
-		WidgetFactory widgetFactory);
-	
-	/**
-	 * Creates a new <code>JpaComposite</code> used to edit a <code>JavaEmbeddable</code>.
-	 *
-	 * @param subjectHolder The holder of the embeddable
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create the widgets
-	 * @return A new <code>JpaComposite</code>
-	 */
+		PropertyValueModel<JavaEntity> entityModel,
+		Composite parentComposite,
+		WidgetFactory widgetFactory,
+		ResourceManager resourceManager);
+
 	JpaComposite createJavaEmbeddableComposite(
-		PropertyValueModel<JavaEmbeddable> subjectHolder,
-		Composite parent,
-		WidgetFactory widgetFactory);
-	
-	
-	// **************** orm type mapping composites ****************************
-	
-	/**
-	 * Creates a new <code>JpaComposite</code> used to edit an <code>OrmMappedSuperclass</code>.
-	 *
-	 * @param subjectHolder The holder of the mapped superclass
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create the widgets
-	 * @return A new <code>JpaComposite</code>
-	 */
-	JpaComposite createOrmMappedSuperclassComposite(
-		PropertyValueModel<OrmMappedSuperclass> subjectHolder,
-		Composite parent,
-		WidgetFactory widgetFactory);
-	
-	/**
-	 * Creates a new <code>JpaComposite</code> used to edit an <code>OrmEntity</code>.
-	 *
-	 * @param subjectHolder The holder of the orm entity
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create the widgets
-	 * @return A new <code>JpaComposite</code>
-	 */
-	JpaComposite createOrmEntityComposite(
-		PropertyValueModel<OrmEntity> subjectHolder,
-		Composite parent,
-		WidgetFactory widgetFactory);
+		PropertyValueModel<JavaEmbeddable> embeddableModel,
+		Composite parentComposite,
+		WidgetFactory widgetFactory,
+		ResourceManager resourceManager);
+
+
+	// ********** attribute mappings **********
 
-	/**
-	 * Creates a new <code>JpaComposite</code> used to edit an <code>OrmEmbeddable</code>.
-	 *
-	 * @param subjectHolder The holder of the embeddable
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create the widgets
-	 * @return A new <code>JpaComposite</code>
-	 */
-	JpaComposite createOrmEmbeddableComposite(
-		PropertyValueModel<OrmEmbeddable> subjectHolder,
-		Composite parent,
-		WidgetFactory widgetFactory);
-	
-	
-	// **************** java attribute mapping composites **********************
-	
-	/**
-	 * Creates a new <code>JpaComposite</code> used to edit a <code>JavaIdMapping</code>.
-	 *
-	 * @param subjectHolder The holder of the ID mapping
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create the widgets
-	 * @return A new <code>JpaComposite</code>
-	 */
 	JpaComposite createJavaIdMappingComposite(
-		PropertyValueModel<JavaIdMapping> subjectHolder,
+		PropertyValueModel<JavaIdMapping> mappingModel,
 		PropertyValueModel<Boolean> enabledModel,
-		Composite parent,
-		WidgetFactory widgetFactory);
-	
-	/**
-	 * Creates a new <code>JpaComposite</code> used to edit a <code>JavaEmbeddedIdMapping</code>.
-	 *
-	 * @param subjectHolder The holder of the embedded ID mapping
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create the widgets
-	 * @return A new <code>JpaComposite</code>
-	 */
+		Composite parentComposite,
+		WidgetFactory widgetFactory,
+		ResourceManager resourceManager);
+
 	JpaComposite createJavaEmbeddedIdMappingComposite(
-		PropertyValueModel<JavaEmbeddedIdMapping> subjectHolder,
+		PropertyValueModel<JavaEmbeddedIdMapping> mappingModel,
 		PropertyValueModel<Boolean> enabledModel,
-		Composite parent,
-		WidgetFactory widgetFactory);
-	
-	/**
-	 * Creates a new <code>JpaComposite</code> used to edit a <code>JavaBasicMapping</code>.
-	 *
-	 * @param subjectHolder The holder of the basic mapping
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create the widgets
-	 * @return A new <code>JpaComposite</code>
-	 */
+		Composite parentComposite,
+		WidgetFactory widgetFactory,
+		ResourceManager resourceManager);
+
 	JpaComposite createJavaBasicMappingComposite(
-		PropertyValueModel<JavaBasicMapping> subjectHolder,
+		PropertyValueModel<JavaBasicMapping> mappingModel,
 		PropertyValueModel<Boolean> enabledModel,
-		Composite parent,
-		WidgetFactory widgetFactory);
-	
-	/**
-	 * Creates a new <code>JpaComposite</code> used to edit a <code>JavaVersionMapping</code>.
-	 *
-	 * @param subjectHolder The holder of the version mapping
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create the widgets
-	 * @return A new <code>JpaComposite</code>
-	 */
+		Composite parentComposite,
+		WidgetFactory widgetFactory,
+		ResourceManager resourceManager);
+
 	JpaComposite createJavaVersionMappingComposite(
-		PropertyValueModel<JavaVersionMapping> subjectHolder,
+		PropertyValueModel<JavaVersionMapping> mappingModel,
 		PropertyValueModel<Boolean> enabledModel,
-		Composite parent,
-		WidgetFactory widgetFactory);
-	
-	/**
-	 * Creates a new <code>JpaComposite</code> used to edit a <code>JavaManyToOneMapping</code>.
-	 *
-	 * @param subjectHolder The holder of the many to one mapping
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create the widgets
-	 * @return A new <code>JpaComposite</code>
-	 */
+		Composite parentComposite,
+		WidgetFactory widgetFactory,
+		ResourceManager resourceManager);
+
 	JpaComposite createJavaManyToOneMappingComposite(
-		PropertyValueModel<JavaManyToOneMapping> subjectHolder,
+		PropertyValueModel<JavaManyToOneMapping> mappingModel,
 		PropertyValueModel<Boolean> enabledModel,
-		Composite parent,
-		WidgetFactory widgetFactory);
-	
-	/**
-	 * Creates a new <code>JpaComposite</code> used to edit a <code>JavaOneToManyMapping</code>.
-	 *
-	 * @param subjectHolder The holder of the one to many mapping
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create the widgets
-	 * @return A new <code>JpaComposite</code>
-	 */
+		Composite parentComposite,
+		WidgetFactory widgetFactory,
+		ResourceManager resourceManager);
+
 	JpaComposite createJavaOneToManyMappingComposite(
-		PropertyValueModel<JavaOneToManyMapping> subjectHolder,
+		PropertyValueModel<JavaOneToManyMapping> mappingModel,
 		PropertyValueModel<Boolean> enabledModel,
-		Composite parent,
-		WidgetFactory widgetFactory);
-	
-	/**
-	 * Creates a new <code>JpaComposite</code> used to edit a <code>JavaOneToOneMapping</code>.
-	 *
-	 * @param subjectHolder The holder of the one to one mapping
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create the widgets
-	 * @return A new <code>JpaComposite</code>
-	 */
+		Composite parentComposite,
+		WidgetFactory widgetFactory,
+		ResourceManager resourceManager);
+
 	JpaComposite createJavaOneToOneMappingComposite(
-		PropertyValueModel<JavaOneToOneMapping> subjectHolder,
+		PropertyValueModel<JavaOneToOneMapping> mappingModel,
 		PropertyValueModel<Boolean> enabledModel,
-		Composite parent,
-		WidgetFactory widgetFactory);
-	
-	/**
-	 * Creates a new <code>JpaComposite</code> used to edit a <code>JavaManyToManyMapping</code>.
-	 *
-	 * @param subjectHolder The holder of the many to many mapping
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create the widgets
-	 * @return A new <code>JpaComposite</code>
-	 */
+		Composite parentComposite,
+		WidgetFactory widgetFactory,
+		ResourceManager resourceManager);
+
 	JpaComposite createJavaManyToManyMappingComposite(
-		PropertyValueModel<JavaManyToManyMapping> subjectHolder,
+		PropertyValueModel<JavaManyToManyMapping> mappingModel,
 		PropertyValueModel<Boolean> enabledModel,
-		Composite parent,
-		WidgetFactory widgetFactory);
-	
-	/**
-	 * Creates a new <code>JpaComposite</code> used to edit a <code>JavaEmbeddedMapping</code>.
-	 *
-	 * @param subjectHolder The holder of the embedded mapping
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create the widgets
-	 * @return A new <code>JpaComposite</code>
-	 */
+		Composite parentComposite,
+		WidgetFactory widgetFactory,
+		ResourceManager resourceManager);
+
 	JpaComposite createJavaEmbeddedMappingComposite(
-		PropertyValueModel<JavaEmbeddedMapping> subjectHolder,
+		PropertyValueModel<JavaEmbeddedMapping> mappingModel,
 		PropertyValueModel<Boolean> enabledModel,
-		Composite parent,
-		WidgetFactory widgetFactory);
-	
-	/**
-	 * Creates a new <code>JpaComposite</code> used to edit a <code>JavaTransientMapping</code>.
-	 *
-	 * @param subjectHolder The holder of the transient mapping
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create the widgets
-	 * @return A new <code>JpaComposite</code>
-	 */
+		Composite parentComposite,
+		WidgetFactory widgetFactory,
+		ResourceManager resourceManager);
+
 	JpaComposite createJavaTransientMappingComposite(
-		PropertyValueModel<JavaTransientMapping> subjectHolder,
+		PropertyValueModel<JavaTransientMapping> mappingModel,
 		PropertyValueModel<Boolean> enabledModel,
-		Composite parent,
-		WidgetFactory widgetFactory);
-	
-}
-\ No newline at end of file
+		Composite parentComposite,
+		WidgetFactory widgetFactory,
+		ResourceManager resourceManager);
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/orm/OrmAttributeMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/orm/OrmAttributeMappingUiDefinition.java
index 89cfb0c7be..048fbd2d6e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/orm/OrmAttributeMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/orm/OrmAttributeMappingUiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.AttributeMapping;
@@ -24,21 +25,19 @@ import org.eclipse.swt.widgets.Composite;
  * pioneering adopters on the understanding that any code that uses this API
  * will almost certainly be broken (repeatedly) as the API evolves.
  */
-public interface OrmAttributeMappingUiDefinition<T extends AttributeMapping>
-	extends MappingUiDefinition<ReadOnlyPersistentAttribute, T>
+public interface OrmAttributeMappingUiDefinition<M extends AttributeMapping>
+	extends MappingUiDefinition<ReadOnlyPersistentAttribute, M>
 {
 	/**
-	 * Creates <code>JpaComposite</code> that corresponds to this mapping type.
-	 * This will be displayed by the <code>PersistentAttributeDetailsPage</code>
-	 * when the mapping key matches the key given by this provider. The
-	 * composites will be stored in a Map with the mapping key as the key.
-	 *
-	 * @param factory The UI factory responsible to create the right composite
-	 * for any mapping type
-	 * @param mappingModel The model of the mapping being displayed
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create the various widgets
-	 * @return The composite displaying the information for a certain mapping
+	 * Create a JPA composite corresponding to the definition's mapping type.
+	 * This will be displayed by the JPA details view
+	 * when the mapping key matches the definition's key.
 	 */
-	JpaComposite buildAttributeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<T> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parent, WidgetFactory widgetFactory);
+	JpaComposite buildAttributeMappingComposite(
+			OrmXmlUiFactory factory,
+			PropertyValueModel<M> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager);
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/orm/OrmTypeMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/orm/OrmTypeMappingUiDefinition.java
index 552cd31ed7..6e05dd9cab 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/orm/OrmTypeMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/orm/OrmTypeMappingUiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.PersistentType;
@@ -24,21 +25,18 @@ import org.eclipse.swt.widgets.Composite;
  * pioneering adopters on the understanding that any code that uses this API
  * will almost certainly be broken (repeatedly) as the API evolves.
  */
-public interface OrmTypeMappingUiDefinition<T extends TypeMapping>
-	extends MappingUiDefinition<PersistentType, T>
+public interface OrmTypeMappingUiDefinition<M extends TypeMapping>
+	extends MappingUiDefinition<PersistentType, M>
 {
 	/**
-	 * Creates <code>JpaComposite</code> that correponds to this mapping type.
-	 * This will be displayed by the <code>PersistentTypeDetailsPage</code> when
-	 * the mapping key matches the key given by this provider. The composites
-	 * will be stored in a Map with the mapping key as the key.
-	 *
-	 * @param factory The UI factory responsible to create the right composite
-	 * for any mapping type
-	 * @param mappingModel The model of the mapping being displayed
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create the various widgets
-	 * @return The composite displaying the information for a certain mapping
+	 * Create a JPA composite corresponding to the definition's mapping type.
+	 * This will be displayed by the JPA details view
+	 * when the mapping key matches the definition's key.
 	 */
-	JpaComposite buildTypeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<T> mappingModel, Composite parent, WidgetFactory widgetFactory);
+	JpaComposite buildTypeMappingComposite(
+			OrmXmlUiFactory factory,
+			PropertyValueModel<M> mappingModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager);
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/orm/OrmXmlUiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/orm/OrmXmlUiFactory.java
index 1bb2548373..db547819ae 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/orm/OrmXmlUiFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/orm/OrmXmlUiFactory.java
@@ -3,12 +3,13 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
+ * 
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.orm.OrmBasicMapping;
@@ -28,203 +29,110 @@ import org.eclipse.jpt.jpa.ui.details.JpaComposite;
 import org.eclipse.swt.widgets.Composite;
 
 /**
- * Use {@link OrmXmlUiFactory} to create any ORM JPA composites
+ * Use an <code>orm.xml</code> UI factory to create any <code>orm.xml</code>
+ * JPA composites.
  * <p>
  * Provisional API: This interface is part of an interim API that is still under
  * development and expected to change significantly before reaching stability.
  * It is available at this early stage to solicit feedback from pioneering
  * adopters on the understanding that any code that uses this API will almost
  * certainly be broken (repeatedly) as the API evolves.
- *
- * @see org.eclipse.jpt.jpa.ui.internal.BaseJpaUiFactory
- *
+ * 
  * @version 2.0
  * @since 1.0
  */
-public interface OrmXmlUiFactory
-{
-	
-	// **************** orm type mapping composites ****************************
-	
-	/**
-	 * Creates a new <code>JpaComposite</code> used to edit an <code>OrmMappedSuperclass</code>.
-	 *
-	 * @param subjectHolder The holder of the mapped superclass
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create the widgets
-	 * @return A new <code>JpaComposite</code>
-	 */
+public interface OrmXmlUiFactory {
+
+	// ********** type mappings **********
+
 	JpaComposite createOrmMappedSuperclassComposite(
-		PropertyValueModel<OrmMappedSuperclass> subjectHolder,
-		Composite parent,
-		WidgetFactory widgetFactory);
-	
-	/**
-	 * Creates a new <code>JpaComposite</code> used to edit an <code>OrmEntity</code>.
-	 *
-	 * @param subjectHolder The holder of the orm entity
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create the widgets
-	 * @return A new <code>JpaComposite</code>
-	 */
+		PropertyValueModel<OrmMappedSuperclass> mappedSuperclassModel,
+		Composite parentComposite,
+		WidgetFactory widgetFactory,
+		ResourceManager resourceManager);
+
 	JpaComposite createOrmEntityComposite(
-		PropertyValueModel<OrmEntity> subjectHolder,
-		Composite parent,
-		WidgetFactory widgetFactory);
-
-	/**
-	 * Creates a new <code>JpaComposite</code> used to edit an <code>OrmEmbeddable</code>.
-	 *
-	 * @param subjectHolder The holder of the embeddable
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create the widgets
-	 * @return A new <code>JpaComposite</code>
-	 */
+		PropertyValueModel<OrmEntity> entityModel,
+		Composite parentComposite,
+		WidgetFactory widgetFactory,
+		ResourceManager resourceManager);
+
 	JpaComposite createOrmEmbeddableComposite(
-		PropertyValueModel<OrmEmbeddable> subjectHolder,
-		Composite parent,
-		WidgetFactory widgetFactory);
-	
-
-	// **************** orm attribute mapping composites ***********************
-	
-	/**
-	 * Creates a new <code>JpaComposite</code> used to edit an <code>OrmIdMapping</code>.
-	 *
-	 * @param subjectHolder The holder of the ID mapping
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create the widgets
-	 * @return A new <code>JpaComposite</code>
-	 */
+		PropertyValueModel<OrmEmbeddable> embeddableModel,
+		Composite parentComposite,
+		WidgetFactory widgetFactory,
+		ResourceManager resourceManager);
+
+
+	// ********** attribute mappings **********
+
 	JpaComposite createOrmIdMappingComposite(
-		PropertyValueModel<OrmIdMapping> subjectHolder,
+		PropertyValueModel<OrmIdMapping> mappingModel,
 		PropertyValueModel<Boolean> enabledModel,
-		Composite parent,
-		WidgetFactory widgetFactory);
-	
-	/**
-	 * Creates a new <code>JpaComposite</code> used to edit an <code>OrmEmbeddedIdMapping</code>.
-	 *
-	 * @param subjectHolder The holder of the embedded ID mapping
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create the widgets
-	 * @return A new <code>JpaComposite</code>
-	 */
+		Composite parentComposite,
+		WidgetFactory widgetFactory,
+		ResourceManager resourceManager);
+
 	JpaComposite createOrmEmbeddedIdMappingComposite(
-		PropertyValueModel<OrmEmbeddedIdMapping> subjectHolder,
+		PropertyValueModel<OrmEmbeddedIdMapping> mappingModel,
 		PropertyValueModel<Boolean> enabledModel,
-		Composite parent,
-		WidgetFactory widgetFactory);
-	
-	/**
-	 * Creates a new <code>JpaComposite</code> used to edit an <code>OrmBasicMapping</code>.
-	 *
-	 * @param subjectHolder The holder of the basic mapping
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create the widgets
-	 * @return A new <code>JpaComposite</code>
-	 */
+		Composite parentComposite,
+		WidgetFactory widgetFactory,
+		ResourceManager resourceManager);
+
 	JpaComposite createOrmBasicMappingComposite(
-		PropertyValueModel<OrmBasicMapping> subjectHolder,
+		PropertyValueModel<OrmBasicMapping> mappingModel,
 		PropertyValueModel<Boolean> enabledModel,
-		Composite parent,
-		WidgetFactory widgetFactory);
-	
-	/**
-	 * Creates a new <code>JpaComposite</code> used to edit an <code>OrmVersionMapping</code>.
-	 *
-	 * @param subjectHolder The holder of the version mapping
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create the widgets
-	 * @return A new <code>JpaComposite</code>
-	 */
+		Composite parentComposite,
+		WidgetFactory widgetFactory,
+		ResourceManager resourceManager);
+
 	JpaComposite createOrmVersionMappingComposite(
-		PropertyValueModel<OrmVersionMapping> subjectHolder,
+		PropertyValueModel<OrmVersionMapping> mappingModel,
 		PropertyValueModel<Boolean> enabledModel,
-		Composite parent,
-		WidgetFactory widgetFactory);
-	
-	/**
-	 * Creates a new <code>JpaComposite</code> used to edit an <code>OrmManyToOneMapping</code>.
-	 *
-	 * @param subjectHolder The holder of the many to one mapping
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create the widgets
-	 * @return A new <code>JpaComposite</code>
-	 */
+		Composite parentComposite,
+		WidgetFactory widgetFactory,
+		ResourceManager resourceManager);
+
 	JpaComposite createOrmManyToOneMappingComposite(
-		PropertyValueModel<OrmManyToOneMapping> subjectHolder,
+		PropertyValueModel<OrmManyToOneMapping> mappingModel,
 		PropertyValueModel<Boolean> enabledModel,
-		Composite parent,
-		WidgetFactory widgetFactory);
-	
-	/**
-	 * Creates a new <code>JpaComposite</code> used to edit an <code>OrmOneToManyMapping</code>.
-	 *
-	 * @param subjectHolder The holder of the one to many mapping
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create the widgets
-	 * @return A new <code>JpaComposite</code>
-	 */
+		Composite parentComposite,
+		WidgetFactory widgetFactory,
+		ResourceManager resourceManager);
+
 	JpaComposite createOrmOneToManyMappingComposite(
-		PropertyValueModel<OrmOneToManyMapping> subjectHolder,
+		PropertyValueModel<OrmOneToManyMapping> mappingModel,
 		PropertyValueModel<Boolean> enabledModel,
-		Composite parent,
-		WidgetFactory widgetFactory);
-	
-	/**
-	 * Creates a new <code>JpaComposite</code> used to edit an <code>OrmOneToOneMapping</code>.
-	 *
-	 * @param subjectHolder The holder of the one to one mapping
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create the widgets
-	 * @return A new <code>JpaComposite</code>
-	 */
+		Composite parentComposite,
+		WidgetFactory widgetFactory,
+		ResourceManager resourceManager);
+
 	JpaComposite createOrmOneToOneMappingComposite(
-		PropertyValueModel<OrmOneToOneMapping> subjectHolder,
+		PropertyValueModel<OrmOneToOneMapping> mappingModel,
 		PropertyValueModel<Boolean> enabledModel,
-		Composite parent,
-		WidgetFactory widgetFactory);
-	
-	/**
-	 * Creates a new <code>JpaComposite</code> used to edit an <code>OrmManyToManyMapping</code>.
-	 *
-	 * @param subjectHolder The holder of the many to many mapping
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create the widgets
-	 * @return A new <code>JpaComposite</code>
-	 */
+		Composite parentComposite,
+		WidgetFactory widgetFactory,
+		ResourceManager resourceManager);
+
 	JpaComposite createOrmManyToManyMappingComposite(
-		PropertyValueModel<OrmManyToManyMapping> subjectHolder,
+		PropertyValueModel<OrmManyToManyMapping> mappingModel,
 		PropertyValueModel<Boolean> enabledModel,
-		Composite parent,
-		WidgetFactory widgetFactory);
-		
-	/**
-	 * Creates a new <code>JpaComposite</code> used to edit an <code>OrmEmbeddedMapping</code>.
-	 *
-	 * @param subjectHolder The holder of the embedded mapping
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create the widgets
-	 * @return A new <code>JpaComposite</code>
-	 */
+		Composite parentComposite,
+		WidgetFactory widgetFactory,
+		ResourceManager resourceManager);
+
 	JpaComposite createOrmEmbeddedMappingComposite(
-		PropertyValueModel<OrmEmbeddedMapping> subjectHolder,
+		PropertyValueModel<OrmEmbeddedMapping> mappingModel,
 		PropertyValueModel<Boolean> enabledModel,
-		Composite parent,
-		WidgetFactory widgetFactory);
-	
-	/**
-	 * Creates a new <code>JpaComposite</code> used to edit an <code>OrmTransientMapping</code>.
-	 *
-	 * @param subjectHolder The holder of the transient mapping
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create the widgets
-	 * @return A new <code>JpaComposite</code>
-	 */
+		Composite parentComposite,
+		WidgetFactory widgetFactory,
+		ResourceManager resourceManager);
+
 	JpaComposite createOrmTransientMappingComposite(
-		PropertyValueModel<OrmTransientMapping> subjectHolder,
+		PropertyValueModel<OrmTransientMapping> mappingModel,
 		PropertyValueModel<Boolean> enabledModel,
-		Composite parent,
-		WidgetFactory widgetFactory);
-}
-\ No newline at end of file
+		Composite parentComposite,
+		WidgetFactory widgetFactory,
+		ResourceManager resourceManager);
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/editors/JpaEditorPageDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/editors/JpaEditorPageDefinition.java
index bc5225714d..1cc48f577a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/editors/JpaEditorPageDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/editors/JpaEditorPageDefinition.java
@@ -10,21 +10,27 @@
 package org.eclipse.jpt.jpa.ui.editors;
 
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.JpaStructureNode;
 import org.eclipse.ui.forms.IManagedForm;
 
 /**
- * A {@link JpaEditorPageDefinition} defines the content of an editor page.
- * We take advantage of the FormEditor behavior by not building the content
- * of any particular editor page until that tab is selected. At this point
- * {@link #buildEditorPageContent(IManagedForm, WidgetFactory, PropertyValueModel)}
- * will be called.
+ * A JPA editor page definition defines an editor page's:<ul>
+ * <li>title image
+ * <li>title text
+ * <li>help ID
+ * <li>content
+ * </ul>
+ * We take advantage of the {@link org.eclipse.ui.forms.editor.FormEditor FormEditor}
+ * behavior by not building the content
+ * of any particular editor page until its tab is selected. When the tab
+ * <em>is</em> selected we call
+ * {@link #buildContent(IManagedForm, WidgetFactory, ResourceManager, PropertyValueModel)}.
  * 
  * @see org.eclipse.jpt.jpa.ui.ResourceUiDefinition
  * @see org.eclipse.jpt.jpa.ui.internal.editors.JpaXmlEditor
- * 
  * <p>
  * Provisional API: This interface is part of an interim API that is still
  * under development and expected to change significantly before reaching
@@ -35,30 +41,27 @@ import org.eclipse.ui.forms.IManagedForm;
 public interface JpaEditorPageDefinition {
 
 	/**
-	 * Returns the help ID. This ID will be used if the help button is invoked.
-	 *
-	 * @return Either the help ID of this page or <code>null</code> if no help
-	 * is required
+	 * Return the descriptor for the image to be displayed alongside the page's
+	 * title {@link #getTitleText() text}.
+	 * @see org.eclipse.ui.forms.widgets.ScrolledForm#getImage()
 	 */
-	String getHelpID();
+	ImageDescriptor getTitleImageDescriptor();
 
 	/**
-	 * The image descriptor of the tab showing this page.
-	 *
-	 * @return The page's image
+	 * Return the text to be displayed in the page's title.
+	 * @see org.eclipse.ui.forms.widgets.ScrolledForm#getText()
 	 */
-	ImageDescriptor getPageImageDescriptor();
+	String getTitleText();
 
 	/**
-	 * The text of the tab showing this page.
-	 *
-	 * @return The page's text
+	 * Return the page's help ID.
+	 * This ID will be used if the help button is invoked.
 	 */
-	String getPageText();
+	String getHelpID();
 
 	/**
-	 * Build the content of this editor page using the given WidgetFactory
-	 * and the JpaStructureNode model.
+	 * Build the page's content in the specified form, using the specified
+	 * widget factory, resource manager, and JPA structure node model.
 	 */
-	void buildEditorPageContent(IManagedForm form, WidgetFactory widgetFactory, PropertyValueModel<JpaStructureNode> rootStructureNodeModel);
+	void buildContent(IManagedForm form, WidgetFactory widgetFactory, ResourceManager resourceManager, PropertyValueModel<JpaStructureNode> rootStructureNodeModel);
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/AbstractJpaPlatformUiProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/AbstractJpaPlatformUiProvider.java
index 365b545cd6..ac4e4addea 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/AbstractJpaPlatformUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/AbstractJpaPlatformUiProvider.java
@@ -16,7 +16,7 @@ import org.eclipse.jpt.jpa.ui.ResourceUiDefinition;
 import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider;
 
 /**
- * All the state in the JPA platform ui provider should be "static"
+ * All the state in the JPA platform UI provider should be "static"
  * (i.e. unchanging once it is initialized).
  */
 public abstract class AbstractJpaPlatformUiProvider
@@ -73,7 +73,7 @@ public abstract class AbstractJpaPlatformUiProvider
 	}
 
 	/**
-	 * Implement this to specify JPA mapping file ui definitions.
+	 * Implement this to specify JPA resource UI definitions.
 	 */
 	protected abstract void addResourceUiDefinitionsTo(List<ResourceUiDefinition> definitions);
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/AbstractResourceUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/AbstractResourceUiDefinition.java
index a969982210..76f904b253 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/AbstractResourceUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/AbstractResourceUiDefinition.java
@@ -48,10 +48,9 @@ public abstract class AbstractResourceUiDefinition
 	}
 
 	/**
-	 * Override to add the appropriate <code>JpaEditorPageDefinitions</code>
-	 * @param definitions
+	 * Add the appropriate definitions
 	 */
-	protected void addEditorPageDefinitionsTo(List<JpaEditorPageDefinition> definitions) {
-		//subclasses override
+	protected void addEditorPageDefinitionsTo(@SuppressWarnings("unused") List<JpaEditorPageDefinition> definitions) {
+		// only resources for which Dali supplies an editor need implement this method
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/ImageRepository.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/ImageRepository.java
deleted file mode 100644
index 1a9f7a5388..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/ImageRepository.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2012 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.ui.internal;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ResourceManager;
-import org.eclipse.jpt.jpa.ui.internal.plugin.JptJpaUiPlugin;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-@SuppressWarnings("nls")
-public final class ImageRepository {
-
-	// ***** overlays *****
-	public static Image getErrorOverlayImage(ResourceManager resourceManager) {
-		return getImage(resourceManager, ERROR_OVERLAY_DESCRIPTOR);
-	}
-	private static final ImageDescriptor ERROR_OVERLAY_DESCRIPTOR = buildImageDescriptor("overlays/error.gif");
-
-	public static Image getWarningOverlayImage(ResourceManager resourceManager) {
-		return getImage(resourceManager, WARNING_OVERLAY_DESCRIPTOR);
-	}
-	private static final ImageDescriptor WARNING_OVERLAY_DESCRIPTOR = buildImageDescriptor("overlays/warning.png");
-
-	// ***** buttons *****
-	public static Image getAddButtonImage(ResourceManager resourceManager) {
-		return getImage(resourceManager, ADD_BUTTON_DESCRIPTOR);
-	}
-	private static final ImageDescriptor ADD_BUTTON_DESCRIPTOR = buildImageDescriptor("buttons/add.png");
-
-	public static Image getEditButtonImage(ResourceManager resourceManager) {
-		return getImage(resourceManager, EDIT_BUTTON_DESCRIPTOR);
-	}
-	private static final ImageDescriptor EDIT_BUTTON_DESCRIPTOR = buildImageDescriptor("buttons/edit.png");
-
-	public static Image getDeleteButtonImage(ResourceManager resourceManager) {
-		return getImage(resourceManager, DELETE_BUTTON_DESCRIPTOR);
-	}
-	private static final ImageDescriptor DELETE_BUTTON_DESCRIPTOR = buildImageDescriptor("buttons/delete.png");
-
-	public static Image getMoveUpButtonImage(ResourceManager resourceManager) {
-		return getImage(resourceManager, MOVE_UP_BUTTON_DESCRIPTOR);
-	}
-	private static final ImageDescriptor MOVE_UP_BUTTON_DESCRIPTOR = buildImageDescriptor("buttons/move-up.png");
-
-	public static Image getMoveDownButtonImage(ResourceManager resourceManager) {
-		return getImage(resourceManager, MOVE_DOWN_BUTTON_DESCRIPTOR);
-	}
-	private static final ImageDescriptor MOVE_DOWN_BUTTON_DESCRIPTOR = buildImageDescriptor("buttons/move-down.png");
-
-	public static Image getExpandAllButtonImage(ResourceManager resourceManager) {
-		return getImage(resourceManager, EXPAND_ALL_BUTTON_DESCRIPTOR);
-	}
-	private static final ImageDescriptor EXPAND_ALL_BUTTON_DESCRIPTOR = buildImageDescriptor("buttons/expand-all.png");
-
-	public static Image getCollapseAllButtonImage(ResourceManager resourceManager) {
-		return getImage(resourceManager, COLLAPSE_ALL_BUTTON_DESCRIPTOR);
-	}
-	private static final ImageDescriptor COLLAPSE_ALL_BUTTON_DESCRIPTOR = buildImageDescriptor("buttons/collapse-all.png");
-
-	public static Image getRestoreDefaultsButtonImage(ResourceManager resourceManager) {
-		return getImage(resourceManager, RESTORE_DEFAULTS_BUTTON_DESCRIPTOR);
-	}
-	private static final ImageDescriptor RESTORE_DEFAULTS_BUTTON_DESCRIPTOR = buildImageDescriptor("buttons/restore-defaults.png");
-
-	public static Image getBrowseButtonImage(ResourceManager resourceManager) {
-		return getImage(resourceManager, BROWSE_BUTTON_DESCRIPTOR);
-	}
-	private static final ImageDescriptor BROWSE_BUTTON_DESCRIPTOR = buildImageDescriptor("buttons/browse.png");
-
-	public static Image getMiniBrowseButtonImage(ResourceManager resourceManager) {
-		return getImage(resourceManager, MINI_BROWSE_BUTTON_DESCRIPTOR);
-	}
-	private static final ImageDescriptor MINI_BROWSE_BUTTON_DESCRIPTOR = buildImageDescriptor("buttons/browse-mini.png");
-
-	public static Image getSelectAllButtonImage(ResourceManager resourceManager) {
-		return getImage(resourceManager, SELECT_ALL_BUTTON_DESCRIPTOR);
-	}
-	private static final ImageDescriptor SELECT_ALL_BUTTON_DESCRIPTOR = buildImageDescriptor("buttons/select-all.png");
-
-	public static Image getDeselectAllButtonImage(ResourceManager resourceManager) {
-		return getImage(resourceManager, DESELECT_ALL_BUTTON_DESCRIPTOR);
-	}
-	private static final ImageDescriptor DESELECT_ALL_BUTTON_DESCRIPTOR = buildImageDescriptor("buttons/deselect-all.png");
-
-	public static Image getRefreshButtonImage(ResourceManager resourceManager) {
-		return getImage(resourceManager, REFRESH_BUTTON_DESCRIPTOR);
-	}
-	private static final ImageDescriptor REFRESH_BUTTON_DESCRIPTOR = buildImageDescriptor("buttons/refresh.gif");
-
-	public static Image getAddConnectionButtonImage(ResourceManager resourceManager) {
-		return getImage(resourceManager, ADD_CONNECTION_BUTTON_DESCRIPTOR);
-	}
-	private static final ImageDescriptor ADD_CONNECTION_BUTTON_DESCRIPTOR = buildImageDescriptor("buttons/add-connection.gif");
-
-	public static Image getReconnectButtonImage(ResourceManager resourceManager) {
-		return getImage(resourceManager, RECONNECT_BUTTON_DESCRIPTOR);
-	}
-	private static final ImageDescriptor RECONNECT_BUTTON_DESCRIPTOR = buildImageDescriptor("buttons/reconnect.png");
-
-	// ***** objects *****
-	public static Image getFileImage(ResourceManager resourceManager) {
-		return getImage(resourceManager, FILE_DESCRIPTOR);
-	}
-	private static final ImageDescriptor FILE_DESCRIPTOR = buildImageDescriptor("objects/file.png");
-
-	public static Image getFolderImage(ResourceManager resourceManager) {
-		return getImage(resourceManager, FOLDER_DESCRIPTOR);
-	}
-	private static final ImageDescriptor FOLDER_DESCRIPTOR = buildImageDescriptor("objects/folder.png");
-
-	public static Image getPackageImage(ResourceManager resourceManager) {
-		return getImage(resourceManager, PACKAGE_DESCRIPTOR);
-	}
-	private static final ImageDescriptor PACKAGE_DESCRIPTOR = buildImageDescriptor("objects/package.png");
-
-	public static Image getTableImage(ResourceManager resourceManager) {
-		return getImage(resourceManager, TABLE_DESCRIPTOR);
-	}
-	private static final ImageDescriptor TABLE_DESCRIPTOR = buildImageDescriptor("objects/table.gif");
-
-	public static Image getTableObjImage(ResourceManager resourceManager) {
-		return getImage(resourceManager, TABLE_OBJ_DESCRIPTOR);
-	}
-	private static final ImageDescriptor TABLE_OBJ_DESCRIPTOR = buildImageDescriptor("objects/table_obj.gif");
-
-	public static Image getColumnImage(ResourceManager resourceManager) {
-		return getImage(resourceManager, COLUMN_DESCRIPTOR);
-	}
-	private static final ImageDescriptor COLUMN_DESCRIPTOR = buildImageDescriptor("objects/column.gif");
-
-	public static Image getKeyColumnImage(ResourceManager resourceManager) {
-		return getImage(resourceManager, KEY_COLUMN_DESCRIPTOR);
-	}
-	private static final ImageDescriptor KEY_COLUMN_DESCRIPTOR = buildImageDescriptor("objects/columnKey.gif");
-
-
-	private static ImageDescriptor buildImageDescriptor(String fileName) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin(JptJpaUiPlugin.instance().getPluginID(), "images/" + fileName);
-	}
-
-
-	private static Image getImage(ResourceManager resourceManager, ImageDescriptor descriptor) {
-		return resourceManager.createImage(descriptor);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/InternalJpaWorkbench.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/InternalJpaWorkbench.java
index 9fd34031ae..473d50632c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/InternalJpaWorkbench.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/InternalJpaWorkbench.java
@@ -9,11 +9,16 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal;
 
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.resource.LocalResourceManager;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.utility.internal.ObjectTools;
 import org.eclipse.jpt.jpa.ui.JpaWorkbench;
 import org.eclipse.jpt.jpa.ui.internal.platform.InternalJpaPlatformUiManager;
 import org.eclipse.jpt.jpa.ui.internal.plugin.JptJpaUiPlugin;
 import org.eclipse.jpt.jpa.ui.selection.JpaSelectionManager;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IWorkbench;
 
 public class InternalJpaWorkbench
@@ -24,6 +29,7 @@ public class InternalJpaWorkbench
 	// NB: the JPA workbench must be synchronized whenever accessing any of this state
 	private InternalJpaPlatformUiManager jpaPlatformUiManager;
 	private JpaSelectionManager jpaSelectionManager;
+	private ResourceManager resourceManager;
 
 
 	/**
@@ -71,6 +77,52 @@ public class InternalJpaWorkbench
 	}
 
 
+	// ********** resource manager **********
+
+	public ResourceManager buildLocalResourceManager() {
+		ResourceManager rm = this.getResourceManager();
+		return (rm == null) ? null : new LocalResourceManager(rm);
+	}
+
+	/**
+	 * The local resource manager is stored in the
+	 * {@link Control#getData(String) control's "custom properties"}
+	 * and will dispose itself when the control is disposed.
+	 */
+	public synchronized ResourceManager getResourceManager(Control control) {
+		ResourceManager controlRM = (ResourceManager) control.getData(RESOURCE_MANAGER_KEY);
+		if (controlRM == null) {
+			ResourceManager rm = this.getResourceManager();
+			if (rm == null) {
+				return null;
+			}
+			controlRM = new LocalResourceManager(rm, control);
+			control.setData(RESOURCE_MANAGER_KEY, controlRM);
+		}
+		return controlRM;
+	}
+	private static final String RESOURCE_MANAGER_KEY = JptJpaUiPlugin.instance().getPluginID() + ".ResourceManager"; //$NON-NLS-1$
+
+	private synchronized ResourceManager getResourceManager() {
+		if ((this.resourceManager == null) && this.isActive()) {
+			this.resourceManager = this.buildResourceManager();
+		}
+		return this.resourceManager;
+	}
+
+	private ResourceManager buildResourceManager() {
+		return new LocalResourceManager(this.getParentResourceManager());
+	}
+
+	private ResourceManager getParentResourceManager() {
+		return JFaceResources.getResources(this.getDisplay());
+	}
+
+	private Display getDisplay() {
+		return this.workbench.getDisplay();
+	}
+
+
 	// ********** misc **********
 
 	private boolean isActive() {
@@ -82,6 +134,10 @@ public class InternalJpaWorkbench
 	 * {@link JptJpaUiPlugin#stop_() Dali plug-in}.
 	 */
 	public synchronized void stop() {
+		if (this.resourceManager != null) {
+			this.resourceManager.dispose();
+			this.resourceManager = null;
+		}
 		if (this.jpaPlatformUiManager != null) {
 			this.jpaPlatformUiManager = null;
 		}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/JpaStructureNodeAdapterFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/JpaStructureNodeAdapterFactory.java
index cb8092be61..c7e67c726b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/JpaStructureNodeAdapterFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/JpaStructureNodeAdapterFactory.java
@@ -10,6 +10,7 @@
 package org.eclipse.jpt.jpa.ui.internal;
 
 import org.eclipse.core.runtime.IAdapterFactory;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.ObjectTools;
 import org.eclipse.jpt.jpa.core.JpaStructureNode;
@@ -61,13 +62,14 @@ public class JpaStructureNodeAdapterFactory
 		}
 
 		@SuppressWarnings("unchecked")
-		public <T extends JpaStructureNode> JpaDetailsPageManager<T> buildPageManager(Composite parent, WidgetFactory widgetFactory) {
-			return (JpaDetailsPageManager<T>) this.getJpaPlatformUi().buildJpaDetailsPageManager(parent, this.jpaStructureNode, widgetFactory);
+		public <T extends JpaStructureNode> JpaDetailsPageManager<T> buildPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+			return (JpaDetailsPageManager<T>) this.getJpaPlatformUi().buildJpaDetailsPageManager(parent, this.jpaStructureNode, widgetFactory, resourceManager);
 		}
 
 		private JpaPlatformUi getJpaPlatformUi() {
 			return (JpaPlatformUi) this.jpaStructureNode.getJpaPlatform().getAdapter(JpaPlatformUi.class);
 		}
+
 		@Override
 		public String toString() {
 			return ObjectTools.toString(this, this.jpaStructureNode);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/JpaXmlCompletionProposalComputer.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/JpaXmlCompletionProposalComputer.java
index 74dd350521..075b9c5e15 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/JpaXmlCompletionProposalComputer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/JpaXmlCompletionProposalComputer.java
@@ -20,14 +20,22 @@ import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jface.text.contentassist.CompletionProposal;
 import org.eclipse.jface.text.contentassist.ICompletionProposal;
+import org.eclipse.jpt.common.core.internal.utility.PlatformTools;
 import org.eclipse.jpt.common.utility.internal.StringTools;
 import org.eclipse.jpt.common.utility.internal.collection.CollectionTools;
 import org.eclipse.jpt.jpa.core.JpaFile;
 import org.eclipse.jpt.jpa.core.JpaStructureNode;
 import org.eclipse.jpt.jpa.core.context.XmlFile;
+import org.eclipse.jpt.jpa.ui.JpaWorkbench;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 import org.eclipse.jpt.jpa.ui.internal.plugin.JptJpaUiPlugin;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.PlatformUI;
 import org.eclipse.wst.sse.ui.contentassist.CompletionProposalInvocationContext;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
@@ -182,12 +190,12 @@ public class JpaXmlCompletionProposalComputer extends DefaultJpaXmlCompletionPro
 					if (proposedValue.startsWith("\"")) { //$NON-NLS-1$
 						proposal = new CompletionProposal(
 								convertedProposedValue, begin, length, convertedProposedValue.length(), 
-								JptJpaUiPlugin.instance().getImage(JptUiIcons.JPA_CONTENT), proposedValue, null, 
+								this.getImage(context, JptJpaUiImages.JPA_CONTENT), proposedValue, null, 
 								JptUiMessages.JpaXmlCompletionProposalComputer_SpecialNameMsg);
 					} else {
 						proposal = new CompletionProposal(
 								convertedProposedValue, begin, length, convertedProposedValue.length(), 
-								JptJpaUiPlugin.instance().getImage(JptUiIcons.JPA_CONTENT), proposedValue, null, null);
+								this.getImage(context, JptJpaUiImages.JPA_CONTENT), proposedValue, null, null);
 					}
 
 					contentAssistRequest.addProposal(proposal);
@@ -288,4 +296,20 @@ public class JpaXmlCompletionProposalComputer extends DefaultJpaXmlCompletionPro
 	private boolean isCommentNode(IDOMNode node) {
 		return ((node != null) && (node instanceof IDOMElement) && ((IDOMElement) node).isCommentTag());
 	}
+
+	private Image getImage(CompletionProposalInvocationContext context, ImageDescriptor descriptor) {
+		return this.getImage(context.getViewer().getTextWidget(), descriptor);
+	}
+
+	private Image getImage(Control control, ImageDescriptor descriptor) {
+		return this.getResourceManager(control).createImage(descriptor);
+	}
+
+	private ResourceManager getResourceManager(Control control) {
+		return this.getJpaWorkbench().getResourceManager(control);
+	}
+
+	private JpaWorkbench getJpaWorkbench() {
+		return PlatformTools.getAdapter(PlatformUI.getWorkbench(), JpaWorkbench.class);
+	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/JptUiIcons.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/JptUiIcons.java
deleted file mode 100644
index f7b9cf8a20..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/JptUiIcons.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2012 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.ui.internal;
-
-@SuppressWarnings("nls")
-public class JptUiIcons {
-
-	// **************** General JPA icons **************************************
-
-	public static final String JPA_CONTENT = "full/obj16/jpa-content";
-
-	public static final String JPA_FILE = "full/obj16/jpa-file";
-
-	public static final String JAR_FILE = "full/obj16/jpa-jar-file";
-
-	public static final String WARNING = "full/obj16/warning";
-
-
-	// **************** Wizard icons *******************************************
-
-	public static final String JPA_WIZ_BANNER = "full/wizban/new_jpa_prj_wiz";
-
-	public static final String ENTITY_WIZ_BANNER = "full/wizban/new_entity_wizban";
-
-	public static final String JPA_FILE_WIZ_BANNER = "full/wizban/new_jpa_file_wizban";
-
-
-	// **************** Persistence icons **************************************
-
-	public static final String PERSISTENCE = "full/obj16/persistence";
-
-	public static final String PERSISTENCE_UNIT = "full/obj16/persistence-unit";
-
-	public static final String MAPPING_FILE_REF = "full/obj16/jpa-file";
-
-	public static final String CLASS_REF = "full/obj16/null-type-mapping";
-
-	public static final String JAR_FILE_REF = "full/obj16/jpa-jar-file";
-
-
-	// **************** Orm icons **********************************************
-
-	public static final String ENTITY_MAPPINGS = "full/obj16/entity-mappings";
-
-
-	// **************** Orm/Java common icons **********************************
-
-	public static final String ENTITY = "full/obj16/entity";
-
-	public static final String EMBEDDABLE = "full/obj16/embeddable";
-
-	public static final String MAPPED_SUPERCLASS = "full/obj16/mapped-superclass";
-
-	public static final String NULL_TYPE_MAPPING = "full/obj16/null-type-mapping";
-
-	public static final String ID = "full/obj16/id";
-
-	public static final String EMBEDDED_ID = "full/obj16/embedded-id";
-
-	public static final String BASIC = "full/obj16/basic";
-
-	public static final String VERSION = "full/obj16/version";
-
-	public static final String MANY_TO_ONE = "full/obj16/many-to-one";
-
-	public static final String ONE_TO_MANY = "full/obj16/one-to-many";
-
-	public static final String ONE_TO_ONE = "full/obj16/one-to-one";
-
-	public static final String MANY_TO_MANY = "full/obj16/many-to-many";
-
-	public static final String ELEMENT_COLLECTION = "full/obj16/element-collection";
-
-	public static final String EMBEDDED = "full/obj16/embedded";
-
-	public static final String TRANSIENT = "full/obj16/transient";
-
-	public static final String NULL_ATTRIBUTE_MAPPING = "full/obj16/null-attribute-mapping";
-
-
-	// **************** Class metadata icons **********************************
-
-	public static final String ENUM_REF = "full/obj16/enum_obj";
-
-
-	// **************** Database icons **********************************
-
-	public static final String COLUMN = "full/obj16/column";
-
-	public static final String TABLE = "full/obj16/table";
-
-
-	// **************** Content Assist icons **********************************
-
-	public static final String JPQL_FUNCTION = "full/obj16/jpql.function";
-
-	public static final String JPQL_IDENTIFIER = "full/obj16/jpql.identifier";
-
-	public static final String JPQL_VARIABLE = "full/obj16/jpql.variable";
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/actions/MakePersistentAction.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/actions/MakePersistentAction.java
index bde2b1db68..9a9a08b119 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/actions/MakePersistentAction.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/actions/MakePersistentAction.java
@@ -3,16 +3,17 @@
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
+*
 * Contributors:
 *     Oracle - initial API and implementation
 *******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.actions;
 
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.core.IJavaElement;
@@ -32,118 +33,123 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IObjectActionDelegate;
 import org.eclipse.ui.IWorkbenchPart;
 
-
-public class MakePersistentAction implements IObjectActionDelegate {
-
+public class MakePersistentAction
+	implements IObjectActionDelegate
+{
 	private ISelection selection;
-	
+
 	public MakePersistentAction() {
 		super();
 	}
 
 	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-		// do nothing		
+		// do nothing
 	}
-	
-	public void selectionChanged(IAction action, ISelection selection) {
-		this.selection = selection;
+
+	public void selectionChanged(IAction action, ISelection sel) {
+		this.selection = sel;
 	}
 
-	// Action is contributed for IType, ICompilationUnit, IPackageFragment, and IPackageFragmentRoot that is a source folder
-	protected Map<IProject, List<IType>> buildSelectedTypes() {
-		Map<IProject, List<IType>> types = new HashMap<IProject, List<IType>>();
-		if (this.selection instanceof StructuredSelection) {			
-			for (Object selection : ((StructuredSelection) this.selection).toList()) {
-				switch (((IJavaElement) selection).getElementType()) {
-					case IJavaElement.TYPE :
-						addSelectedType((IType) selection, types);
-						break;
-					case IJavaElement.COMPILATION_UNIT :
-						addSelectedType((ICompilationUnit) selection, types);
-						break;
-					case IJavaElement.PACKAGE_FRAGMENT :
-						addSelectedType((IPackageFragment) selection, types);
-						break;
-					case IJavaElement.PACKAGE_FRAGMENT_ROOT :
-						addSelectedType((IPackageFragmentRoot) selection, types);
-						break;
-					default :
-						break;
-				}
+	public void run(IAction action) {
+		for (Map.Entry<IProject, Set<IType>> entry : this.buildSelectedTypes().entrySet()) {
+			IProject project = entry.getKey();
+			Set<IType> types = entry.getValue();
+			JpaProject jpaProject = (JpaProject) project.getAdapter(JpaProject.class);
+			if (jpaProject != null) {
+				// open the wizard once for each selected project
+				JpaMakePersistentWizard wizard = new JpaMakePersistentWizard(jpaProject, types);
+				WizardDialog dialog = new WizardDialog(this.getCurrentShell(), wizard);
+				dialog.create();
+				dialog.open();
 			}
 		}
-		return types;
 	}
 
-	private void addSelectedType(IPackageFragmentRoot packageFragmentRoot, Map<IProject, List<IType>> types) {
-		for (IJavaElement pkgFragment : getPackageFragments(packageFragmentRoot)) {
-			addSelectedType((IPackageFragment) pkgFragment, types);
+	/**
+	 * Return a map containing lists of types, keyed by project.
+	 * <p>
+	 * The action is contributed for:<ul>
+	 * <li>{@link IType}
+	 * <li>{@link ICompilationUnit}
+	 * <li>{@link IPackageFragment}
+	 * <li>{@link IPackageFragmentRoot} that is a source folder
+	 * </ul>
+	 */
+	private Map<IProject, Set<IType>> buildSelectedTypes() {
+		if ( ! (this.selection instanceof StructuredSelection)) {
+			return Collections.emptyMap();
 		}
+		HashMap<IProject, Set<IType>> types = new HashMap<IProject, Set<IType>>();
+		for (Object sel : ((StructuredSelection) this.selection).toList()) {
+			switch (((IJavaElement) sel).getElementType()) {
+				case IJavaElement.PACKAGE_FRAGMENT_ROOT :
+					this.addSelectedTypes((IPackageFragmentRoot) sel, types);
+					break;
+				case IJavaElement.PACKAGE_FRAGMENT :
+					this.addSelectedTypes((IPackageFragment) sel, types);
+					break;
+				case IJavaElement.COMPILATION_UNIT :
+					this.addSelectedTypes((ICompilationUnit) sel, types);
+					break;
+				case IJavaElement.TYPE :
+					this.addSelectedType((IType) sel, types);
+					break;
+				default :
+					break;
+			}
+		}
+		return types;
 	}
 
-	private void addSelectedType(IPackageFragment packageFragment, Map<IProject, List<IType>> types) {
-		for (ICompilationUnit compUnit : getCompilationUnits(packageFragment)) {
-			addSelectedType(compUnit, types);
+	private void addSelectedTypes(IPackageFragmentRoot packageFragmentRoot, Map<IProject, Set<IType>> types) {
+		for (IJavaElement pkgFragment : this.getPackageFragments(packageFragmentRoot)) {
+			this.addSelectedTypes((IPackageFragment) pkgFragment, types);
 		}
 	}
-	
-	private void addSelectedType(ICompilationUnit compilationUnit, Map<IProject, List<IType>> types) {
-		IType primaryType = this.getPrimaryType(compilationUnit);
-		if (primaryType != null) {
-			this.addSelectedType(primaryType, types);
+
+	private IJavaElement[] getPackageFragments(IPackageFragmentRoot packageFragmentRoot) {
+		try {
+			return packageFragmentRoot.getChildren();
+		} catch (JavaModelException ex) {
+			JptJpaUiPlugin.instance().logError(ex);
+			return EMPTY_JAVA_ELEMENT_ARRAY;
 		}
 	}
-	
-	private void addSelectedType(IType primaryType, Map<IProject, List<IType>> typesMap) {
-		IProject project = primaryType.getJavaProject().getProject();
-		List<IType> types = typesMap.get(project);
-		if (types == null) {
-			types = new ArrayList<IType>();
-			typesMap.put(project, types);
-		}
-		if (!types.contains(primaryType)) {
-			types.add(primaryType);
+	private static final IJavaElement[] EMPTY_JAVA_ELEMENT_ARRAY = new IJavaElement[0];
+
+	private void addSelectedTypes(IPackageFragment packageFragment, Map<IProject, Set<IType>> types) {
+		for (ICompilationUnit compUnit : this.getCompilationUnits(packageFragment)) {
+			this.addSelectedTypes(compUnit, types);
 		}
 	}
 
 	private ICompilationUnit[] getCompilationUnits(IPackageFragment packageFragment) {
 		try {
 			return packageFragment.getCompilationUnits();
+		} catch (JavaModelException ex) {
+			JptJpaUiPlugin.instance().logError(ex);
+			return EMPTY_COMPILATION_UNIT_ARRAY;
 		}
-		catch (JavaModelException e) {
-			JptJpaUiPlugin.instance().logError(e);
-		}
-		return new ICompilationUnit[0];
-	}
-	
-	private IJavaElement[] getPackageFragments(IPackageFragmentRoot packageFragmentRoot) {
-		try {
-			return packageFragmentRoot.getChildren();
-		}
-		catch (JavaModelException e) {
-			JptJpaUiPlugin.instance().logError(e);
-		}
-		return new IJavaElement[0];
 	}
+	private static final ICompilationUnit[] EMPTY_COMPILATION_UNIT_ARRAY = new ICompilationUnit[0];
 
-	private IType getPrimaryType(ICompilationUnit compilationUnit) {
-		return compilationUnit.findPrimaryType();
+	private void addSelectedTypes(ICompilationUnit compilationUnit, Map<IProject, Set<IType>> types) {
+		IType primaryType = compilationUnit.findPrimaryType();
+		if (primaryType != null) {
+			this.addSelectedType(primaryType, types);
+		}
 	}
 
-	public void run(IAction action) {
-		for (List<IType> types : this.buildSelectedTypes().values()) {
-			IProject project = types.get(0).getResource().getProject();
-			JpaProject jpaProject = (JpaProject) project.getAdapter(JpaProject.class);
-			if (jpaProject != null) {
-				//open the wizard once for each selected project
-				JpaMakePersistentWizard wizard = new JpaMakePersistentWizard(jpaProject, types);
-				WizardDialog dialog = new WizardDialog(this.getCurrentShell(), wizard);
-				dialog.create();
-				dialog.open();
-			}
+	private void addSelectedType(IType primaryType, Map<IProject, Set<IType>> typesMap) {
+		IProject project = primaryType.getJavaProject().getProject();
+		Set<IType> types = typesMap.get(project);
+		if (types == null) {
+			types = new HashSet<IType>();
+			typesMap.put(project, types);
 		}
+		types.add(primaryType);
 	}
-	
+
 	private Shell getCurrentShell() {
 	    return Display.getCurrent().getActiveShell();
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractBasicMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractBasicMappingComposite.java
index 32a8aeb6be..24d817e71c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractBasicMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractBasicMappingComposite.java
@@ -9,19 +9,20 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
-import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
+import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
+import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter;
+import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
 import org.eclipse.jpt.jpa.core.context.BasicMapping;
 import org.eclipse.jpt.jpa.core.context.Column;
 import org.eclipse.jpt.jpa.core.context.Converter;
 import org.eclipse.jpt.jpa.core.context.ConvertibleMapping;
-import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter;
 import org.eclipse.jpt.jpa.core.context.LobConverter;
-import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
 import org.eclipse.jpt.jpa.ui.details.JpaComposite;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Button;
@@ -67,35 +68,18 @@ import org.eclipse.ui.forms.widgets.Section;
  * | |                                                                       | |
  * | ------------------------------------------------------------------------- |
  * -----------------------------------------------------------------------------</pre>
- *
- * @see BasicMapping
- * @see ColumnComposite
- * @see EnumTypeComboViewer
- * @see FetchTypeComboViewer
- * @see LobComposite
- * @see OptionalTriStateCheckBox
- * @see TemporalTypeCombo
- *
- * @version 2.3
- * @since 1.0
  */
 public abstract class AbstractBasicMappingComposite<T extends BasicMapping> 
 	extends Pane<T>
 	implements JpaComposite
 {
-	/**
-	 * Creates a new <code>BasicMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>IBasicMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	protected AbstractBasicMappingComposite(PropertyValueModel<? extends T> subjectHolder,
-		 						 PropertyValueModel<Boolean> enabledModel,
-	                             Composite parent,
-	                             WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	protected AbstractBasicMappingComposite(
+			PropertyValueModel<? extends T> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
@@ -173,7 +157,7 @@ public abstract class AbstractBasicMappingComposite<T extends BasicMapping>
 			JptUiDetailsMessages.TypeSection_temporal, 
 			buildConverterBooleanHolder(BaseTemporalConverter.class), 
 			null);
-		registerSubPane(new TemporalTypeCombo(buildTemporalConverterHolder(converterHolder), getEnabledModel(), container, getWidgetFactory()));
+		new TemporalTypeCombo(this, this.buildTemporalConverterHolder(converterHolder), container);
 		
 		
 		// Enumerated
@@ -182,15 +166,15 @@ public abstract class AbstractBasicMappingComposite<T extends BasicMapping>
 			JptUiDetailsMessages.TypeSection_enumerated, 
 			buildConverterBooleanHolder(BaseEnumeratedConverter.class), 
 			null);
-		registerSubPane(new EnumTypeComboViewer(buildEnumeratedConverterHolder(converterHolder), getEnabledModel(), container, getWidgetFactory()));
+		new EnumTypeComboViewer(this, this.buildEnumeratedConverterHolder(converterHolder), container);
 		return container;
 	}
 
 	protected PropertyValueModel<Column> buildColumnHolder() {
 		return new TransformationPropertyValueModel<T, Column>(getSubjectHolder()) {
 			@Override
-			protected Column transform_(T value) {
-				return value.getColumn();
+			protected Column transform_(T mapping) {
+				return mapping.getColumn();
 			}
 		};
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractBasicMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractBasicMappingUiDefinition.java
index 7e40001689..f8bd417556 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractBasicMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractBasicMappingUiDefinition.java
@@ -9,9 +9,10 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.BasicMapping;
-import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 
 public abstract class AbstractBasicMappingUiDefinition<M, T extends BasicMapping>
 	extends AbstractMappingUiDefinition<M, T>
@@ -33,7 +34,7 @@ public abstract class AbstractBasicMappingUiDefinition<M, T extends BasicMapping
 	}
 
 	@Override
-	protected String getImageKey() {
-		return JptUiIcons.BASIC;
+	public ImageDescriptor getImageDescriptor() {
+		return JptJpaUiImages.BASIC;
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddableComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddableComposite.java
index 71a7a3b8da..82f4149e85 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddableComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddableComposite.java
@@ -9,46 +9,37 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
+import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
+import org.eclipse.jpt.jpa.core.context.AccessHolder;
 import org.eclipse.jpt.jpa.core.context.Embeddable;
 import org.eclipse.jpt.jpa.ui.details.JpaComposite;
-import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.forms.widgets.ExpandableComposite;
 import org.eclipse.ui.forms.widgets.Section;
 
-/**
- * This pane does not have any widgets.
- *
- * @see Embeddable
- * @see JavaUiFactory - The factory creating this pane
- * @see EmbeddableUiProvider
- *
- * @version 2.3
- * @since 2.1
- */
-public abstract class AbstractEmbeddableComposite<T extends Embeddable> 
-	extends Pane<T>
+public abstract class AbstractEmbeddableComposite<E extends Embeddable> 
+	extends Pane<E>
 	implements JpaComposite
 {
-	/**
-	 * Creates a new <code>EmbeddableComposite</code>.
-	 *
-	 * @param subjectHolder The holder of this pane's subject
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	protected AbstractEmbeddableComposite(PropertyValueModel<? extends T> subjectHolder,
-	                           Composite parent,
-	                           WidgetFactory widgetFactory) {
-
-		super(subjectHolder, parent, widgetFactory);
+	protected AbstractEmbeddableComposite(
+			PropertyValueModel<? extends E> embeddableModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(embeddableModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
+	@Override
+	protected void initializeLayout(Composite container) {
+		this.initializeEmbeddableCollapsibleSection(container);
+	}
+
 	protected void initializeEmbeddableCollapsibleSection(Composite container) {
 		final Section section = this.getWidgetFactory().createSection(container,
 				ExpandableComposite.TITLE_BAR |
@@ -56,10 +47,17 @@ public abstract class AbstractEmbeddableComposite<T extends Embeddable>
 				ExpandableComposite.EXPANDED);
 		section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		section.setText(JptUiDetailsMessages.EmbeddableSection_title);
-		section.setClient(this.initializeEmbeddableSection(section));
+		section.setClient(this.buildEmbeddableSectionClient(section));
 	}
 	
-	protected Control initializeEmbeddableSection(Composite container) {
-		throw new UnsupportedOperationException();
+	protected abstract Control buildEmbeddableSectionClient(Section embeddableSection);
+
+	protected PropertyValueModel<AccessHolder> buildAccessReferenceModel() {
+		return new PropertyAspectAdapter<E, AccessHolder>(this.getSubjectHolder()) {
+			@Override
+			protected AccessHolder buildValue_() {
+				return this.subject.getPersistentType();
+			}
+		};
 	}
-}
-\ No newline at end of file
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddableUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddableUiDefinition.java
index c67d551a1a..ba333ea92c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddableUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddableUiDefinition.java
@@ -9,9 +9,10 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.Embeddable;
-import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 
 public abstract class AbstractEmbeddableUiDefinition<M, T extends Embeddable> 
 	extends AbstractMappingUiDefinition<M, T>
@@ -33,7 +34,7 @@ public abstract class AbstractEmbeddableUiDefinition<M, T extends Embeddable>
 	}
 
 	@Override
-	protected String getImageKey() {
-		return JptUiIcons.EMBEDDABLE;
+	public ImageDescriptor getImageDescriptor() {
+		return JptJpaUiImages.EMBEDDABLE;
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedIdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedIdMappingComposite.java
index ec4956f2e7..31fe6cf97c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedIdMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedIdMappingComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -25,12 +26,12 @@ public abstract class AbstractEmbeddedIdMappingComposite<T extends EmbeddedIdMap
 	implements JpaComposite
 {
 	protected AbstractEmbeddedIdMappingComposite(
-			PropertyValueModel<? extends T> subjectHolder,
+			PropertyValueModel<? extends T> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedIdMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedIdMappingUiDefinition.java
index 2906100949..082fa02a8f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedIdMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedIdMappingUiDefinition.java
@@ -9,9 +9,10 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping;
-import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 
 public abstract class AbstractEmbeddedIdMappingUiDefinition<M, T extends EmbeddedIdMapping>
 	extends AbstractMappingUiDefinition<M, T>
@@ -33,7 +34,7 @@ public abstract class AbstractEmbeddedIdMappingUiDefinition<M, T extends Embedde
 	}
 
 	@Override
-	protected String getImageKey() {
-		return JptUiIcons.EMBEDDED_ID;
+	public ImageDescriptor getImageDescriptor() {
+		return JptJpaUiImages.EMBEDDED_ID;
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedMappingComposite.java
index d26194a9e1..6a88b66ebd 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedMappingComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -20,39 +21,17 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.forms.widgets.ExpandableComposite;
 import org.eclipse.ui.forms.widgets.Section;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | EmbeddedAttributeOverridesComposite                                   | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see EmbeddedMapping
- *
- * @version 2.3
- * @since 1.0
- */
 public abstract class AbstractEmbeddedMappingComposite<T extends EmbeddedMapping> 
 	extends Pane<T>
 	implements JpaComposite
 {
-	/**
-	 * Creates a new <code>EmbeddedMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>EmbeddedMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	protected AbstractEmbeddedMappingComposite(PropertyValueModel<? extends T> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-	                                WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	protected AbstractEmbeddedMappingComposite(
+			PropertyValueModel<? extends T> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedMappingUiDefinition.java
index 750ec03cae..b100eb278a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedMappingUiDefinition.java
@@ -9,9 +9,10 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.EmbeddedMapping;
-import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 
 public abstract class AbstractEmbeddedMappingUiDefinition<M, T extends EmbeddedMapping>
 	extends AbstractMappingUiDefinition<M, T>
@@ -33,7 +34,7 @@ public abstract class AbstractEmbeddedMappingUiDefinition<M, T extends EmbeddedM
 	}
 
 	@Override
-	protected String getImageKey() {
-		return JptUiIcons.EMBEDDED;
+	public ImageDescriptor getImageDescriptor() {
+		return JptJpaUiImages.EMBEDDED;
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEntityComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEntityComposite.java
index c51e283f02..028643ddd4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEntityComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEntityComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
@@ -82,36 +83,17 @@ import org.eclipse.ui.forms.widgets.Section;
  * | |                                                                       | |
  * | ------------------------------------------------------------------------- |
  * -----------------------------------------------------------------------------</pre>
- *
- * @see Entity
- * @see InheritanceComposite
- * @see IdClassComposite
- * @see EntityOverridesComposite
- * @see TableComposite
- * @see GenerationComposite
- *
- * TODO talk to JavaEditor people about what we can do to hook in TabbedProperties for the JavaEditor
- *
- * @version 2.3
- * @since 1.0
  */
 public abstract class AbstractEntityComposite<T extends Entity>
 	extends Pane<T>
     implements JpaComposite
 {
-	/**
-	 * Creates a new <code>AbstractEntityComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>IEntity</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
 	protected AbstractEntityComposite(
-			PropertyValueModel<? extends T> subjectHolder,
-	        Composite parent,
-	        WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<? extends T> entityModel,
+			Composite parentComposite,
+	        WidgetFactory widgetFactory,
+	        ResourceManager resourceManager) {
+		super(entityModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEntityUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEntityUiDefinition.java
index 9b07875dcd..e4c5e49d70 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEntityUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEntityUiDefinition.java
@@ -9,9 +9,10 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.Entity;
-import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 
 public abstract class AbstractEntityUiDefinition<M, T extends Entity> 
 	extends AbstractMappingUiDefinition<M, T>
@@ -33,7 +34,7 @@ public abstract class AbstractEntityUiDefinition<M, T extends Entity>
 	}
 
 	@Override
-	protected String getImageKey() {
-		return JptUiIcons.ENTITY;
+	public ImageDescriptor getImageDescriptor() {
+		return JptJpaUiImages.ENTITY;
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractIdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractIdMappingComposite.java
index 240993e649..31828d9fd7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractIdMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractIdMappingComposite.java
@@ -9,17 +9,18 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
-import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
+import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
+import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
 import org.eclipse.jpt.jpa.core.context.Column;
 import org.eclipse.jpt.jpa.core.context.Converter;
 import org.eclipse.jpt.jpa.core.context.ConvertibleMapping;
 import org.eclipse.jpt.jpa.core.context.IdMapping;
-import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
 import org.eclipse.jpt.jpa.ui.details.JpaComposite;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Button;
@@ -35,12 +36,12 @@ public abstract class AbstractIdMappingComposite<T extends IdMapping>
     implements JpaComposite
 {
 	public AbstractIdMappingComposite(
-			PropertyValueModel<? extends T> subjectHolder,
+			PropertyValueModel<? extends T> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-	        WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	
@@ -95,7 +96,7 @@ public abstract class AbstractIdMappingComposite<T extends IdMapping>
 				JptUiDetailsMessages.TypeSection_temporal, 
 				buildConverterBooleanHolder(BaseTemporalConverter.class), 
 				null);
-		registerSubPane(new TemporalTypeCombo(buildTemporalConverterHolder(converterHolder), getEnabledModel(), container, getWidgetFactory()));
+		new TemporalTypeCombo(this, this.buildTemporalConverterHolder(converterHolder), container);
 
 		return container;
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractIdMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractIdMappingUiDefinition.java
index a8ea915004..49a54485a0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractIdMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractIdMappingUiDefinition.java
@@ -9,9 +9,10 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.IdMapping;
-import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 
 
 public abstract class AbstractIdMappingUiDefinition<M, T extends IdMapping>
@@ -34,7 +35,7 @@ public abstract class AbstractIdMappingUiDefinition<M, T extends IdMapping>
 	}
 	
 	@Override
-	protected String getImageKey() {
-		return JptUiIcons.ID;
+	public ImageDescriptor getImageDescriptor() {
+		return JptJpaUiImages.ID;
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractJavaMappedSuperclassComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractJavaMappedSuperclassComposite.java
index 0913d4b096..e96be310b9 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractJavaMappedSuperclassComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractJavaMappedSuperclassComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -39,30 +40,16 @@ import org.eclipse.ui.forms.widgets.Section;
  * | |                                                                       | |
  * | ------------------------------------------------------------------------- |
  * -----------------------------------------------------------------------------</pre>
- *
- * @see MappedSuperclass
- * @see IdClassComposite
- * @see QueriesComposite
- *
- * @version 2.3
- * @since 2.3
  */
-
-public abstract class AbstractJavaMappedSuperclassComposite extends
-		AbstractMappedSuperclassComposite<JavaMappedSuperclass> {
-	/**
-	 * Creates a new <code>MappedSuperclassComposite</code>.
-	 *
-	 * @param subjectHolder The holder of this pane's subject
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
+public abstract class AbstractJavaMappedSuperclassComposite
+	extends AbstractMappedSuperclassComposite<JavaMappedSuperclass>
+{
 	public AbstractJavaMappedSuperclassComposite(
-			PropertyValueModel<? extends JavaMappedSuperclass> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<? extends JavaMappedSuperclass> mappedSuperclassModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractJpaDetailsPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractJpaDetailsPageManager.java
index 6fce4d1e85..ddb1e502a4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractJpaDetailsPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractJpaDetailsPageManager.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
@@ -20,20 +21,16 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 
 /**
- * The base class for the details view.
+ * The base class for the JPA details view page manager.
  *
  * @see JpaStructureNode
- *
- * @version 3.0
- * @since 1.0
  */
-public abstract class AbstractJpaDetailsPage<T extends JpaStructureNode>
+public abstract class AbstractJpaDetailsPageManager<T extends JpaStructureNode>
 	extends Pane<T>
 	implements JpaDetailsPageManager<T>
 {
-
-	protected AbstractJpaDetailsPage(Composite parent, WidgetFactory widgetFactory) {
-		super(new SimplePropertyValueModel<T>(), parent, widgetFactory);
+	protected AbstractJpaDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		super(new SimplePropertyValueModel<T>(), parent, widgetFactory, resourceManager);
 	}
 
 	public Control getPage() {
@@ -49,4 +46,9 @@ public abstract class AbstractJpaDetailsPage<T extends JpaStructureNode>
 		ModifiablePropertyValueModel<T> subjectHolder = (ModifiablePropertyValueModel<T>) getSubjectHolder();
 		subjectHolder.setValue((T) subject);
 	}
+
+	@Override
+	protected void controlDisposed() {
+		super.controlDisposed();
+	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractManyToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractManyToManyMappingComposite.java
index d4cf89ccdb..2fdb13fc89 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractManyToManyMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractManyToManyMappingComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
@@ -27,64 +28,17 @@ import org.eclipse.ui.forms.events.ExpansionEvent;
 import org.eclipse.ui.forms.widgets.ExpandableComposite;
 import org.eclipse.ui.forms.widgets.Section;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | TargetEntityComposite                                                 | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | JoiningStrategyComposite                                              | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | FetchTypeComposite                                                    | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | CascadeComposite                                                      | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | OrderingComposite                                                     | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see {@link ManyToManyMapping}
- * @see {@link TargetEntityClassChooser}
- * @see {@link ManyToManyJoiningStrategyPane}
- * @see {@link FetchTypeComboViewer}
- * @see {@link CascadeComposite}
- * @see {@link OrderingComposite}
- *
- * @version 2.3
- * @since 1.0
- */
 public abstract class AbstractManyToManyMappingComposite<T extends ManyToManyMapping, R extends ManyToManyRelationship> 
 	extends Pane<T>
     implements JpaComposite
 {
-	/**
-	 * Creates a new <code>ManyToManyMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>IManyToManyMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	protected AbstractManyToManyMappingComposite(PropertyValueModel<? extends T> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-	                                WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	protected AbstractManyToManyMappingComposite(
+			PropertyValueModel<? extends T> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractManyToManyMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractManyToManyMappingUiDefinition.java
index 5aa06d1f2d..d5f9270d4b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractManyToManyMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractManyToManyMappingUiDefinition.java
@@ -9,9 +9,10 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.ManyToManyMapping;
-import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 
 public abstract class AbstractManyToManyMappingUiDefinition<M, T extends ManyToManyMapping>
 	extends AbstractMappingUiDefinition<M, T>
@@ -32,7 +33,7 @@ public abstract class AbstractManyToManyMappingUiDefinition<M, T extends ManyToM
 		return JptUiDetailsMessages.ManyToManyMappingUiProvider_linkLabel;
 	}
 	@Override
-	protected String getImageKey() {
-		return JptUiIcons.MANY_TO_MANY;
+	public ImageDescriptor getImageDescriptor() {
+		return JptJpaUiImages.MANY_TO_MANY;
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractManyToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractManyToOneMappingComposite.java
index c690711618..461ced94e6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractManyToOneMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractManyToOneMappingComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
@@ -28,12 +29,12 @@ public abstract class AbstractManyToOneMappingComposite<T extends ManyToOneMappi
 	implements JpaComposite
 {
 	protected AbstractManyToOneMappingComposite(
-			PropertyValueModel<? extends T> subjectHolder,
+			PropertyValueModel<? extends T> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-	        WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+	        WidgetFactory widgetFactory,
+	        ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractManyToOneMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractManyToOneMappingUiDefinition.java
index efb22f8acd..8414ba18d9 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractManyToOneMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractManyToOneMappingUiDefinition.java
@@ -9,9 +9,10 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.ManyToOneMapping;
-import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 
 public abstract class AbstractManyToOneMappingUiDefinition<M, T extends ManyToOneMapping>
 	extends AbstractMappingUiDefinition<M, T>
@@ -33,7 +34,7 @@ public abstract class AbstractManyToOneMappingUiDefinition<M, T extends ManyToOn
 	}
 
 	@Override
-	protected String getImageKey() {
-		return JptUiIcons.MANY_TO_ONE;
+	public ImageDescriptor getImageDescriptor() {
+		return JptJpaUiImages.MANY_TO_ONE;
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractMappedSuperclassComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractMappedSuperclassComposite.java
index 5a19369bfd..5a826376a7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractMappedSuperclassComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractMappedSuperclassComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
@@ -23,17 +24,16 @@ import org.eclipse.ui.forms.widgets.ExpandableComposite;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 import org.eclipse.ui.forms.widgets.Section;
 
-
 public abstract class AbstractMappedSuperclassComposite<T extends MappedSuperclass>
 	extends Pane<T>
     implements JpaComposite
 {
 	protected AbstractMappedSuperclassComposite(
-			PropertyValueModel<? extends T> subjectHolder,
-	        Composite parent,
-	        WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<? extends T> mappedSuperclassModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractMappedSuperclassUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractMappedSuperclassUiDefinition.java
index 2ca163770b..9130279b0b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractMappedSuperclassUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractMappedSuperclassUiDefinition.java
@@ -9,9 +9,10 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.MappedSuperclass;
-import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 
 public abstract class AbstractMappedSuperclassUiDefinition<M, T extends MappedSuperclass>
 	extends AbstractMappingUiDefinition<M, T>
@@ -33,7 +34,7 @@ public abstract class AbstractMappedSuperclassUiDefinition<M, T extends MappedSu
 	}
 
 	@Override
-	protected String getImageKey() {
-		return JptUiIcons.MAPPED_SUPERCLASS;
+	public ImageDescriptor getImageDescriptor() {
+		return JptJpaUiImages.MAPPED_SUPERCLASS;
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractMappingUiDefinition.java
index 565eba2b75..60dcae7472 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractMappingUiDefinition.java
@@ -9,11 +9,9 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
-import org.eclipse.jpt.common.ui.internal.JptUIPlugin;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition;
-import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
-import org.eclipse.jpt.jpa.ui.internal.plugin.JptJpaUiPlugin;
-import org.eclipse.swt.graphics.Image;
 
 public abstract class AbstractMappingUiDefinition<M, T>
 	implements MappingUiDefinition<M, T>
@@ -22,38 +20,8 @@ public abstract class AbstractMappingUiDefinition<M, T>
 		super();
 	}
 
-	/**
-	 * Subclasses can use the Dali-provided icons by overriding the method
-	 * {@link #getImageKey()} to return a key to one of the icons in the
-	 * <code>org.eclipse.jpt.jpa.ui/icons</code> folder.
-	 * @see JptUIPlugin#getImage(String)
-	 */
-	public final Image getImage() {
-		return JptJpaUiPlugin.instance().getImage(this.getImageKey());
-	}
-
-	/**
-	 * Subclasses can use the Dali-provided icons by overriding the method
-	 * {@link #getImageKey()} to return a key to one of the icons in the
-	 * <code>org.eclipse.jpt.jpa.ui/icons</code> folder.
-	 * @see JptUIPlugin#getGhostImage(String)
-	 */
-	public Image getGhostImage() {
-		return JptJpaUiPlugin.instance().getGhostImage(this.getImageKey());
-	}
-
-	/**
-	 * Return the image key for a Dali-supplied icon; i.e. an icon in the
-	 * <code>org.eclipse.jpt.jpa.ui/icons</code> folder.
-	 * Override {@link #getImage()} and {@link #getGhostImage()} to use
-	 * non-Dali-supplied icons.
-	 * <p>
-	 * By default return the key for the generic JPA content image.
-	 * 
-	 * @see JptUIPlugin#getImage(String)
-	 */
-	protected String getImageKey() {
-		return JptUiIcons.JPA_CONTENT;
+	public ImageDescriptor getImageDescriptor() {
+		return JptJpaUiImages.JPA_CONTENT;
 	}
 
 	public boolean isEnabledFor(M mappableObject) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToManyMappingComposite.java
index e2a8b778cc..42728d20f0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToManyMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToManyMappingComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
@@ -25,64 +26,17 @@ import org.eclipse.ui.forms.events.ExpansionEvent;
 import org.eclipse.ui.forms.widgets.ExpandableComposite;
 import org.eclipse.ui.forms.widgets.Section;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | TargetEntityComposite                                                 | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | JoiningStrategyComposite                                              | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | FetchTypeComposite                                                    | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | CascadeComposite                                                      | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | OrderingComposite                                                     | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see OneToManyMapping
- * @see CascadeComposite
- * @see FetchTypeComboViewer
- * @see JoinTableComposite
- * @see OrderingComposite
- * @see TargetEntityClassChooser
- *
- * @version 2.3
- * @since 1.0
- */
 public abstract class AbstractOneToManyMappingComposite<T extends OneToManyMapping, R extends OneToManyRelationship> 
 	extends Pane<T>
 	implements JpaComposite
 {
-	/**
-	 * Creates a new <code>OneToManyMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>IOneToManyMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	protected AbstractOneToManyMappingComposite(PropertyValueModel<? extends T> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-	                                WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	protected AbstractOneToManyMappingComposite(
+			PropertyValueModel<? extends T> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
@@ -131,8 +85,8 @@ public abstract class AbstractOneToManyMappingComposite<T extends OneToManyMappi
 		return new TransformationPropertyValueModel<T, R>(getSubjectHolder()) {
 			@SuppressWarnings("unchecked")
 			@Override
-			protected R transform_(T value) {
-				return (R) value.getRelationship();
+			protected R transform_(T mapping) {
+				return (R) mapping.getRelationship();
 			}
 		};
 	}	
@@ -140,9 +94,9 @@ public abstract class AbstractOneToManyMappingComposite<T extends OneToManyMappi
 	protected PropertyValueModel<Cascade> buildCascadeHolder() {
 		return new TransformationPropertyValueModel<T, Cascade>(getSubjectHolder()) {
 			@Override
-			protected Cascade transform_(T value) {
-				return value.getCascade();
+			protected Cascade transform_(T mapping) {
+				return mapping.getCascade();
 			}
 		};
 	}
-}
-\ No newline at end of file
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToManyMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToManyMappingUiDefinition.java
index 21c3054c57..b83f1c29ff 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToManyMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToManyMappingUiDefinition.java
@@ -9,9 +9,10 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.OneToManyMapping;
-import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 
 public abstract class AbstractOneToManyMappingUiDefinition<M, T extends OneToManyMapping>
 	extends AbstractMappingUiDefinition<M, T>
@@ -33,7 +34,7 @@ public abstract class AbstractOneToManyMappingUiDefinition<M, T extends OneToMan
 	}
 
 	@Override
-	protected String getImageKey() {
-		return JptUiIcons.ONE_TO_MANY;
+	public ImageDescriptor getImageDescriptor() {
+		return JptJpaUiImages.ONE_TO_MANY;
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToOneMappingComposite.java
index f1b41c66a4..2b436993b9 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToOneMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToOneMappingComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
@@ -28,12 +29,12 @@ public abstract class AbstractOneToOneMappingComposite<T extends OneToOneMapping
 	implements JpaComposite
 {
 	protected AbstractOneToOneMappingComposite(
-			PropertyValueModel<? extends T> subjectHolder,
+			PropertyValueModel<? extends T> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-	        WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+	        WidgetFactory widgetFactory,
+	        ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToOneMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToOneMappingUiDefinition.java
index 88c6584814..9b2ac9e558 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToOneMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToOneMappingUiDefinition.java
@@ -9,9 +9,10 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.OneToOneMapping;
-import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 
 public abstract class AbstractOneToOneMappingUiDefinition<M, T extends OneToOneMapping>
 	extends AbstractMappingUiDefinition<M, T>
@@ -33,7 +34,7 @@ public abstract class AbstractOneToOneMappingUiDefinition<M, T extends OneToOneM
 	}
 	
 	@Override
-	protected String getImageKey() {
-		return JptUiIcons.ONE_TO_ONE;
+	public ImageDescriptor getImageDescriptor() {
+		return JptJpaUiImages.ONE_TO_ONE;
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOrderingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOrderingComposite.java
index d64db156bc..2e56aa175c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOrderingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOrderingComposite.java
@@ -9,11 +9,10 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
-import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
-import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
+import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.CollectionMapping;
 import org.eclipse.jpt.jpa.core.context.Orderable;
 import org.eclipse.swt.widgets.Composite;
@@ -36,41 +35,16 @@ import org.eclipse.swt.widgets.Composite;
  * -----------------------------------------------------------------------------</pre>
  *
  * @see CollectionMapping
- * @see ManyToManyMappingComposite - A container of this pane
- * @see OneToManyMappingComposite - A container of this pane
- *
- * @version 3.0
- * @since 1.0
+ * @see ManyToManyMappingComposite
+ * @see OneToManyMappingComposite
  */
-public abstract class AbstractOrderingComposite extends Pane<CollectionMapping>
+public abstract class AbstractOrderingComposite
+	extends Pane<CollectionMapping>
 {
-	/**
-	 * Creates a new <code>OrderingComposite</code>.
-	 *
-	 * @param parentPane The parent container of this one
-	 * @param parent The parent container
-	 */
-	protected AbstractOrderingComposite(Pane<? extends CollectionMapping> parentPane,
-	                         Composite parent) {
-
-		super(parentPane, parent);
-	}
-
-	/**
-	 * Creates a new <code>OrderingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>IMultiRelationshipMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	protected AbstractOrderingComposite(PropertyValueModel<? extends CollectionMapping> subjectHolder,
-	                         Composite parent,
-	                         WidgetFactory widgetFactory) {
-
-		super(subjectHolder, parent, widgetFactory);
+	protected AbstractOrderingComposite(Pane<? extends CollectionMapping> parentPane, Composite parentComposite) {
+		super(parentPane, parentComposite);
 	}
 
-	
 	protected PropertyValueModel<Orderable> buildOrderableHolder() {
 		return new PropertyAspectAdapter<CollectionMapping, Orderable>(getSubjectHolder()) {
 			@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractPrimaryKeyJoinColumnsComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractPrimaryKeyJoinColumnsComposite.java
index ca7023d0c0..0001c8005a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractPrimaryKeyJoinColumnsComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractPrimaryKeyJoinColumnsComposite.java
@@ -38,28 +38,8 @@ import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.widgets.Composite;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * | - Join Columns ---------------------------------------------------------- |
- * | |                                                                       | |
- * | | x Override Default                                                    | |
- * | |                                                                       | |
- * | | --------------------------------------------------------------------- | |
- * | | |                                                                   | | |
- * | | | AddRemoveListPane                                                 | | |
- * | | |                                                                   | | |
- * | | --------------------------------------------------------------------- | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see Entity
- *
- * @version 2.0
- * @since 2.0
- */
-public abstract class AbstractPrimaryKeyJoinColumnsComposite<T extends Entity> extends Pane<T>
+public abstract class AbstractPrimaryKeyJoinColumnsComposite<T extends Entity>
+	extends Pane<T>
 {
 	protected ModifiableCollectionValueModel<PrimaryKeyJoinColumn> selectedPkJoinColumnsModel;
 
@@ -76,19 +56,10 @@ public abstract class AbstractPrimaryKeyJoinColumnsComposite<T extends Entity> e
 	}
 
 	PrimaryKeyJoinColumn addPrimaryKeyJoinColumn() {
-
-		PrimaryKeyJoinColumnDialog dialog = new PrimaryKeyJoinColumnDialog(
-			getShell(),
-			getSubject(),
-			null
-		);
-
+		PrimaryKeyJoinColumnDialog dialog = new PrimaryKeyJoinColumnDialog(this.getShell(), this.getResourceManager(), this.getSubject());
 		dialog.setBlockOnOpen(true);
 		dialog.open();
-		if (dialog.wasConfirmed()) {
-			return addJoinColumn(dialog.getSubject());
-		}
-		return null;
+		return dialog.wasConfirmed() ? this.addJoinColumn(dialog.getSubject()) : null;
 	}
 
 	protected abstract ListValueModel<? extends ReadOnlyPrimaryKeyJoinColumn> buildDefaultJoinColumnsListHolder();
@@ -220,13 +191,7 @@ public abstract class AbstractPrimaryKeyJoinColumnsComposite<T extends Entity> e
 	}
 
 	void editPrimaryKeyJoinColumn(PrimaryKeyJoinColumn joinColumn) {
-
-		PrimaryKeyJoinColumnDialog dialog = new PrimaryKeyJoinColumnDialog(
-			getShell(),
-			getSubject(),
-			joinColumn
-		);
-
+		PrimaryKeyJoinColumnDialog dialog = new PrimaryKeyJoinColumnDialog(this.getShell(), this.getResourceManager(), this.getSubject(), joinColumn);
 		dialog.setBlockOnOpen(true);
 		dialog.open();
 		if (dialog.wasConfirmed()) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractTransientMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractTransientMappingUiDefinition.java
index 511b62de75..fc0bc443de 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractTransientMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractTransientMappingUiDefinition.java
@@ -9,9 +9,10 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.TransientMapping;
-import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 
 public abstract class AbstractTransientMappingUiDefinition<M, T extends TransientMapping>
 	extends AbstractMappingUiDefinition<M, T>
@@ -33,7 +34,7 @@ public abstract class AbstractTransientMappingUiDefinition<M, T extends Transien
 	}
 
 	@Override
-	protected String getImageKey() {
-		return JptUiIcons.TRANSIENT;
+	public ImageDescriptor getImageDescriptor() {
+		return JptJpaUiImages.TRANSIENT;
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractVersionMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractVersionMappingComposite.java
index 391dfdfe4c..b1a4b53eab 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractVersionMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractVersionMappingComposite.java
@@ -9,16 +9,17 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
-import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
+import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
+import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
 import org.eclipse.jpt.jpa.core.context.Column;
 import org.eclipse.jpt.jpa.core.context.Converter;
 import org.eclipse.jpt.jpa.core.context.ConvertibleMapping;
-import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
 import org.eclipse.jpt.jpa.core.context.VersionMapping;
 import org.eclipse.jpt.jpa.ui.details.JpaComposite;
 import org.eclipse.swt.layout.GridData;
@@ -45,31 +46,18 @@ import org.eclipse.ui.forms.widgets.Section;
  * | |                                                                       | |
  * | ------------------------------------------------------------------------- |
  * -----------------------------------------------------------------------------</pre>
- *
- * @see VersionMapping
- * @see ColumnComposite
- * @see TemporalTypeCombo
- *
- * @version 2.3
- * @since 1.0
  */
 public abstract class AbstractVersionMappingComposite<T extends VersionMapping> 
 	extends Pane<T>
 	implements JpaComposite
 {
-	/**
-	 * Creates a new <code>VersionMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>IVersionMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	protected AbstractVersionMappingComposite(PropertyValueModel<? extends T> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-									WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	protected AbstractVersionMappingComposite(
+			PropertyValueModel<? extends T> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
@@ -122,7 +110,7 @@ public abstract class AbstractVersionMappingComposite<T extends VersionMapping>
 			JptUiDetailsMessages.TypeSection_temporal, 
 			buildConverterBooleanHolder(BaseTemporalConverter.class), 
 			null);
-		registerSubPane(new TemporalTypeCombo(buildTemporalConverterHolder(converterHolder), getEnabledModel(), container, getWidgetFactory()));
+		new TemporalTypeCombo(this, this.buildTemporalConverterHolder(converterHolder), container);
 
 		return container;
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractVersionMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractVersionMappingUiDefinition.java
index 55395fc6d7..189e1a7d08 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractVersionMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractVersionMappingUiDefinition.java
@@ -9,9 +9,10 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.VersionMapping;
-import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 
 public abstract class AbstractVersionMappingUiDefinition<M, T extends VersionMapping>
 	extends AbstractMappingUiDefinition<M, T>
@@ -33,7 +34,7 @@ public abstract class AbstractVersionMappingUiDefinition<M, T extends VersionMap
 	}
 
 	@Override
-	protected String getImageKey() {
-		return JptUiIcons.VERSION;
+	public ImageDescriptor getImageDescriptor() {
+		return JptJpaUiImages.VERSION;
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AddQueryDialog.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AddQueryDialog.java
index be19c031d8..8f840638e8 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AddQueryDialog.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AddQueryDialog.java
@@ -11,6 +11,7 @@ package org.eclipse.jpt.jpa.ui.internal.details;
 
 import java.util.ArrayList;
 import java.util.List;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.internal.widgets.DialogPane;
 import org.eclipse.jpt.common.ui.internal.widgets.ValidatingDialog;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
@@ -18,22 +19,16 @@ import org.eclipse.jpt.common.utility.internal.model.value.StaticListValueModel;
 import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter;
 import org.eclipse.jpt.common.utility.model.value.ListValueModel;
 import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
+import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.common.utility.transformer.Transformer;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
-/**
- * Clients can use this dialog to prompt the user for SecondaryTable settings.
- * Use the following once the dialog is closed:
- *     @see #getSelectedTable()
- *     @see #getSelectedCatalog()
- *     @see #getSelectedSchema()
- * @version 2.1
- * @since 2.1
- */
-public class AddQueryDialog extends ValidatingDialog<AddQueryStateObject> {
+public class AddQueryDialog
+	extends ValidatingDialog<AddQueryStateObject>
+{
 	public static final String NAMED_QUERY = "namedQuery"; //$NON-NLS-1$
 	public static final String NAMED_NATIVE_QUERY = "namedNativeQuery"; //$NON-NLS-1$
 
@@ -42,14 +37,9 @@ public class AddQueryDialog extends ValidatingDialog<AddQueryStateObject> {
 	 */
 	private PersistenceUnit pUnit;
 
-	// ********** constructors **********
 
-	/**
-	 * Use this constructor to edit an existing conversion value
-	 * @param pUnit 
-	 */
-	public AddQueryDialog(Shell parent, PersistenceUnit pUnit) {
-		super(parent);
+	public AddQueryDialog(Shell parentShell, ResourceManager resourceManager, PersistenceUnit pUnit) {
+		super(parentShell, resourceManager, JptUiDetailsMessages.AddQueryDialog_title);
 		this.pUnit = pUnit;
 	}
 
@@ -58,19 +48,6 @@ public class AddQueryDialog extends ValidatingDialog<AddQueryStateObject> {
 		return new AddQueryStateObject(this.pUnit);
 	}
 
-	// ********** open **********
-
-	@Override
-	protected void configureShell(Shell shell) {
-		super.configureShell(shell);
-		shell.setText(this.getTitle());
-	}
-
-	@Override
-	protected String getTitle() {
-		return JptUiDetailsMessages.AddQueryDialog_title;
-	}
-
 	@Override
 	protected String getDescriptionTitle() {
 		return JptUiDetailsMessages.AddQueryDialog_descriptionTitle;
@@ -83,7 +60,7 @@ public class AddQueryDialog extends ValidatingDialog<AddQueryStateObject> {
 	
 	@Override
 	protected DialogPane<AddQueryStateObject> buildLayout(Composite container) {
-		return new QueryDialogPane(container);
+		return new QueryDialogPane(this.getSubjectHolder(), container, this.resourceManager);
 	}
 	
 	@Override
@@ -113,12 +90,17 @@ public class AddQueryDialog extends ValidatingDialog<AddQueryStateObject> {
 		return getSubject().getQueryType();
 	}
 	
-	private class QueryDialogPane extends DialogPane<AddQueryStateObject> {
 
+	static class QueryDialogPane
+		extends DialogPane<AddQueryStateObject>
+	{
 		private Text nameText;
 
-		QueryDialogPane(Composite parent) {
-			super(AddQueryDialog.this.getSubjectHolder(), parent);
+		QueryDialogPane(
+				PropertyValueModel<AddQueryStateObject> subjectModel,
+				Composite parentComposite,
+				ResourceManager resourceManager) {
+			super(subjectModel, parentComposite, resourceManager);
 		}
 
 		@Override
@@ -129,10 +111,7 @@ public class AddQueryDialog extends ValidatingDialog<AddQueryStateObject> {
 		@Override
 		protected void initializeLayout(Composite container) {
 			this.addLabel(container, JptUiDetailsMessages.AddQueryDialog_name);
-			this.nameText = addText(
-				container,
-				buildNameHolder()
-			);
+			this.nameText = addText(container, this.buildNameHolder());
 			
 			this.addLabel(container, JptUiDetailsMessages.AddQueryDialog_queryType);
 			this.addCombo(
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/BaseJoinColumnDialog.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/BaseJoinColumnDialog.java
index 25ca0bd349..28373d9d82 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/BaseJoinColumnDialog.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/BaseJoinColumnDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2009 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2012 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,103 +9,80 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.internal.widgets.ValidatingDialog;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseJoinColumn;
 import org.eclipse.swt.widgets.Shell;
 
-/**
- * The abstract definition the dialog showing the information for a join column
- * to edit or to create.
- *
- * @see BaseJoinColumnStateObject
- *
- * @version 2.0
- * @since 1.0
- */
-public abstract class BaseJoinColumnDialog<T extends BaseJoinColumnStateObject>
-	extends ValidatingDialog<T>
+public abstract class BaseJoinColumnDialog<O, C extends ReadOnlyBaseJoinColumn, S extends BaseJoinColumnStateObject>
+	extends ValidatingDialog<S>
 {
+	/**
+	 * This will be <code>null</code> when creating a new join column.
+	 */
+	private final C joinColumn;
 
 	/**
-	 * Either the join column to edit or <code>null</code> if this state object
-	 * is used to create a new one.
+	 * The owner of the new or existing join column.
 	 */
-	private ReadOnlyBaseJoinColumn joinColumn;
+	private final O owner;
+
 
 	/**
-	 * The owner of the join column to create or where it is located.
+	 * Use this constructor to create a <em>new</em> join column.
 	 */
-	private Object owner;
+	protected BaseJoinColumnDialog(
+			Shell parentShell,
+			ResourceManager resourceManager,
+			O owner) {
+		this(parentShell, resourceManager, owner, null);
+	}
 
 	/**
-	 * Creates a new <code>BaseJoinColumnDialog</code>.
-	 *
-	 * @param parent The parent shell
-	 * @param owner The owner of the join column to create or where it is located
-	 * @param joinColumn Either the join column to edit or <code>null</code> if
-	 * this state object is used to create a new one
+	 * Use this constructor to edit an <em>existing</em> join column.
 	 */
-	public BaseJoinColumnDialog(Shell parent,
-	                            Object owner,
-	                            ReadOnlyBaseJoinColumn joinColumn) {
+	protected BaseJoinColumnDialog(
+			Shell parentShell,
+			ResourceManager resourceManager,
+			O owner,
+			C joinColumn) {
+		this(parentShell, resourceManager, owner, joinColumn, buildTitle(joinColumn));
+	}
 
-		super(parent);
+	private static String buildTitle(ReadOnlyBaseJoinColumn joinColumn) {
+		return (joinColumn == null) ?
+				JptUiDetailsMessages.JoinColumnDialog_addJoinColumnTitle :
+				JptUiDetailsMessages.JoinColumnDialog_editJoinColumnTitle;
+	}
 
-		this.owner      = owner;
+	protected BaseJoinColumnDialog(
+			Shell parentShell,
+			ResourceManager resourceManager,
+			O owner,
+			C joinColumn,
+			String title) {
+		super(parentShell, resourceManager, title);
+		this.owner = owner;
 		this.joinColumn = joinColumn;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 */
 	@Override
 	protected String getDescription() {
 		return JptUiDetailsMessages.JoinColumnDialog_description;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 */
 	@Override
 	protected String getDescriptionTitle() {
-
-		if (joinColumn == null) {
-			return JptUiDetailsMessages.JoinColumnDialog_addJoinColumnDescriptionTitle;
-		}
-
-		return JptUiDetailsMessages.JoinColumnDialog_editJoinColumnDescriptionTitle;
+		return (this.joinColumn == null) ?
+				JptUiDetailsMessages.JoinColumnDialog_addJoinColumnDescriptionTitle :
+				JptUiDetailsMessages.JoinColumnDialog_editJoinColumnDescriptionTitle;
 	}
 
-	/**
-	 * Returns the join column used by this state object for editing or
-	 * <code>null</code> if this state object is used to create a new one.
-	 *
-	 * @return Either the edited join column or <code>null</code>
-	 */
-	public ReadOnlyBaseJoinColumn getJoinColumn() {
-		return joinColumn;
+	public C getJoinColumn() {
+		return this.joinColumn;
 	}
 
-	/**
-	 * Returns the owner where the join column is located or where a new one can
-	 * be added.
-	 *
-	 * @return The parent of the join column
-	 */
-	protected Object getOwner() {
-		return owner;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 */
-	@Override
-	protected String getTitle() {
-
-		if (joinColumn == null) {
-			return JptUiDetailsMessages.JoinColumnDialog_addJoinColumnTitle;
-		}
-
-		return JptUiDetailsMessages.JoinColumnDialog_editJoinColumnTitle;
+	protected O getOwner() {
+		return this.owner;
 	}
-}
-\ No newline at end of file
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/BaseJoinColumnDialogPane.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/BaseJoinColumnDialogPane.java
index b22368ba8d..845abb0bf7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/BaseJoinColumnDialogPane.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/BaseJoinColumnDialogPane.java
@@ -11,6 +11,7 @@ package org.eclipse.jpt.jpa.ui.internal.details;
 
 import java.util.ArrayList;
 import java.util.ListIterator;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.internal.JptCommonUiMessages;
 import org.eclipse.jpt.common.ui.internal.util.SWTUtil;
 import org.eclipse.jpt.common.ui.internal.widgets.DialogPane;
@@ -29,35 +30,8 @@ import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * |                         ------------------------------------------------- |
- * | Name:                   | I                                           |v| |
- * |                         ------------------------------------------------- |
- * |                         ------------------------------------------------- |
- * | Referenced Column Name: | I                                           |v| |
- * |                         ------------------------------------------------- |
- * |                         ------------------------------------------------- |
- * | Table:                  | I                                           |v| |
- * |                         ------------------------------------------------- |
- * |                         ------------------------------------------------- |
- * | Column Definition:      | I                                             | |
- * |                         ------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see BaseJoinColumnStateObject
- * @see InverseJoinColumnInJoinTableDialog - A container of this pane
- * @see JoinColumnInReferenceTableDialog - A container of this pane
- * @see PrimaryKeyJoinColumnDialog - A container of this pane
- * @see PrimaryKeyJoinColumnInSecondaryTableDialog - A container of this pane
- *
- * @version 2.0
- * @since 2.0
- */
-@SuppressWarnings("nls")
-public class BaseJoinColumnDialogPane<T extends BaseJoinColumnStateObject> extends DialogPane<T>
+public class BaseJoinColumnDialogPane<T extends BaseJoinColumnStateObject>
+	extends DialogPane<T>
 {
 	/**
 	 * A key used to represent the default value, this is required to convert
@@ -66,18 +40,13 @@ public class BaseJoinColumnDialogPane<T extends BaseJoinColumnStateObject> exten
 	 * <code>null</code> when it's time to set the new selected value into the
 	 * model.
 	 */
-	protected static String DEFAULT_KEY = "?!#!?#?#?default?#?!#?!#?";
-
-	/**
-	 * Creates a new <code>BaseJoinColumnDialogPane</code>.
-	 *
-	 * @param subjectHolder The holder of this pane's subject
-	 * @param parent The parent container
-	 */
-	public BaseJoinColumnDialogPane(PropertyValueModel<? extends T> subjectHolder,
-	                                Composite parent) {
+	protected static String DEFAULT_KEY = "?!#!?#?#?default?#?!#?!#?"; //$NON-NLS-1$
 
-		super(subjectHolder, parent);
+	public BaseJoinColumnDialogPane(
+			PropertyValueModel<? extends T> subjectModel,
+			Composite parentComposite,
+			ResourceManager resourceManager) {
+		super(subjectModel, parentComposite, resourceManager);
 	}
 
 	private ModifiablePropertyValueModel<String> buildColumnDefinitionHolder() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/BaseJoinColumnStateObject.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/BaseJoinColumnStateObject.java
index 902824a552..904715fe1d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/BaseJoinColumnStateObject.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/BaseJoinColumnStateObject.java
@@ -11,7 +11,6 @@ package org.eclipse.jpt.jpa.ui.internal.details;
 
 import java.util.ArrayList;
 import java.util.ListIterator;
-
 import org.eclipse.jpt.common.utility.internal.collection.ListTools;
 import org.eclipse.jpt.common.utility.internal.iterator.EmptyListIterator;
 import org.eclipse.jpt.common.utility.internal.node.AbstractNode;
@@ -367,8 +366,6 @@ public abstract class BaseJoinColumnStateObject
 	/**
 	 * Updates the given join column with the values contained in this state
 	 * object.
-	 *
-	 * @param joinColumn The join column to update
 	 */
 	public void updateJoinColumn(BaseJoinColumn jc) {
 
@@ -387,4 +384,4 @@ public abstract class BaseJoinColumnStateObject
 			jc.setColumnDefinition(columnDefinition);
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/BasicMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/BasicMappingComposite.java
index f867a7ca80..2b11daf80a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/BasicMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/BasicMappingComposite.java
@@ -9,73 +9,21 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.BasicMapping;
 import org.eclipse.swt.widgets.Composite;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | ColumnComposite                                                       | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | FetchTypeComposite                                                    | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | TemporalTypeComposite                                                 | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | EnumTypeComposite                                                     | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | OptionalComposite                                                     | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | LobComposite                                                          | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see BasicMapping
- * @see ColumnComposite
- * @see EnumTypeComboViewer
- * @see FetchTypeComboViewer
- * @see LobComposite
- * @see OptionalTriStateCheckBox
- * @see TemporalTypeCombo
- *
- * @version 2.0
- * @since 1.0
- */
-public class BasicMappingComposite extends AbstractBasicMappingComposite<BasicMapping>
+public class BasicMappingComposite
+	extends AbstractBasicMappingComposite<BasicMapping>
 {
-	/**
-	 * Creates a new <code>BasicMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>IBasicMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public BasicMappingComposite(PropertyValueModel<? extends BasicMapping> subjectHolder,
-								 PropertyValueModel<Boolean> enabledModel,
-	                             Composite parent,
-	                             WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public BasicMappingComposite(
+			PropertyValueModel<? extends BasicMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
-
-}
-\ No newline at end of file
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/CascadeComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/CascadeComposite.java
index e23e2deae3..35b118b207 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/CascadeComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/CascadeComposite.java
@@ -31,44 +31,20 @@ import org.eclipse.swt.widgets.Composite;
  *
  * @see Cascade
  * @see RelationshipMapping
- * @see ManyToManyMappingComposite - A container of this pane
- * @see ManyToOneMappingComposite - A container of this pane
- * @see OneToManyMappingComposite - A container of this pane
- * @see OneToOneMappingComposite - A container of this pane
- *
- * @version 2.0
- * @since 1.0
+ * @see ManyToManyMappingComposite
+ * @see ManyToOneMappingComposite
+ * @see OneToManyMappingComposite
+ * @see OneToOneMappingComposite
  */
-public class CascadeComposite extends Pane<Cascade>
+public class CascadeComposite
+	extends Pane<Cascade>
 {
-	/**
-	 * Creates a new <code>CascadeComposite</code>.
-	 *
-	 * @param parentPane The parent container of this one
-	 * @param subjectHolder The holder of the subject <code>ICascade</code>
-	 * @param parent The parent container
-	 */
-	public CascadeComposite(
-			Pane<? extends RelationshipMapping> parentPane,
-	        PropertyValueModel<? extends Cascade> subjectHolder,
-	        Composite parent) {
-		
-		super(parentPane, subjectHolder, parent);
-	}
-	
-	/**
-	 * Creates a new <code>ColumnComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>ICascade</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
 	public CascadeComposite(
-			PropertyValueModel<? extends Cascade> subjectHolder,
-			Composite parent,
-		    WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, parent, widgetFactory);
+		Pane<? extends RelationshipMapping> parentPane,
+		PropertyValueModel<? extends Cascade> cascadeModel,
+		Composite parent
+	) {
+		super(parentPane, cascadeModel, parent);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/EmbeddedIdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/EmbeddedIdMappingComposite.java
index 823e7dc9b8..fe3c725f1f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/EmbeddedIdMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/EmbeddedIdMappingComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping;
@@ -19,12 +20,12 @@ public class EmbeddedIdMappingComposite
 	extends AbstractEmbeddedIdMappingComposite<EmbeddedIdMapping>
 {
 	public EmbeddedIdMappingComposite(
-			PropertyValueModel<? extends EmbeddedIdMapping> subjectHolder,
+			PropertyValueModel<? extends EmbeddedIdMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/EmbeddedMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/EmbeddedMappingComposite.java
index 28233b6e6f..f5cdceb507 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/EmbeddedMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/EmbeddedMappingComposite.java
@@ -9,43 +9,21 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.EmbeddedMapping;
-import org.eclipse.jpt.jpa.ui.details.JpaComposite;
 import org.eclipse.swt.widgets.Composite;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | EmbeddedAttributeOverridesComposite                                   | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see EmbeddedMapping
- *
- * @version 2.3
- * @since 1.0
- */
-public class EmbeddedMappingComposite extends AbstractEmbeddedMappingComposite<EmbeddedMapping>
-                                      implements JpaComposite
+public class EmbeddedMappingComposite
+	extends AbstractEmbeddedMappingComposite<EmbeddedMapping>
 {
-	/**
-	 * Creates a new <code>EmbeddedMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>EmbeddedMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public EmbeddedMappingComposite(PropertyValueModel<? extends EmbeddedMapping> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-	                                WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public EmbeddedMappingComposite(
+			PropertyValueModel<? extends EmbeddedMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
 \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/EnumTypeComboViewer.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/EnumTypeComboViewer.java
index bab276b737..76f19e7280 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/EnumTypeComboViewer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/EnumTypeComboViewer.java
@@ -10,14 +10,11 @@
 package org.eclipse.jpt.jpa.ui.internal.details;
 
 import java.util.Collection;
-
-import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
-import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.jpa.core.context.EnumType;
 import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter;
+import org.eclipse.jpt.jpa.core.context.EnumType;
 import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
@@ -32,7 +29,6 @@ import org.eclipse.swt.widgets.Control;
  * |            -------------------------------------------------------------- |
  * -----------------------------------------------------------------------------</pre>
  *
- * @see BasicMapping
  * @see BasicMappingComposite - A container of this widget
  *
  * @version 2.0
@@ -42,13 +38,9 @@ public class EnumTypeComboViewer extends Pane<BaseEnumeratedConverter>
 {
 	private Combo combo;
 
-	public EnumTypeComboViewer(PropertyValueModel<? extends BaseEnumeratedConverter> subjectHolder,
-		PropertyValueModel<Boolean> enabledModel,
-		Composite parent,
-		WidgetFactory widgetFactory) {
-
-	super(subjectHolder, enabledModel, parent, widgetFactory);
-}
+	public EnumTypeComboViewer(Pane<?> parentPane, PropertyValueModel<? extends BaseEnumeratedConverter> subjectHolder, Composite parentComposite) {
+		super(parentPane, subjectHolder, parentComposite);
+	}
 
 	@Override
 	protected boolean addsComposite() {
@@ -115,11 +107,6 @@ public class EnumTypeComboViewer extends Pane<BaseEnumeratedConverter>
 	}
 
 	protected PropertyValueModel<Boolean> buildBooleanHolder() {
-		return new TransformationPropertyValueModel<BaseEnumeratedConverter, Boolean>(getSubjectHolder()) {
-			@Override
-			protected Boolean transform(BaseEnumeratedConverter value) {
-				return Boolean.valueOf(value != null);
-			}
-		};
+		return this.buildNotNullSubjectModel();
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/IdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/IdMappingComposite.java
index eb82efecc5..4f79fbcf6c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/IdMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/IdMappingComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.IdMapping;
@@ -19,12 +20,12 @@ public class IdMappingComposite
 	extends AbstractIdMappingComposite<IdMapping>
 {
 	public IdMappingComposite(
-			PropertyValueModel<? extends IdMapping> subjectHolder,
+			PropertyValueModel<? extends IdMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-	        WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/InverseJoinColumnInJoinTableDialog.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/InverseJoinColumnInJoinTableDialog.java
index 025924321f..7956f5bb96 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/InverseJoinColumnInJoinTableDialog.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/InverseJoinColumnInJoinTableDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2009 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2012 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,53 +9,49 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.internal.widgets.DialogPane;
-import org.eclipse.jpt.jpa.core.context.JoinColumn;
-import org.eclipse.jpt.jpa.core.context.JoinTable;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Shell;
 
-/**
- *
- * @see InverseJoinColumnInJoinTableStateObject
- * @see BaseJoinColumnDialogPane
- *
- * @version 2.0
- * @since 2.0
- */
-public class InverseJoinColumnInJoinTableDialog extends BaseJoinColumnDialog<InverseJoinColumnInJoinTableStateObject> {
-
+public class InverseJoinColumnInJoinTableDialog
+	extends BaseJoinColumnDialog<ReadOnlyJoinTable, ReadOnlyJoinColumn, InverseJoinColumnInJoinTableStateObject>
+{
 	/**
-	 * Creates a new <code>JoinColumnInJoinTableDialog</code>.
-	 *
-	 * @param parent The parent shell
-	 * @param joinTable The owner of the join column to create or where it is
-	 * located
-	 * @param joinColumn Either the join column to edit or <code>null</code> if
-	 * this state object is used to create a new one
+	 * Use this constructor to create a <em>new</em> join column.
 	 */
-	public InverseJoinColumnInJoinTableDialog(Shell parent,
-	                                          ReadOnlyJoinTable joinTable,
-	                                          ReadOnlyJoinColumn joinColumn) {
+	protected InverseJoinColumnInJoinTableDialog(
+			Shell parentShell,
+			ResourceManager resourceManager,
+			ReadOnlyJoinTable joinTable) {
+		super(parentShell, resourceManager, joinTable);
+	}
 
-		super(parent, joinTable, joinColumn);
+	/**
+	 * Use this constructor to edit an <em>existing</em> join column.
+	 */
+	protected InverseJoinColumnInJoinTableDialog(
+			Shell parentShell,
+			ResourceManager resourceManager,
+			ReadOnlyJoinTable joinTable,
+			ReadOnlyJoinColumn joinColumn) {
+		super(parentShell, resourceManager, joinTable, joinColumn);
 	}
 
 	@Override
 	protected DialogPane<InverseJoinColumnInJoinTableStateObject> buildLayout(Composite container) {
 		return new JoinColumnDialogPane<InverseJoinColumnInJoinTableStateObject>(
-			getSubjectHolder(),
-			container
-		)
-		
-		{
-			@Override
-			protected boolean isTableEditable() {
-				return false;
-			}
-		};
+				this.getSubjectHolder(),
+				container,
+				this.resourceManager
+			) {
+				@Override
+				protected boolean isTableEditable() {
+					return false;
+				}
+			};
 	}
 
 	@Override
@@ -65,14 +61,4 @@ public class InverseJoinColumnInJoinTableDialog extends BaseJoinColumnDialog<Inv
 			getJoinColumn()
 		);
 	}
-
-	@Override
-	public JoinColumn getJoinColumn() {
-		return (JoinColumn) super.getJoinColumn();
-	}
-
-	@Override
-	protected JoinTable getOwner() {
-		return (JoinTable) super.getOwner();
-	}
-}
-\ No newline at end of file
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/InverseJoinColumnInJoinTableStateObject.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/InverseJoinColumnInJoinTableStateObject.java
index fe63750a82..21713d87d4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/InverseJoinColumnInJoinTableStateObject.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/InverseJoinColumnInJoinTableStateObject.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2012 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -10,45 +10,31 @@
 package org.eclipse.jpt.jpa.ui.internal.details;
 
 import java.util.ListIterator;
-
 import org.eclipse.jpt.common.utility.internal.iterator.SingleElementListIterator;
 import org.eclipse.jpt.jpa.core.context.Entity;
-import org.eclipse.jpt.jpa.core.context.JoinColumn;
-import org.eclipse.jpt.jpa.core.context.JoinTable;
+import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn;
+import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable;
 import org.eclipse.jpt.jpa.core.context.RelationshipMapping;
 import org.eclipse.jpt.jpa.db.Table;
 
 /**
- * The state object used to create or edit a primary key join column on a join
- * table.
- *
- * @see JoinColumn
- * @see JoinTable
+ * @see ReadOnlyJoinColumn
+ * @see ReadOnlyJoinTable
  * @see InverseJoinColumnInJoinTableDialog
- *
- * @version 2.3
- * @since 2.0
  */
 public class InverseJoinColumnInJoinTableStateObject 
 	extends JoinColumnStateObject
 {
-	/**
-	 * Creates a new <code>JoinColumnInJoinTableStateObject</code>.
-	 *
-	 * @param joinTable
-	 * @param joinColumn Either the join column to edit or <code>null</code> if
-	 * this state object is used to create a new one
-	 */
 	public InverseJoinColumnInJoinTableStateObject(
-			JoinTable joinTable,
-	        JoinColumn joinColumn) {
+			ReadOnlyJoinTable joinTable,
+	        ReadOnlyJoinColumn joinColumn) {
 		super(joinTable, joinColumn);
 	}
 	
 	
 	@Override
-	public JoinTable getOwner() {
-		return (JoinTable) super.getOwner();
+	public ReadOnlyJoinTable getOwner() {
+		return (ReadOnlyJoinTable) super.getOwner();
 	}
 	
 	private RelationshipMapping getRelationshipMapping() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnDialog.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnDialog.java
deleted file mode 100644
index 57109bf588..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnDialog.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.ui.internal.details;
-
-import org.eclipse.jpt.common.ui.internal.widgets.DialogPane;
-import org.eclipse.jpt.jpa.core.context.JoinColumn;
-import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * The abstract definition of the dialog used to edit an <code>IJoinColumn</code>.
- *
- * @see JoinColumn
- * @see JoinColumnStateObject
- * @see JoinColumnDialogPane
- *
- * @version 2.0
- * @since 2.0
- */
-public abstract class JoinColumnDialog<T extends JoinColumnStateObject>
-	extends BaseJoinColumnDialog<T>
-{
-
-	/**
-	 * Creates a new <code>AbstractJoinColumnDialog</code>.
-	 *
-	 * @param parent The parent shell
-	 * @param owner The owner of the join column to create or where it is located
-	 * @param joinColumn Either the join column to edit or <code>null</code> if
-	 * this state object is used to create a new one
-	 */
-	public JoinColumnDialog(Shell parent, Object owner, ReadOnlyJoinColumn joinColumn) {
-		super(parent, owner, joinColumn);
-	}
-
-	@Override
-	protected DialogPane<?> buildLayout(Composite container) {
-		return new JoinColumnDialogPane<T>(getSubjectHolder(), container);
-	}
-
-	@Override
-	public ReadOnlyJoinColumn getJoinColumn() {
-		return (ReadOnlyJoinColumn) super.getJoinColumn();
-	}
-}
-\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnDialogPane.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnDialogPane.java
index ca3f3c904d..087ff4a902 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnDialogPane.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnDialogPane.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.internal.JptCommonUiMessages;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
@@ -18,44 +19,15 @@ import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.widgets.Composite;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | BaseJoinColumnDialogPane                                              | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * |                                                                           |
- * | x Insertable                                                              |
- * |                                                                           |
- * | x Nullable                                                                |
- * |                                                                           |
- * | x Unique                                                                  |
- * |                                                                           |
- * | x Updatable                                                               |
- * |                                                                           |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see JoinColumnStateObject
- * @see JoinColumnDialog - The parent container
- *
- * @version 2.0
- * @since 1.0
- */
-public class JoinColumnDialogPane<T extends JoinColumnStateObject> extends BaseJoinColumnDialogPane<T>
+public class JoinColumnDialogPane<T extends JoinColumnStateObject>
+	extends BaseJoinColumnDialogPane<T>
 {
-	/**
-	 * Creates a new <code>JoinColumnDialogPane</code>.
-	 *
-	 * @param subjectHolder The holder of this pane's subject
-	 * @param parent The parent container
-	 */
-	public JoinColumnDialogPane(PropertyValueModel<? extends T> subjectHolder,
-	                            Composite parent)
+	public JoinColumnDialogPane(
+			PropertyValueModel<? extends T> subjectModel,
+			Composite parentComposite,
+			ResourceManager resourceManager)
 	{
-		super(subjectHolder, parent);
+		super(subjectModel, parentComposite, resourceManager);
 	}
 
 	private ModifiablePropertyValueModel<Boolean> buildInsertableHolder() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnInJoiningStrategyDialog.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnInJoiningStrategyDialog.java
index 24d6fd8e78..337f16f9c7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnInJoiningStrategyDialog.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnInJoiningStrategyDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2009 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2012 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,54 +9,48 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
-import org.eclipse.jpt.jpa.core.context.JoinColumn;
-import org.eclipse.jpt.jpa.core.context.JoinColumnRelationshipStrategy;
+import org.eclipse.jface.resource.ResourceManager;
+import org.eclipse.jpt.common.ui.internal.widgets.DialogPane;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumnRelationshipStrategy;
+import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Shell;
 
-/**
- * This dialog is used to either create or edit a joing column that is located
- * on a relational mapping.
- *
- * @see JoinColumn
- * @see JoinColumnRelationshipStrategy
- * @see JoinColumnInJoiningStrategyStateObject
- * @see JoinColumnDialogPane
- *
- * @version 2.0
- * @since 2.0
- */
 public class JoinColumnInJoiningStrategyDialog 
-	extends JoinColumnDialog<JoinColumnInJoiningStrategyStateObject> 
+	extends BaseJoinColumnDialog<ReadOnlyJoinColumnRelationshipStrategy, ReadOnlyJoinColumn, JoinColumnInJoiningStrategyStateObject> 
 {
 	/**
-	 * Creates a new <code>AbstractJoinColumnDialog</code>.
-	 *
-	 * @param parent The parent shell
-	 * @param relationshipMapping The owner of the join column to edit or to
-	 * create
-	 * @param joinColumn The join column to edit or <code>null</code> if this is
-	 * used to create a new one
+	 * Use this constructor to create a <em>new</em> join column.
 	 */
-	JoinColumnInJoiningStrategyDialog(
-		Shell parent,
-	    ReadOnlyJoinColumnRelationshipStrategy joinColumnOwner,
-	    ReadOnlyJoinColumn joinColumn) {
+	protected JoinColumnInJoiningStrategyDialog(
+			Shell parentShell,
+			ResourceManager resourceManager,
+			ReadOnlyJoinColumnRelationshipStrategy strategy) {
+		super(parentShell, resourceManager, strategy);
+	}
 
-		super(parent, joinColumnOwner, joinColumn);
+	/**
+	 * Use this constructor to edit an <em>existing</em> join column.
+	 */
+	protected JoinColumnInJoiningStrategyDialog(
+			Shell parentShell,
+			ResourceManager resourceManager,
+			ReadOnlyJoinColumnRelationshipStrategy strategy,
+			ReadOnlyJoinColumn joinColumn) {
+		super(parentShell, resourceManager, strategy, joinColumn);
 	}
 
 	@Override
 	protected JoinColumnInJoiningStrategyStateObject buildStateObject() {
-		return new JoinColumnInJoiningStrategyStateObject(
-			getOwner(),
-			getJoinColumn()
-		);
+		return new JoinColumnInJoiningStrategyStateObject(this.getOwner(), this.getJoinColumn());
 	}
 
 	@Override
-	protected JoinColumnRelationshipStrategy getOwner() {
-		return (JoinColumnRelationshipStrategy) super.getOwner();
+	protected DialogPane<?> buildLayout(Composite container) {
+		return new JoinColumnDialogPane<JoinColumnInJoiningStrategyStateObject>(
+				this.getSubjectHolder(),
+				container,
+				this.resourceManager
+			);
 	}
-}
-\ No newline at end of file
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnInReferenceTableDialog.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnInReferenceTableDialog.java
index 291b5d8a92..248a0f59ee 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnInReferenceTableDialog.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnInReferenceTableDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2009 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2012 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,72 +9,53 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.internal.widgets.DialogPane;
-import org.eclipse.jpt.jpa.core.context.JoinColumn;
-import org.eclipse.jpt.jpa.core.context.JoinTable;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyReferenceTable;
-import org.eclipse.jpt.jpa.core.context.ReferenceTable;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Shell;
 
-/**
- * This dialog is used to either create or edit a join column that is located
- * on a join table.
- *
- * @see JoinColumn
- * @see JoinTable
- * @see JoinColumnInReferenceTableStateObject
- * @see BaseJoinColumnDialogPane
- *
- * @version 2.0
- * @since 1.0
- */
-public class JoinColumnInReferenceTableDialog extends BaseJoinColumnDialog<JoinColumnInReferenceTableStateObject> {
-
+public class JoinColumnInReferenceTableDialog
+	extends BaseJoinColumnDialog<ReadOnlyReferenceTable, ReadOnlyJoinColumn, JoinColumnInReferenceTableStateObject>
+{
 	/**
-	 * Creates a new <code>JoinColumnInReferenceTableDialog</code>.
-	 *
-	 * @param parent The parent shell
-	 * @param joinTable The parent of the join column to edit or to create
-	 * @param joinColumn Either the join column to edit or <code>null</code> if
-	 * this state object is used to create a new one
+	 * Use this constructor to create a <em>new</em> join column.
 	 */
-	public JoinColumnInReferenceTableDialog(Shell parent,
-	                                   ReadOnlyReferenceTable referenceTable,
-	                                   ReadOnlyJoinColumn joinColumn) {
+	protected JoinColumnInReferenceTableDialog(
+			Shell parentShell,
+			ResourceManager resourceManager,
+			ReadOnlyReferenceTable referenceTable) {
+		super(parentShell, resourceManager, referenceTable);
+	}
 
-		super(parent, referenceTable, joinColumn);
+	/**
+	 * Use this constructor to edit an <em>existing</em> join column.
+	 */
+	protected JoinColumnInReferenceTableDialog(
+			Shell parentShell,
+			ResourceManager resourceManager,
+			ReadOnlyReferenceTable referenceTable,
+			ReadOnlyJoinColumn joinColumn) {
+		super(parentShell, resourceManager, referenceTable, joinColumn);
 	}
 
 	@Override
 	protected DialogPane<JoinColumnInReferenceTableStateObject> buildLayout(Composite container) {
 		return new JoinColumnDialogPane<JoinColumnInReferenceTableStateObject>(
-			getSubjectHolder(),
-			container
-		) {
-			@Override
-			protected boolean isTableEditable() {
-				return false;
-			}
-		};
+				this.getSubjectHolder(),
+				container,
+				this.resourceManager
+			) {
+				@Override
+				protected boolean isTableEditable() {
+					return false;
+				}
+			};
 	}
 
 	@Override
 	protected JoinColumnInReferenceTableStateObject buildStateObject() {
-		return new JoinColumnInReferenceTableStateObject(
-			getOwner(),
-			getJoinColumn()
-		);
-	}
-
-	@Override
-	public JoinColumn getJoinColumn() {
-		return (JoinColumn) super.getJoinColumn();
-	}
-
-	@Override
-	protected ReferenceTable getOwner() {
-		return (ReferenceTable) super.getOwner();
+		return new JoinColumnInReferenceTableStateObject(this.getOwner(), this.getJoinColumn());
 	}
-}
-\ No newline at end of file
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnInReferenceTableStateObject.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnInReferenceTableStateObject.java
index 67265f1e64..35e09dcf1b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnInReferenceTableStateObject.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnInReferenceTableStateObject.java
@@ -10,11 +10,10 @@
 package org.eclipse.jpt.jpa.ui.internal.details;
 
 import java.util.ListIterator;
-
 import org.eclipse.jpt.common.utility.internal.iterator.SingleElementListIterator;
-import org.eclipse.jpt.jpa.core.context.JoinColumn;
-import org.eclipse.jpt.jpa.core.context.JoinTable;
-import org.eclipse.jpt.jpa.core.context.ReferenceTable;
+import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn;
+import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable;
+import org.eclipse.jpt.jpa.core.context.ReadOnlyReferenceTable;
 import org.eclipse.jpt.jpa.core.context.TypeMapping;
 import org.eclipse.jpt.jpa.db.Table;
 
@@ -22,10 +21,8 @@ import org.eclipse.jpt.jpa.db.Table;
  * The state object used to create or edit a primary key join column on a
  * joint table.
  *
- * @see JoinColumn
- * @see JoinTable
- * @see InverseJoinColumnDialog
- * @see InverseJoinColumnDialogPane
+ * @see ReadOnlyJoinColumn
+ * @see ReadOnlyJoinTable
  * @see JoinColumnInReferenceTableDialog
  *
  * @version 2.0
@@ -34,22 +31,16 @@ import org.eclipse.jpt.jpa.db.Table;
 public class JoinColumnInReferenceTableStateObject 
 	extends JoinColumnStateObject
 {
-	/**
-	 * Creates a new <code>JoinColumnInJoinTableStateObject</code>.
-	 *
-	 * @param joinTable The owner of the join column to create or to edit
-	 * @param joinColumn The join column to edit
-	 */
 	public JoinColumnInReferenceTableStateObject(
-			ReferenceTable referenceTable,
-	        JoinColumn joinColumn) {
+			ReadOnlyReferenceTable referenceTable,
+	        ReadOnlyJoinColumn joinColumn) {
 		super(referenceTable, joinColumn);
 	}
 	
 	
 	@Override
-	public ReferenceTable getOwner() {
-		return (ReferenceTable) super.getOwner();
+	public ReadOnlyReferenceTable getOwner() {
+		return (ReadOnlyReferenceTable) super.getOwner();
 	}
 	
 	private TypeMapping getTypeMapping() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnJoiningStrategyPane.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnJoiningStrategyPane.java
index 77dd5161ff..94a0b00ddf 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnJoiningStrategyPane.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnJoiningStrategyPane.java
@@ -106,11 +106,11 @@ public class JoinColumnJoiningStrategyPane
 
 	@Override
 	protected Control buildStrategyDetailsComposite(Composite parent) {
-		PropertyValueModel<ReadOnlyJoinColumnRelationshipStrategy> joiningStrategyHolder = this.buildJoinColumnJoiningStrategyHolder();
+		PropertyValueModel<ReadOnlyJoinColumnRelationshipStrategy> joiningStrategyModel = this.buildJoinColumnJoiningStrategyHolder();
 
 		return this.includeOverrideCheckBox ?
-				new JoiningStrategyJoinColumnsWithOverrideOptionComposite(this, joiningStrategyHolder, parent).getControl() :
-				new JoiningStrategyJoinColumnsComposite(this, joiningStrategyHolder, parent).getControl();
+				new JoiningStrategyJoinColumnsWithOverrideOptionComposite(this, joiningStrategyModel, parent).getControl() :
+				new JoiningStrategyJoinColumnsComposite(this, joiningStrategyModel, parent).getControl();
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnsComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnsComposite.java
index feeb3ced87..acca2f38a4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnsComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnsComposite.java
@@ -12,7 +12,6 @@ package org.eclipse.jpt.jpa.ui.internal.details;
 import java.util.ArrayList;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.AddRemoveListPane;
 import org.eclipse.jpt.common.ui.internal.widgets.AddRemovePane.AbstractAdapter;
 import org.eclipse.jpt.common.ui.internal.widgets.AddRemovePane.Adapter;
@@ -38,25 +37,8 @@ import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.widgets.Composite;
 
-/**
- * Here is the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | AddRemoveListPane                                                     | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see JoiningStrategyJoinColumnsComposite - A container of this pane
- * @see JoinTableComposite - A container of this pane
- * @see EntityOverridesComposite - A container of this pane
- *
- * @version 3.0
- * @since 2.0
- */
-public class JoinColumnsComposite<T extends JpaNode> extends Pane<T>
+public class JoinColumnsComposite<T extends JpaNode>
+	extends Pane<T>
 {
 	/**
 	 * The editor used to perform the common behaviors defined in the list pane.
@@ -65,37 +47,13 @@ public class JoinColumnsComposite<T extends JpaNode> extends Pane<T>
 
 	ModifiableCollectionValueModel<JoinColumn> selectedJoinColumnsModel;
 
-	/**
-	 * Creates a new <code>JoinColumnsComposite</code>.
-	 *
-	 * @param parentPane The parent controller of this one
-	 * @param parent The parent container
-	 * @param joinColumnsEditor The editor used to perform the common behaviors
-	 * defined in the list pane
-	 */
-	public JoinColumnsComposite(Pane<? extends T> parentPane,
-	                            Composite parent,
-	                            JoinColumnsEditor<T> joinColumnsEditor,
-	                            PropertyValueModel<Boolean> enabledModel) {
-
-		super(parentPane, parent, enabledModel);
-		this.joinColumnsEditor = joinColumnsEditor;
-		initializeLayout2();
-	}
-
-	/**
-	 * Creates a new <code>JoinColumnsComposite</code>.
-	 *
-	 * @param subjectHolder The holder of this pane's subject
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public JoinColumnsComposite(PropertyValueModel<? extends T> subjectHolder,
-	                            Composite parent,
-	                            WidgetFactory widgetFactory,
-	                            JoinColumnsEditor<T> joinColumnsEditor) {
 
-		super(subjectHolder, parent, widgetFactory);
+	public JoinColumnsComposite(
+			Pane<? extends T> parent,
+			Composite parentComposite,
+			JoinColumnsEditor<T> joinColumnsEditor,
+			PropertyValueModel<Boolean> enabledModel) {
+		super(parent, parentComposite, enabledModel);
 		this.joinColumnsEditor = joinColumnsEditor;
 		initializeLayout2();
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinTableComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinTableComposite.java
index 88f3a58d87..c8111c2e9d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinTableComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinTableComposite.java
@@ -9,7 +9,6 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
-import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.internal.iterable.SuperListIterableWrapper;
 import org.eclipse.jpt.common.utility.internal.model.value.ListAspectAdapter;
@@ -22,8 +21,8 @@ import org.eclipse.jpt.common.utility.model.event.StateChangeEvent;
 import org.eclipse.jpt.common.utility.model.listener.StateChangeAdapter;
 import org.eclipse.jpt.common.utility.model.listener.StateChangeListener;
 import org.eclipse.jpt.common.utility.model.value.ListValueModel;
-import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
+import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.JoinColumn;
 import org.eclipse.jpt.jpa.core.context.JoinTable;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn;
@@ -35,78 +34,20 @@ import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Group;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * |         ---------------------------------------------------------------   |
- * |   Name: |                                                           |v|   |
- * |         ---------------------------------------------------------------   |
- * |                                                                           |
- * | - Join Columns ---------------------------------------------------------- |
- * | |                                                                       | |
- * | | x Override Default                                                    | |
- * | |                                                                       | |
- * | | --------------------------------------------------------------------- | |
- * | | |                                                                   | | |
- * | | | JoinColumnsComposite                                              | | |
- * | | |                                                                   | | |
- * | | --------------------------------------------------------------------- | |
- * | ------------------------------------------------------------------------- |
- * |                                                                           |
- * | - Inverse Join Columns -------------------------------------------------- |
- * | |                                                                       | |
- * | | x Override Default                                                    | |
- * | |                                                                       | |
- * | | --------------------------------------------------------------------- | |
- * | | |                                                                   | | |
- * | | | JoinColumnsComposite                                              | | |
- * | | |                                                                   | | |
- * | | --------------------------------------------------------------------- | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see JoinTable
- * @see JoinTableJoiningStrategyPane
- * @see JoinColumnsComposite
- *
- * @version 2.1
- * @since 1.0
- */
 public class JoinTableComposite
 	extends ReferenceTableComposite<ReadOnlyJoinTable>
 {
 	private Button overrideDefaultInverseJoinColumnsCheckBox;
 
 	private JoinColumnsComposite<ReadOnlyJoinTable> inverseJoinColumnsComposite;
-	/**
-	 * Creates a new <code>JoinTableComposite</code>.
-	 *
-	 * @param parentPane The parent container of this one
-	 * @param subjectHolder The holder of this pane's subject
-	 * @param parent The parent container
-	 */
+
+
 	public JoinTableComposite(
 			Pane<?> parentPane,
-			PropertyValueModel<? extends ReadOnlyJoinTable> subjectHolder,
+			PropertyValueModel<? extends ReadOnlyJoinTable> tableModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent) {
-
-		super(parentPane, subjectHolder, enabledModel, parent);
-	}
-
-	/**
-	 * Creates a new <code>JoinTableComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>IJoinTable</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public JoinTableComposite(PropertyValueModel<? extends ReadOnlyJoinTable> subjectHolder,
-	                          Composite parent,
-	                          WidgetFactory widgetFactory) {
-
-		super(subjectHolder, parent, widgetFactory);
+			Composite parentComposite) {
+		super(parentPane, tableModel, enabledModel, parentComposite);
 	}
 
 	@Override
@@ -184,8 +125,7 @@ public class JoinTableComposite
 
 	JoinColumn addInverseJoinColumn(ReadOnlyJoinTable joinTable) {
 
-		InverseJoinColumnInJoinTableDialog dialog =
-			new InverseJoinColumnInJoinTableDialog(getShell(), joinTable, null);
+		InverseJoinColumnInJoinTableDialog dialog = new InverseJoinColumnInJoinTableDialog(this.getShell(), this.getResourceManager(), joinTable);
 
 		dialog.setBlockOnOpen(true);
 		dialog.open();
@@ -238,8 +178,7 @@ public class JoinTableComposite
 
 	void editInverseJoinColumn(ReadOnlyJoinColumn joinColumn) {
 
-		InverseJoinColumnInJoinTableDialog dialog =
-			new InverseJoinColumnInJoinTableDialog(getShell(), getSubject(), joinColumn);
+		InverseJoinColumnInJoinTableDialog dialog = new InverseJoinColumnInJoinTableDialog(this.getShell(), this.getResourceManager(), this.getSubject(), joinColumn);
 
 
 		dialog.setBlockOnOpen(true);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoiningStrategyJoinColumnsComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoiningStrategyJoinColumnsComposite.java
index f5c1cae7aa..f497d2dd34 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoiningStrategyJoinColumnsComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoiningStrategyJoinColumnsComposite.java
@@ -50,11 +50,16 @@ public class JoiningStrategyJoinColumnsComposite
 	
 	private JoinColumnsComposite<ReadOnlyJoinColumnRelationshipStrategy> joinColumnsComposite;
 	
+	public JoiningStrategyJoinColumnsComposite(Pane<? extends ReadOnlyJoinColumnRelationshipStrategy> parentPane, Composite parentComposite) {
+		super(parentPane, parentComposite);
+	}
+
 	public JoiningStrategyJoinColumnsComposite(
-			Pane<?> parentPane,
-			PropertyValueModel<ReadOnlyJoinColumnRelationshipStrategy> subjectHolder,
-			Composite parent) {
-		super(parentPane, subjectHolder, parent);
+		Pane<?> parentPane,
+		PropertyValueModel<ReadOnlyJoinColumnRelationshipStrategy> subjectModel,
+		Composite parent
+	) {
+		super(parentPane, subjectModel, parent);
 	}
 
 	@Override
@@ -109,8 +114,7 @@ public class JoiningStrategyJoinColumnsComposite
 	}
 	
 	JoinColumn addJoinColumn(ReadOnlyJoinColumnRelationshipStrategy joiningStrategy) {
-		JoinColumnInJoiningStrategyDialog dialog =
-			new JoinColumnInJoiningStrategyDialog(getShell(), joiningStrategy, null);
+		JoinColumnInJoiningStrategyDialog dialog = new JoinColumnInJoiningStrategyDialog(this.getShell(), this.getResourceManager(), joiningStrategy);
 
 		dialog.setBlockOnOpen(true);
 		dialog.open();
@@ -132,8 +136,7 @@ public class JoiningStrategyJoinColumnsComposite
 	}
 	
 	void editJoinColumn(ReadOnlyJoinColumnRelationshipStrategy joiningStrategy, ReadOnlyJoinColumn joinColumn) {
-		JoinColumnInJoiningStrategyDialog dialog =
-			new JoinColumnInJoiningStrategyDialog(getShell(), joiningStrategy, joinColumn);
+		JoinColumnInJoiningStrategyDialog dialog = new JoinColumnInJoiningStrategyDialog(this.getShell(), this.getResourceManager(), joiningStrategy, joinColumn);
 
 		dialog.setBlockOnOpen(true);
 		dialog.open();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoiningStrategyJoinColumnsWithOverrideOptionComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoiningStrategyJoinColumnsWithOverrideOptionComposite.java
index ced5f56e77..2934436ed4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoiningStrategyJoinColumnsWithOverrideOptionComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoiningStrategyJoinColumnsWithOverrideOptionComposite.java
@@ -24,26 +24,6 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumnRelationshipStrategy;
 import org.eclipse.swt.widgets.Composite;
 
-/**
- * Here is the layout of this pane:
- * <pre>
- * -------------------------------------------------------------------------
- * x Override Default                                                    
- * ---------------------------------------------------------------------
- * |                                                                   |
- * | JoiningStrategyJoinColumnsComposite                               |
- * |                                                                   |
- * ---------------------------------------------------------------------
- * -------------------------------------------------------------------------</pre>
- *
- * @see JoinColumnRelationship
- * @see JoinColumnRelationshipStrategy
- * @see JoinColumnJoiningStrategyPane
- * @see JoinColumnInJoiningStrategyDialog
- *
- * @version 3.0
- * @since 2.0
- */
 public class JoiningStrategyJoinColumnsWithOverrideOptionComposite 
 	extends Pane<ReadOnlyJoinColumnRelationshipStrategy>
 {
@@ -68,7 +48,7 @@ public class JoiningStrategyJoinColumnsWithOverrideOptionComposite
 			null
 		);
 		
-		this.joiningStrategyComposite = new JoiningStrategyJoinColumnsComposite(this, getSubjectHolder(), container);
+		this.joiningStrategyComposite = new JoiningStrategyJoinColumnsComposite(this, container);
 	}
 
 	void setSelectedJoinColumn(JoinColumn joinColumn) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ManyToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ManyToManyMappingComposite.java
index 4c0f5f9747..bc0993ce93 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ManyToManyMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ManyToManyMappingComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ManyToManyMapping;
@@ -18,63 +19,16 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | TargetEntityComposite                                                 | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | JoiningStrategyComposite                                              | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | FetchTypeComposite                                                    | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | CascadeComposite                                                      | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | OrderingComposite                                                     | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see {@link ManyToManyMapping}
- * @see {@link TargetEntityClassChooser}
- * @see {@link ManyToManyJoiningStrategyPane}
- * @see {@link FetchTypeComboViewer}
- * @see {@link CascadeComposite}
- * @see {@link OrderingComposite}
- *
- * @version 2.3
- * @since 1.0
- */
 public class ManyToManyMappingComposite 
 	extends AbstractManyToManyMappingComposite<ManyToManyMapping, ManyToManyRelationship>
 {
-	/**
-	 * Creates a new <code>ManyToManyMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>IManyToManyMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public ManyToManyMappingComposite(PropertyValueModel<? extends ManyToManyMapping> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-	                                WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public ManyToManyMappingComposite(
+			PropertyValueModel<? extends ManyToManyMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ManyToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ManyToOneMappingComposite.java
index 792de79616..7f5765d5a2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ManyToOneMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ManyToOneMappingComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ManyToOneMapping;
@@ -18,63 +19,16 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | TargetEntityComposite                                                 | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | JoiningStrategyComposite                                              | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | FetchTypeComposite                                                    | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | OptionalComposite                                                     | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | CascadeComposite                                                      | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see {@link ManyToOneMapping}
- * @see {@link TargetEntityClassChooser}
- * @see {@link ManyToOneJoiningStrategyPane}
- * @see {@link FetchTypeComboViewer}
- * @see {@link OptionalTriStateCheckBox}
- * @see {@link CascadeComposite}
- *
- * @version 2.3
- * @since 1.0
- */
 public class ManyToOneMappingComposite 
 	extends AbstractManyToOneMappingComposite<ManyToOneMapping, ManyToOneRelationship>
 {
-	/**
-	 * Creates a new <code>ManyToOneMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>IManyToOneMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public ManyToOneMappingComposite(PropertyValueModel<? extends ManyToOneMapping> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-	                                WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public ManyToOneMappingComposite(
+			PropertyValueModel<? extends ManyToOneMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+	        WidgetFactory widgetFactory,
+	        ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/MapAsComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/MapAsComposite.java
index e376d05431..b3b5c6b530 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/MapAsComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/MapAsComposite.java
@@ -17,13 +17,11 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.resource.JFaceColors;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jpt.common.ui.internal.utility.swt.SWTTools;
+import org.eclipse.jpt.common.ui.internal.jface.ResourceManagerLabelProvider;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.internal.StringTools;
-import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.common.utility.model.listener.PropertyChangeListener;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.JpaNode;
 import org.eclipse.jpt.jpa.ui.JpaPlatformUi;
@@ -39,12 +37,12 @@ import org.eclipse.swt.events.MouseListener;
 import org.eclipse.swt.events.MouseMoveListener;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.dialogs.FilteredItemsSelectionDialog;
 import com.ibm.icu.text.Collator;
 
@@ -58,15 +56,13 @@ import com.ibm.icu.text.Collator;
  * -----------------------------------------------------------------------------
  * |                                                                           |
  * | Attribute 'name' is mapped as one to one.                                 |
- * |                               ¯¯¯¯¯¯¯¯¯¯                                  |
+ * |                               ----------                                  |
  * -----------------------------------------------------------------------------</pre>
- *
- * @version 2.0
- * @since 2.0
  */
 @SuppressWarnings("nls")
-public abstract class MapAsComposite<T extends JpaNode> extends Pane<T> {
-
+public abstract class MapAsComposite<T extends JpaNode>
+	extends Pane<T>
+{
 	protected boolean dragEvent;
 	protected MappingChangeHandler<T> mappingChangeHandler;
 	protected int mappingTypeLength;
@@ -75,29 +71,18 @@ public abstract class MapAsComposite<T extends JpaNode> extends Pane<T> {
 	protected int nameLength;
 	protected int nameStart;
 	protected StyledText styledText;
-	protected PropertyChangeListener enabledModelListener;
 
 	/**
 	 * The constant ID used to retrieve the dialog settings.
 	 */
 	private static final String DIALOG_SETTINGS = "org.eclipse.jpt.jpa.ui.dialogs.MapAsDialog";
 
-	/**
-	 * Creates a new <code>MapAsComposite</code>.
-	 *
-	 * @param parentPane The parent pane of this one
-	 * @param parent The parent container
-	 */
-	public MapAsComposite(Pane<? extends T> parentPane,
-	                      Composite parent) {
 
-		super(parentPane, parent);
+	protected MapAsComposite(Pane<? extends T> parentPane, Composite parentComposite) {
+		super(parentPane, parentComposite);
 	}
 
-	public MapAsComposite(Pane<? extends T> parentPane,
-							Composite parent,
-							PropertyValueModel<Boolean> enabledModel) {
-
+	protected MapAsComposite(Pane<? extends T> parentPane, Composite parent, PropertyValueModel<Boolean> enabledModel) {
 		super(parentPane, parent, enabledModel);
 	}
 	
@@ -228,49 +213,38 @@ public abstract class MapAsComposite<T extends JpaNode> extends Pane<T> {
 		styledText.setStyleRange(null);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 */
 	@Override
 	protected void doPopulate() {
 		super.doPopulate();
 		updateDescription();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 */
 	@Override
 	protected void initialize() {
 
 		super.initialize();
 		this.mappingChangeHandler = buildMappingChangeHandler();
-		this.enabledModelListener = this.buildEnabledModelListener();
-		this.getEnabledModel().addPropertyChangeListener(PropertyValueModel.VALUE, this.enabledModelListener);
 	}
 
-	protected PropertyChangeListener buildEnabledModelListener() {
-		return new PropertyChangeListener() {
-			public void propertyChanged(PropertyChangeEvent event) {
-				if (!styledText.isDisposed()) {
-					if (((Boolean)event.getNewValue()).booleanValue()) {
-						updateLinkRange();
-					}
-					else {
-						clearStyleRange();					
-					}
-				}
+	@Override
+	protected void enabledModelChanged(boolean oldEnabled, boolean newEnabled) {
+		if ( ! this.styledText.isDisposed()) {
+			if (newEnabled) {
+				this.updateLinkRange();
+			} else {
+				this.clearStyleRange();					
 			}
-		};
+		}
 	}
+
 	@Override
 	protected Composite addComposite(Composite parent) {
-		styledText = new StyledText(parent, SWT.WRAP | SWT.READ_ONLY);
-		SWTTools.controlEnabledState(getEnabledModel(), styledText);
-		styledText.addMouseListener(buildMouseListener());
-		styledText.addMouseMoveListener(buildMouseMoveListener());
-		styledText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		return styledText;
+		this.styledText = new StyledText(parent, SWT.WRAP | SWT.READ_ONLY);
+		this.controlEnabledState(this.styledText);
+		this.styledText.addMouseListener(buildMouseListener());
+		this.styledText.addMouseMoveListener(buildMouseMoveListener());
+		this.styledText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		return this.styledText;
 	}
 
 	@Override
@@ -278,9 +252,12 @@ public abstract class MapAsComposite<T extends JpaNode> extends Pane<T> {
 		return (Composite) super.getControl();
 	}
 
+	/**
+	 * @see #addComposite(Composite)
+	 */
 	@Override
 	protected void initializeLayout(Composite container) {
-		// see addComposite(Composite)
+		// NOP - code is in addComposite(...)
 	}
 
 	/**
@@ -325,7 +302,7 @@ public abstract class MapAsComposite<T extends JpaNode> extends Pane<T> {
 	 */
 	protected void openMappingSelectionDialog() {
 
-		MappingSelectionDialog dialog = new MappingSelectionDialog();
+		MappingSelectionDialog dialog = new MappingSelectionDialog(this.getShell(), this.getResourceManager());
 		dialog.setBlockOnOpen(true);
 		if (dialog.open() == IDialogConstants.OK_ID) {
 			MappingUiDefinition<?,?> definition = (MappingUiDefinition<?,?>) dialog.getFirstResult();
@@ -344,8 +321,8 @@ public abstract class MapAsComposite<T extends JpaNode> extends Pane<T> {
 		clearStyleRange();
 		updateText();
 
-		if (getEnabledModel().getValue().booleanValue()) {
-			updateLinkRange();
+		if (this.isEnabled()) {
+			this.updateLinkRange();
 		}
 	}
 
@@ -402,12 +379,6 @@ public abstract class MapAsComposite<T extends JpaNode> extends Pane<T> {
 		styledText.setText(text);
 	}
 
-	@Override
-	protected void controlDisposed() {
-		this.getEnabledModel().removePropertyChangeListener(PropertyValueModel.VALUE, this.enabledModelListener);
-		super.controlDisposed();
-	}
-
 	/**
 	 * This handler is responsible to give the text information and to open the
 	 * mapping dialog if the user clicked on the mapping type.
@@ -472,29 +443,21 @@ public abstract class MapAsComposite<T extends JpaNode> extends Pane<T> {
 		/**
 		 * Creates a new <code>MappingSelectionDialog</code>.
 		 */
-		private MappingSelectionDialog() {
-			super(MapAsComposite.this.getShell(), false);
-			setMessage(JptUiDetailsMessages.MapAsComposite_labelText);
-			setTitle(JptUiDetailsMessages.MapAsComposite_dialogTitle);
-			setListLabelProvider(buildLabelProvider());
-			setDetailsLabelProvider(buildLabelProvider());
+		protected MappingSelectionDialog(Shell shell, ResourceManager resourceManager) {
+			super(shell, false);
+			this.setMessage(JptUiDetailsMessages.MapAsComposite_labelText);
+			this.setTitle(JptUiDetailsMessages.MapAsComposite_dialogTitle);
+			ILabelProvider labelProvider = this.buildLabelProvider(resourceManager);
+			this.setListLabelProvider(labelProvider);
+			this.setDetailsLabelProvider(labelProvider);
 		}
 
-		private ILabelProvider buildLabelProvider() {
-			return new MappingUiDefinitionLabelProvider();
-		}
-
-		class MappingUiDefinitionLabelProvider
-			extends LabelProvider
-		{
-			@Override
-			public Image getImage(Object element) {
-				return (element == null) ? null : ((MappingUiDefinition<?,?>) element).getImage();
-			}
-			@Override
-			public String getText(Object element) {
-				return (element == null) ? "" : ((MappingUiDefinition<?,?>) element).getLabel();
-			}
+		private ILabelProvider buildLabelProvider(ResourceManager resourceManager) {
+			return new ResourceManagerLabelProvider<MappingUiDefinition>(
+					MappingUiDefinition.IMAGE_DESCRIPTOR_TRANSFORMER,
+					MappingUiDefinition.LABEL_TRANSFORMER,
+					resourceManager
+				);
 		}
 
 		@Override
@@ -517,7 +480,7 @@ public abstract class MapAsComposite<T extends JpaNode> extends Pane<T> {
 
 			try {
 				// Add the default provider
-				defaultDefinition = getDefaultDefinition();
+				this.defaultDefinition = getDefaultDefinition();
 
 				if (defaultDefinition != null) {
 					provider.add(defaultDefinition, itemsFilter);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OneToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OneToManyMappingComposite.java
index 4e5dba0dd3..e6bbe75cd4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OneToManyMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OneToManyMappingComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.OneToManyMapping;
@@ -18,63 +19,16 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | TargetEntityComposite                                                 | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | JoiningStrategyComposite                                              | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | FetchTypeComposite                                                    | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | CascadeComposite                                                      | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | OrderingComposite                                                     | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see OneToManyMapping
- * @see CascadeComposite
- * @see FetchTypeComboViewer
- * @see JoinTableComposite
- * @see OrderingComposite
- * @see TargetEntityClassChooser
- *
- * @version 2.3
- * @since 1.0
- */
 public class OneToManyMappingComposite 
 	extends AbstractOneToManyMappingComposite<OneToManyMapping, OneToManyRelationship>
 {
-	/**
-	 * Creates a new <code>OneToManyMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>IOneToManyMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public OneToManyMappingComposite(PropertyValueModel<? extends OneToManyMapping> subjectHolder,
-		 							 PropertyValueModel<Boolean> enabledModel,
-	                                 Composite parent,
-	                                 WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public OneToManyMappingComposite(
+			PropertyValueModel<? extends OneToManyMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OneToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OneToOneMappingComposite.java
index d99f29afaa..25a1d6bfb7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OneToOneMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OneToOneMappingComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.OneToOneMapping;
@@ -18,63 +19,16 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | TargetEntityComposite                                                 | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | JoiningStrategyComposite                                              | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | FetchTypeComposite                                                    | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | OptionalComposite                                                     | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | CascadeComposite                                                      | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see OneToOneMapping
- * @see TargetEntityClassChooser
- * @see JoiningStrategyComposite
- * @see FetchTypeComboViewer
- * @see OptionalTriStateCheckBox
- * @see CascadeComposite
- *
- * @version 2.3
- * @since 1.0
- */
 public class OneToOneMappingComposite 
 	extends AbstractOneToOneMappingComposite<OneToOneMapping, OneToOneRelationship>
 {
-	/**
-	 * Creates a new <code>OneToOneMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>IOneToOneMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public OneToOneMappingComposite(PropertyValueModel<? extends OneToOneMapping> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-	                                WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public OneToOneMappingComposite(
+			PropertyValueModel<? extends OneToOneMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+	        WidgetFactory widgetFactory,
+	        ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}	
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OrderingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OrderingComposite.java
index f98c745132..2069380724 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OrderingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OrderingComposite.java
@@ -9,7 +9,6 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
-import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.CollectionMapping;
@@ -37,38 +36,14 @@ import org.eclipse.swt.widgets.Text;
  * -----------------------------------------------------------------------------</pre>
  *
  * @see CollectionMapping
- * @see ManyToManyMappingComposite - A container of this pane
- * @see OneToManyMappingComposite - A container of this pane
- *
- * @version 3.0
- * @since 1.0
+ * @see ManyToManyMappingComposite
+ * @see OneToManyMappingComposite
  */
-public class OrderingComposite extends AbstractOrderingComposite
+public class OrderingComposite
+	extends AbstractOrderingComposite
 {
-	/**
-	 * Creates a new <code>OrderingComposite</code>.
-	 *
-	 * @param parentPane The parent container of this one
-	 * @param parent The parent container
-	 */
-	public OrderingComposite(Pane<? extends CollectionMapping> parentPane,
-	                         Composite parent) {
-
-		super(parentPane, parent);
-	}
-
-	/**
-	 * Creates a new <code>OrderingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>IMultiRelationshipMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public OrderingComposite(PropertyValueModel<? extends CollectionMapping> subjectHolder,
-	                         Composite parent,
-	                         WidgetFactory widgetFactory) {
-
-		super(subjectHolder, parent, widgetFactory);
+	public OrderingComposite(Pane<? extends CollectionMapping> parentPane, Composite parentComposite) {
+		super(parentPane, parentComposite);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentAttributeDetailsPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentAttributeDetailsPageManager.java
index b5e1340655..4bb99f140b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentAttributeDetailsPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentAttributeDetailsPageManager.java
@@ -10,7 +10,7 @@
 package org.eclipse.jpt.jpa.ui.internal.details;
 
 import java.util.HashMap;
-import java.util.Map;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.util.ControlSwitcher;
 import org.eclipse.jpt.common.utility.filter.Filter;
@@ -20,7 +20,6 @@ import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.common.utility.transformer.Transformer;
 import org.eclipse.jpt.jpa.core.context.AttributeMapping;
-import org.eclipse.jpt.jpa.core.context.PersistentAttribute;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
 import org.eclipse.jpt.jpa.ui.details.JpaComposite;
 import org.eclipse.jpt.jpa.ui.internal.plugin.JptJpaUiPlugin;
@@ -30,44 +29,30 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.part.PageBook;
 
-/**
- * The abstract definition of the details page responsible to show the
- * information for an persistent attribute.
- *
- * @see PersistentAttribute
- *
- * @version 2.2
- * @since 1.0
- */
-public abstract class PersistentAttributeDetailsPage<A extends ReadOnlyPersistentAttribute>
-	extends AbstractJpaDetailsPage<A>
+public abstract class PersistentAttributeDetailsPageManager<A extends ReadOnlyPersistentAttribute>
+	extends AbstractJpaDetailsPageManager<A>
 {
-	private Map<String, JpaComposite> mappingComposites;
+	private final HashMap<String, JpaComposite> mappingComposites = new HashMap<String, JpaComposite>();
 	private PageBook mappingPageBook;
 
 	private PropertyValueModel<AttributeMapping> mappingHolder;
 	
-	/**
-	 * Creates a new <code>PersistentAttributeDetailsPage</code>.
-	 *
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	protected PersistentAttributeDetailsPage(
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		super(parent, widgetFactory);
+	protected PersistentAttributeDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		super(parent, widgetFactory, resourceManager);
 	}
 
 	@Override
 	protected void initialize() {
 		super.initialize();
-		this.mappingComposites = new HashMap<String, JpaComposite>();
 	}
 
-	protected PageBook buildMappingPageBook(Composite parent) {
-		this.mappingPageBook = new PageBook(parent, SWT.NONE);
+	@Override
+	protected void initializeLayout(Composite container) {
+		this.mappingPageBook = this.buildMappingPageBook(container);
+	}
+
+	private PageBook buildMappingPageBook(Composite parent) {
+		PageBook book = new PageBook(parent, SWT.NONE);
 
 		GridData gridData = new GridData();
 		gridData.horizontalAlignment       = SWT.FILL;
@@ -75,49 +60,43 @@ public abstract class PersistentAttributeDetailsPage<A extends ReadOnlyPersisten
 		gridData.verticalIndent = 5;
 		gridData.grabExcessHorizontalSpace = true;
 		gridData.grabExcessVerticalSpace   = true;
-
-		this.mappingPageBook.setLayoutData(gridData);
+		book.setLayoutData(gridData);
 		
 		this.mappingHolder = this.buildMappingHolder();
-		new ControlSwitcher(this.mappingHolder, this.buildPaneTransformer(), this.mappingPageBook);
+		new ControlSwitcher(this.mappingHolder, this.buildPaneTransformer(), book);
 
-		return this.mappingPageBook;
+		return book;
 	}
 
 	private Transformer<AttributeMapping, Control> buildPaneTransformer() {
 		return new Transformer<AttributeMapping, Control>() {
 			public Control transform(AttributeMapping attributeMapping) {
-				if (attributeMapping == null) {
-					return null;
-				}
-				return getMappingComposite(attributeMapping.getKey()).getControl();
+				return (attributeMapping == null) ? null : getMappingComposite(attributeMapping.getKey()).getControl();
 			}
 		};
 	}
 
 	protected JpaComposite getMappingComposite(String key) {
 		JpaComposite composite = this.mappingComposites.get(key);
-		if (composite != null) {
-			return composite;
-		}
-
-		composite = buildMappingComposite(this.mappingPageBook, key);
-
-		if (composite != null) {
-			this.mappingComposites.put(key, composite);
+		if (composite == null) {
+			composite = this.buildMappingComposite(this.mappingPageBook, key);
+			if (composite != null) {
+				this.mappingComposites.put(key, composite);
+			}
 		}
-
 		return composite;
 	}
 
 	protected JpaComposite buildMappingComposite(PageBook pageBook, String key) {
 		return getJpaPlatformUi().buildAttributeMappingComposite(
-				getSubject().getResourceType(),
+				this.getSubject().getResourceType(),
 				key,
 				pageBook,
-				buildMappingHolder(key),
-				getMappingCompositeEnabledModel(),
-				getWidgetFactory());
+				this.buildMappingHolder(key),
+				this.getMappingCompositeEnabledModel(),
+				this.getWidgetFactory(),
+				this.getResourceManager()
+			);
 	}
 
 	protected abstract PropertyValueModel<Boolean> getMappingCompositeEnabledModel();
@@ -154,7 +133,7 @@ public abstract class PersistentAttributeDetailsPage<A extends ReadOnlyPersisten
 		super.controlDisposed();
 	}
 
-	private static final String TRACE_OPTION = PersistentAttributeDetailsPage.class.getSimpleName();
+	private static final String TRACE_OPTION = PersistentAttributeDetailsPageManager.class.getSimpleName();
 
 	private class MappingFilter implements Filter<AttributeMapping> {
 		private String mappingKey;
@@ -168,4 +147,4 @@ public abstract class PersistentAttributeDetailsPage<A extends ReadOnlyPersisten
 			return (mapping == null || this.mappingKey == null) || this.mappingKey.equals(mapping.getKey());
 		}
 	}
-}
-\ No newline at end of file
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentAttributeMapAsComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentAttributeMapAsComposite.java
index a05a4c6263..1efa973e6a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentAttributeMapAsComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentAttributeMapAsComposite.java
@@ -28,24 +28,11 @@ import org.eclipse.swt.widgets.Composite;
 public class PersistentAttributeMapAsComposite 
 	extends MapAsComposite<ReadOnlyPersistentAttribute>
 {
-	/**
-	 * Creates a new <code>PersistentAttributeMapAsComposite</code>.
-	 *
-	 * @param parentPane The parent pane of this one
-	 * @param parent The parent container
-	 */
-	public PersistentAttributeMapAsComposite(
-			Pane<? extends ReadOnlyPersistentAttribute> parentPane,
-            Composite parent) {
-		
+	public PersistentAttributeMapAsComposite(Pane<? extends ReadOnlyPersistentAttribute> parentPane, Composite parent) {
 		super(parentPane, parent);
 	}
 
-	public PersistentAttributeMapAsComposite(
-			Pane<? extends ReadOnlyPersistentAttribute> parentPane,
-	        Composite parent,
-	        PropertyValueModel<Boolean> enabledModel) {
-
+	public PersistentAttributeMapAsComposite(Pane<? extends ReadOnlyPersistentAttribute> parentPane, Composite parent, PropertyValueModel<Boolean> enabledModel) {
 		super(parentPane, parent, enabledModel);
 	}
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentTypeDetailsPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentTypeDetailsPageManager.java
index 088c69d527..5ae724247b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentTypeDetailsPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentTypeDetailsPageManager.java
@@ -10,7 +10,7 @@
 package org.eclipse.jpt.jpa.ui.internal.details;
 
 import java.util.HashMap;
-import java.util.Map;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.util.ControlSwitcher;
 import org.eclipse.jpt.common.utility.filter.Filter;
@@ -28,50 +28,31 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.part.PageBook;
 
-/**
- * The abstract definition of the details page responsible to show the
- * information for an persistent type.
- *
- * @see PersistentType
- *
- * @version 2.2
- * @since 1.0
- */
-public class PersistentTypeDetailsPage extends AbstractJpaDetailsPage<PersistentType>
+public class PersistentTypeDetailsPageManager
+	extends AbstractJpaDetailsPageManager<PersistentType>
 {
-	private Map<String, JpaComposite> mappingComposites;
+	private final HashMap<String, JpaComposite> mappingComposites = new HashMap<String, JpaComposite>();
 	private PageBook mappingPageBook;
 	private PropertyValueModel<TypeMapping> mappingHolder;
 
-	/**
-	 * Creates a new <code>PersistentTypeDetailsPage</code>.
-	 *
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public PersistentTypeDetailsPage(Composite parent,
-                                    WidgetFactory widgetFactory) {
 
-		super(parent, widgetFactory);
+	public PersistentTypeDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		super(parent, widgetFactory, resourceManager);
 	}
 
 	@Override
 	protected void initialize() {
 		super.initialize();
-		this.mappingComposites = new HashMap<String, JpaComposite>();
 	}
 	
 	@Override
 	protected void initializeLayout(Composite container) {
 		new PersistentTypeMapAsComposite(this, container);
-
-		// Type properties page
-		this.buildMappingPageBook(container);
+		this.mappingPageBook = this.buildMappingPageBook(container);
 	}
 
 	protected PageBook buildMappingPageBook(Composite parent) {
-
-		this.mappingPageBook = new PageBook(parent, SWT.NONE);
+		PageBook book = new PageBook(parent, SWT.NONE);
 
 		GridData gridData = new GridData();
 		gridData.horizontalAlignment       = SWT.FILL;
@@ -79,13 +60,12 @@ public class PersistentTypeDetailsPage extends AbstractJpaDetailsPage<Persistent
 		gridData.verticalIndent = 5;
 		gridData.grabExcessHorizontalSpace = true;
 		gridData.grabExcessVerticalSpace   = true;
-
-		this.mappingPageBook.setLayoutData(gridData);
+		book.setLayoutData(gridData);
 		
 		this.mappingHolder = this.buildMappingHolder();
-		new ControlSwitcher(this.mappingHolder, this.buildPaneTransformer(), this.mappingPageBook);
+		new ControlSwitcher(this.mappingHolder, this.buildPaneTransformer(), book);
 
-		return this.mappingPageBook;
+		return book;
 	}
 	
 	private Transformer<TypeMapping, Control> buildPaneTransformer() {
@@ -125,28 +105,25 @@ public class PersistentTypeDetailsPage extends AbstractJpaDetailsPage<Persistent
 
 	
 	/* CU private */ JpaComposite getMappingComposite(String key) {
-		JpaComposite mappingComposite = this.mappingComposites.get(key);
-		if (mappingComposite != null) {
-			return mappingComposite;
-		}
-
-		mappingComposite = buildMappingComposite(this.mappingPageBook, key);
-
-		if (mappingComposite != null) {
-			this.mappingComposites.put(key, mappingComposite);
+		JpaComposite composite = this.mappingComposites.get(key);
+		if (composite == null) {
+			composite = this.buildMappingComposite(this.mappingPageBook, key);
+			if (composite != null) {
+				this.mappingComposites.put(key, composite);
+			}
 		}
-
-		return mappingComposite;
+		return composite;
 	}
 	
 	protected JpaComposite buildMappingComposite(PageBook pageBook, String key) {
-		return getJpaPlatformUi().
-			buildTypeMappingComposite(
-				getSubject().getResourceType(), 
+		return this.getJpaPlatformUi().buildTypeMappingComposite(
+				this.getSubject().getResourceType(), 
 				key, 
 				pageBook, 
-				buildMappingHolder(key), 
-				getWidgetFactory());
+				this.buildMappingHolder(key), 
+				this.getWidgetFactory(),
+				this.getResourceManager()
+			);
 	}
 
 	@Override
@@ -157,5 +134,5 @@ public class PersistentTypeDetailsPage extends AbstractJpaDetailsPage<Persistent
 		super.controlDisposed();
 	}
 
-	private static final String TRACE_OPTION = PersistentTypeDetailsPage.class.getSimpleName();
-}
-\ No newline at end of file
+	private static final String TRACE_OPTION = PersistentTypeDetailsPageManager.class.getSimpleName();
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentTypeMapAsComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentTypeMapAsComposite.java
index 337f09454e..7d23fc4696 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentTypeMapAsComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentTypeMapAsComposite.java
@@ -23,16 +23,7 @@ import org.eclipse.swt.widgets.Composite;
 public class PersistentTypeMapAsComposite
 	extends MapAsComposite<PersistentType>
 {
-	/**
-	 * Creates a new <code>PersistentTypeMapAsComposite</code>.
-	 *
-	 * @param parentPane The parent pane of this one
-	 * @param parent The parent container
-	 */
-	public PersistentTypeMapAsComposite(
-			Pane<? extends PersistentType> parentPane,
-	        Composite parent) {
-		
+	public PersistentTypeMapAsComposite(Pane<? extends PersistentType> parentPane, Composite parent) {
 		super(parentPane, parent);
 	}
 	
@@ -116,5 +107,4 @@ public class PersistentTypeMapAsComposite
 			updateDescription();
 		}
 	}
-
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PrimaryKeyJoinColumnDialog.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PrimaryKeyJoinColumnDialog.java
index 960b9843fb..d474e2b728 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PrimaryKeyJoinColumnDialog.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PrimaryKeyJoinColumnDialog.java
@@ -9,100 +9,61 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.internal.widgets.DialogPane;
 import org.eclipse.jpt.jpa.core.context.Entity;
 import org.eclipse.jpt.jpa.core.context.PrimaryKeyJoinColumn;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Shell;
 
-/**
- * This dialog is used to either create or edit a primary key join column that
- * is located on an entity.
- *
- * @see PrimaryKeyJoinColumn
- * @see Entity
- * @see PrimaryKeyJoinColumnStateObject
- * @see BaseJoinColumnDialogPane
- *
- * @version 2.0
- * @since 2.0
- */
-public class PrimaryKeyJoinColumnDialog extends BaseJoinColumnDialog<PrimaryKeyJoinColumnStateObject> {
+public class PrimaryKeyJoinColumnDialog
+	extends BaseJoinColumnDialog<Entity, PrimaryKeyJoinColumn, PrimaryKeyJoinColumnStateObject>
+{
+	/**
+	 * Use this constructor to create a <em>new</em> join column.
+	 */
+	protected PrimaryKeyJoinColumnDialog(
+			Shell parentShell,
+			ResourceManager resourceManager,
+			Entity entity) {
+		this(parentShell, resourceManager, entity, null);
+	}
 
 	/**
-	 * Creates a new <code>PrimaryKeyJoinColumnDialog</code>.
-	 *
-	 * @param parent The parent shell
-	 * @param entity The owner of the join column to create or where it is
-	 * located
-	 * @param joinColumn Either the join column to edit or <code>null</code> if
-	 * this state object is used to create a new one
+	 * Use this constructor to edit an <em>existing</em> join column.
 	 */
-	public PrimaryKeyJoinColumnDialog(Shell parent,
-	                                  Entity entity,
-	                                  PrimaryKeyJoinColumn joinColumn) {
+	protected PrimaryKeyJoinColumnDialog(
+			Shell parentShell,
+			ResourceManager resourceManager,
+			Entity entity,
+			PrimaryKeyJoinColumn joinColumn) {
+		super(parentShell, resourceManager, entity, joinColumn, buildTitle(joinColumn));
+	}
 
-		super(parent, entity, joinColumn);
+	private static String buildTitle(PrimaryKeyJoinColumn joinColumn) {
+		return (joinColumn == null) ?
+				JptUiDetailsMessages.PrimaryKeyJoinColumnDialog_addTitle :
+				JptUiDetailsMessages.PrimaryKeyJoinColumnDialog_editTitle;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 */
 	@Override
 	protected DialogPane<PrimaryKeyJoinColumnStateObject> buildLayout(Composite container) {
 		return new BaseJoinColumnDialogPane<PrimaryKeyJoinColumnStateObject>(
-			getSubjectHolder(),
-			container
-		);
+				this.getSubjectHolder(),
+				container,
+				this.resourceManager
+			);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 */
 	@Override
 	protected PrimaryKeyJoinColumnStateObject buildStateObject() {
-		return new PrimaryKeyJoinColumnStateObject(getOwner(), getJoinColumn());
+		return new PrimaryKeyJoinColumnStateObject(this.getOwner(), this.getJoinColumn());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 */
 	@Override
 	protected String getDescriptionTitle() {
-
-		if (getJoinColumn() == null) {
-			return JptUiDetailsMessages.PrimaryKeyJoinColumnDialog_addDescriptionTitle;
-		}
-
-		return JptUiDetailsMessages.PrimaryKeyJoinColumnDialog_editDescriptionTitle;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 */
-	@Override
-	public PrimaryKeyJoinColumn getJoinColumn() {
-		return (PrimaryKeyJoinColumn) super.getJoinColumn();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 */
-	@Override
-	protected Entity getOwner() {
-		return (Entity) super.getOwner();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 */
-	@Override
-	protected String getTitle() {
-
-		if (getJoinColumn() == null) {
-			return JptUiDetailsMessages.PrimaryKeyJoinColumnDialog_addTitle;
-		}
-
-		return JptUiDetailsMessages.PrimaryKeyJoinColumnDialog_editTitle;
+		return (this.getJoinColumn() == null) ?
+				JptUiDetailsMessages.PrimaryKeyJoinColumnDialog_addDescriptionTitle :
+				JptUiDetailsMessages.PrimaryKeyJoinColumnDialog_editDescriptionTitle;
 	}
-}
-\ No newline at end of file
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PrimaryKeyJoinColumnInSecondaryTableDialog.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PrimaryKeyJoinColumnInSecondaryTableDialog.java
index 257bc5f1ee..e0375b877d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PrimaryKeyJoinColumnInSecondaryTableDialog.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PrimaryKeyJoinColumnInSecondaryTableDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2009 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2012 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,103 +9,61 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.internal.widgets.DialogPane;
-import org.eclipse.jpt.jpa.core.context.PrimaryKeyJoinColumn;
-import org.eclipse.jpt.jpa.core.context.SecondaryTable;
+import org.eclipse.jpt.jpa.core.context.ReadOnlyPrimaryKeyJoinColumn;
+import org.eclipse.jpt.jpa.core.context.ReadOnlySecondaryTable;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Shell;
 
-/**
- * This dialog is used to either create or edit a primary key joing column that
- * is within a secondary table.
- *
- * @see PrimaryKeyJoinColumn
- * @see SecondaryTable
- * @see BaseJoinColumnDialogPane
- * @see PrimaryKeyJoinColumnInSecondaryTableStateObject
- *
- * @version 2.0
- * @since 2.0
- */
-public class PrimaryKeyJoinColumnInSecondaryTableDialog extends BaseJoinColumnDialog<PrimaryKeyJoinColumnInSecondaryTableStateObject> {
+public class PrimaryKeyJoinColumnInSecondaryTableDialog
+	extends BaseJoinColumnDialog<ReadOnlySecondaryTable, ReadOnlyPrimaryKeyJoinColumn, PrimaryKeyJoinColumnInSecondaryTableStateObject>
+{
+	/**
+	 * Use this constructor to create a <em>new</em> join column.
+	 */
+	protected PrimaryKeyJoinColumnInSecondaryTableDialog(
+			Shell parentShell,
+			ResourceManager resourceManager,
+			ReadOnlySecondaryTable secondaryTable) {
+		this(parentShell, resourceManager, secondaryTable, null);
+	}
 
 	/**
-	 * Creates a new <code>PrimaryKeyJoinColumnInSecondaryTableDialog</code>.
-	 *
-	 * @param parent The parent shell
-	 * @param secondaryTable The owner of the join column to create or where it
-	 * is located
-	 * @param joinColumn Either the join column to edit or <code>null</code> if
-	 * this state object is used to create a new one
+	 * Use this constructor to edit an <em>existing</em> join column.
 	 */
-	public PrimaryKeyJoinColumnInSecondaryTableDialog(Shell parent,
-	                                                  SecondaryTable secondaryTable,
-	                                                  PrimaryKeyJoinColumn joinColumn) {
+	protected PrimaryKeyJoinColumnInSecondaryTableDialog(
+			Shell parentShell,
+			ResourceManager resourceManager,
+			ReadOnlySecondaryTable secondaryTable,
+			ReadOnlyPrimaryKeyJoinColumn joinColumn) {
+		super(parentShell, resourceManager, secondaryTable, joinColumn, buildTitle(joinColumn));
+	}
 
-		super(parent, secondaryTable, joinColumn);
+	private static String buildTitle(ReadOnlyPrimaryKeyJoinColumn joinColumn) {
+		return (joinColumn == null) ?
+				JptUiDetailsMessages.PrimaryKeyJoinColumnInSecondaryTableDialog_addTitle :
+				JptUiDetailsMessages.PrimaryKeyJoinColumnInSecondaryTableDialog_editTitle;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 */
 	@Override
 	protected DialogPane<PrimaryKeyJoinColumnInSecondaryTableStateObject> buildLayout(Composite container) {
 		return new BaseJoinColumnDialogPane<PrimaryKeyJoinColumnInSecondaryTableStateObject>(
-			getSubjectHolder(),
-			container
-		);
+				this.getSubjectHolder(),
+				container,
+				this.resourceManager
+			);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 */
 	@Override
 	protected PrimaryKeyJoinColumnInSecondaryTableStateObject buildStateObject() {
-		return new PrimaryKeyJoinColumnInSecondaryTableStateObject(
-			getOwner(),
-			getJoinColumn()
-		);
+		return new PrimaryKeyJoinColumnInSecondaryTableStateObject(this.getOwner(), this.getJoinColumn());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 */
 	@Override
 	protected String getDescriptionTitle() {
-
-		if (getJoinColumn() == null) {
-			return JptUiDetailsMessages.PrimaryKeyJoinColumnInSecondaryTableDialog_addDescriptionTitle;
-		}
-
-		return JptUiDetailsMessages.PrimaryKeyJoinColumnInSecondaryTableDialog_editDescriptionTitle;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 */
-	@Override
-	public PrimaryKeyJoinColumn getJoinColumn() {
-		return (PrimaryKeyJoinColumn) super.getJoinColumn();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 */
-	@Override
-	protected SecondaryTable getOwner() {
-		return (SecondaryTable) super.getOwner();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 */
-	@Override
-	protected String getTitle() {
-
-		if (getJoinColumn() == null) {
-			return JptUiDetailsMessages.PrimaryKeyJoinColumnInSecondaryTableDialog_addTitle;
-		}
-
-		return JptUiDetailsMessages.PrimaryKeyJoinColumnInSecondaryTableDialog_editTitle;
+		return (this.getJoinColumn() == null) ?
+				JptUiDetailsMessages.PrimaryKeyJoinColumnInSecondaryTableDialog_addDescriptionTitle :
+				JptUiDetailsMessages.PrimaryKeyJoinColumnInSecondaryTableDialog_editDescriptionTitle;
 	}
-}
-\ No newline at end of file
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PrimaryKeyJoinColumnInSecondaryTableStateObject.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PrimaryKeyJoinColumnInSecondaryTableStateObject.java
index 0ed7fbfd85..c4c74bf8de 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PrimaryKeyJoinColumnInSecondaryTableStateObject.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PrimaryKeyJoinColumnInSecondaryTableStateObject.java
@@ -10,9 +10,10 @@
 package org.eclipse.jpt.jpa.ui.internal.details;
 
 import java.util.ListIterator;
-
 import org.eclipse.jpt.common.utility.internal.iterator.SingleElementListIterator;
 import org.eclipse.jpt.jpa.core.context.PrimaryKeyJoinColumn;
+import org.eclipse.jpt.jpa.core.context.ReadOnlyPrimaryKeyJoinColumn;
+import org.eclipse.jpt.jpa.core.context.ReadOnlySecondaryTable;
 import org.eclipse.jpt.jpa.core.context.SecondaryTable;
 import org.eclipse.jpt.jpa.db.Table;
 
@@ -23,78 +24,48 @@ import org.eclipse.jpt.jpa.db.Table;
  * @see PrimaryKeyJoinColumn
  * @see SecondaryTable
  * @see PrimaryKeyJoinColumnInSecondaryTableDialog
- *
- * @version 2.0
- * @since 2.0
  */
-public class PrimaryKeyJoinColumnInSecondaryTableStateObject extends BaseJoinColumnStateObject
+public class PrimaryKeyJoinColumnInSecondaryTableStateObject
+	extends BaseJoinColumnStateObject
 {
-	/**
-	 * Creates a new <code>PrimaryKeyJoinColumnInSecondaryTableStateObject</code>.
-	 *
-	 * @param secondaryTable The owner of the join column to create or where it
-	 * is located
-	 * @param joinColumn The join column to edit or <code>null</code> if it is to
-	 * create a new one
-	 */
-	public PrimaryKeyJoinColumnInSecondaryTableStateObject(SecondaryTable secondaryTable,
-	                                                       PrimaryKeyJoinColumn joinColumn) {
-
+	public PrimaryKeyJoinColumnInSecondaryTableStateObject(
+			ReadOnlySecondaryTable secondaryTable,
+			ReadOnlyPrimaryKeyJoinColumn joinColumn) {
 		super(secondaryTable, joinColumn);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 */
 	@Override
 	public String getDefaultTable() {
 		return null;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 */
 	@Override
-	public PrimaryKeyJoinColumn getJoinColumn() {
-		return (PrimaryKeyJoinColumn) super.getJoinColumn();
+	public ReadOnlyPrimaryKeyJoinColumn getJoinColumn() {
+		return (ReadOnlyPrimaryKeyJoinColumn) super.getJoinColumn();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 */
 	@Override
 	public Table getNameTable() {
 		return getOwner().getDbTable();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 */
 	@Override
-	public SecondaryTable getOwner() {
-		return (SecondaryTable) super.getOwner();
+	public ReadOnlySecondaryTable getOwner() {
+		return (ReadOnlySecondaryTable) super.getOwner();
 	}
 
-	/* (non-Javadoc)
-	 */
 	@Override
 	public Table getReferencedNameTable() {
 		return getOwner().getParent().getPrimaryDbTable();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 */
 	@Override
 	protected String getInitialTable() {
 		return getOwner().getName();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 */
 	@Override
 	public ListIterator<String> tables() {
 		return new SingleElementListIterator<String>(getInitialTable());
 	}
-}
-\ No newline at end of file
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PrimaryKeyJoinColumnsInSecondaryTableComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PrimaryKeyJoinColumnsInSecondaryTableComposite.java
index c9d60db736..8cf42a61b2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PrimaryKeyJoinColumnsInSecondaryTableComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PrimaryKeyJoinColumnsInSecondaryTableComposite.java
@@ -13,7 +13,6 @@ import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.AddRemoveListPane;
 import org.eclipse.jpt.common.ui.internal.widgets.AddRemovePane;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
@@ -32,6 +31,7 @@ import org.eclipse.jpt.common.utility.model.value.ListValueModel;
 import org.eclipse.jpt.common.utility.model.value.ModifiableCollectionValueModel;
 import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
+import org.eclipse.jpt.jpa.core.context.BaseJoinColumn;
 import org.eclipse.jpt.jpa.core.context.PrimaryKeyJoinColumn;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseJoinColumn;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn;
@@ -44,63 +44,22 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * | - Join Columns ---------------------------------------------------------- |
- * | |                                                                       | |
- * | | x Override Default                                                    | |
- * | |                                                                       | |
- * | | --------------------------------------------------------------------- | |
- * | | |                                                                   | | |
- * | | | AddRemoveListPane                                                 | | |
- * | | |                                                                   | | |
- * | | --------------------------------------------------------------------- | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see SecondaryTable
- * @see AddRemoveListPane
- *
- * @version 2.0
- * @since 1.0
- */
-public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends Pane<ReadOnlySecondaryTable>
+public class PrimaryKeyJoinColumnsInSecondaryTableComposite
+	extends Pane<ReadOnlySecondaryTable>
 {
 	private ModifiableCollectionValueModel<PrimaryKeyJoinColumn> selectedPkJoinColumnsModel;
 
-	/**
-	 * Creates a new <code>PrimaryKeyJoinColumnsInSecondaryTableComposite</code>.
-	 *
-	 * @param parentPane The parent container of this one
-	 * @param subjectHolder The holder of this pane's subject
-	 * @param parent The parent container
-	 */
-	public PrimaryKeyJoinColumnsInSecondaryTableComposite(Pane<?> parentPane,
-	                                                      PropertyValueModel<? extends ReadOnlySecondaryTable> subjectHolder,
-	                                                      Composite parent) {
-
-		super(parentPane, subjectHolder, parent);
-	}
 
-	/**
-	 * Creates a new <code>PrimaryKeyJoinColumnsInSecondaryTableComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>ISecondaryTable</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public PrimaryKeyJoinColumnsInSecondaryTableComposite(PropertyValueModel<? extends ReadOnlySecondaryTable> subjectHolder,
-	                                                      Composite parent,
-	                                                      WidgetFactory widgetFactory) {
-
-		super(subjectHolder, parent, widgetFactory);
+	public PrimaryKeyJoinColumnsInSecondaryTableComposite(
+			Pane<?> parent,
+			PropertyValueModel<? extends ReadOnlySecondaryTable> tableModel,
+			Composite parentComposite) {
+		super(parent, tableModel, parentComposite);
 	}
 
 	PrimaryKeyJoinColumn addJoinColumn(PrimaryKeyJoinColumnInSecondaryTableStateObject stateObject) {
 
-		SecondaryTable secondaryTable = stateObject.getOwner();
+		SecondaryTable secondaryTable = (SecondaryTable) stateObject.getOwner();
 		int index = secondaryTable.getSpecifiedPrimaryKeyJoinColumnsSize();
 
 		PrimaryKeyJoinColumn joinColumn = secondaryTable.addSpecifiedPrimaryKeyJoinColumn(index);
@@ -110,16 +69,10 @@ public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends Pane<ReadOnl
 	}
 
 	PrimaryKeyJoinColumn addPrimaryKeyJoinColumn() {
-
-		PrimaryKeyJoinColumnInSecondaryTableDialog dialog =
-			new PrimaryKeyJoinColumnInSecondaryTableDialog(getShell(), (SecondaryTable) getSubject(), null);
-
+		PrimaryKeyJoinColumnInSecondaryTableDialog dialog = new PrimaryKeyJoinColumnInSecondaryTableDialog(this.getShell(), this.getResourceManager(), this.getSubject());
 		dialog.setBlockOnOpen(true);
 		dialog.open();
-		if (dialog.wasConfirmed()) {
-			return addJoinColumn(dialog.getSubject());
-		}
-		return null;
+		return (dialog.wasConfirmed()) ? this.addJoinColumn(dialog.getSubject()) : null;
 	}
 
 	private PropertyValueModel<Boolean> buildControlBooleanHolder() {
@@ -275,14 +228,7 @@ public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends Pane<ReadOnl
 	}
 
 	void editPrimaryKeyJoinColumn(PrimaryKeyJoinColumn joinColumn) {
-
-		PrimaryKeyJoinColumnInSecondaryTableDialog dialog =
-			new PrimaryKeyJoinColumnInSecondaryTableDialog(
-				getShell(),
-				(SecondaryTable) getSubject(),
-				joinColumn
-			);
-
+		PrimaryKeyJoinColumnInSecondaryTableDialog dialog = new PrimaryKeyJoinColumnInSecondaryTableDialog(this.getShell(), this.getResourceManager(), this.getSubject(), joinColumn);
 		dialog.setBlockOnOpen(true);
 		dialog.open();
 		if (dialog.wasConfirmed()) {
@@ -291,7 +237,7 @@ public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends Pane<ReadOnl
 	}
 
 	void editPrimaryKeyJoinColumn(PrimaryKeyJoinColumnInSecondaryTableStateObject stateObject) {
-		stateObject.updateJoinColumn(stateObject.getJoinColumn());
+		stateObject.updateJoinColumn((BaseJoinColumn) stateObject.getJoinColumn());
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/QueriesComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/QueriesComposite.java
index 1321828328..6de84ea3e7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/QueriesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/QueriesComposite.java
@@ -154,7 +154,7 @@ public class QueriesComposite extends Pane<QueryContainer>
 	}
 
 	protected AddQueryDialog buildAddQueryDialog() {
-		return new AddQueryDialog(getShell(), this.getSubject().getPersistenceUnit());
+		return new AddQueryDialog(getShell(), this.getResourceManager(), this.getSubject().getPersistenceUnit());
 	}
 
 	protected Query addQueryFromDialog(AddQueryDialog dialog) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ReferenceTableComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ReferenceTableComposite.java
index e11a7f9ef2..59bf1afc6a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ReferenceTableComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ReferenceTableComposite.java
@@ -11,7 +11,6 @@ package org.eclipse.jpt.jpa.ui.internal.details;
 
 import java.util.Arrays;
 import java.util.Collection;
-import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.internal.ArrayTools;
 import org.eclipse.jpt.common.utility.internal.iterable.SuperListIterableWrapper;
@@ -40,7 +39,6 @@ import org.eclipse.jpt.jpa.ui.internal.details.db.TableCombo;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 
-
 public abstract class ReferenceTableComposite<T extends ReadOnlyReferenceTable>
 	extends Pane<T>
 {
@@ -48,42 +46,19 @@ public abstract class ReferenceTableComposite<T extends ReadOnlyReferenceTable>
 
 	protected JoinColumnsComposite<T> joinColumnsComposite;
 
-	/**
-	 * Creates a new <code>ReferenceTableComposite</code>.
-	 *
-	 * @param parentPane The parent container of this one
-	 * @param subjectHolder The holder of this pane's subject
-	 * @param parent The parent container
-	 */
 	protected ReferenceTableComposite(
 			Pane<?> parentPane,
-			PropertyValueModel<? extends T> subjectHolder,
-			Composite parent) {
-
-		super(parentPane, subjectHolder, parent);
+			PropertyValueModel<? extends T> tableModel,
+			Composite parentComposite) {
+		super(parentPane, tableModel, parentComposite);
 	}
 
 	protected ReferenceTableComposite(
-		Pane<?> parentPane,
-		PropertyValueModel<? extends T> subjectHolder,
-		PropertyValueModel<Boolean> enabledModel,
-		Composite parent) {
-
-	super(parentPane, subjectHolder, enabledModel, parent);
-}
-
-	/**
-	 * Creates a new <code>ReferenceTableComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>CollectionTable2_0</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	protected ReferenceTableComposite(PropertyValueModel<? extends T> subjectHolder,
-	                          Composite parent,
-	                          WidgetFactory widgetFactory) {
-
-		super(subjectHolder, parent, widgetFactory);
+			Pane<?> parentPane,
+			PropertyValueModel<? extends T> tableModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite) {
+		super(parentPane, tableModel, enabledModel, parentComposite);
 	}
 
 
@@ -93,8 +68,7 @@ public abstract class ReferenceTableComposite<T extends ReadOnlyReferenceTable>
 
 	JoinColumn addJoinColumn(T referenceTable) {
 
-		JoinColumnInReferenceTableDialog dialog =
-			new JoinColumnInReferenceTableDialog(getShell(), referenceTable, null);
+		JoinColumnInReferenceTableDialog dialog = new JoinColumnInReferenceTableDialog(this.getShell(), this.getResourceManager(), referenceTable);
 
 		dialog.setBlockOnOpen(true);
 		dialog.open();
@@ -282,8 +256,7 @@ public abstract class ReferenceTableComposite<T extends ReadOnlyReferenceTable>
 
 	void editJoinColumn(ReadOnlyJoinColumn joinColumn) {
 
-		JoinColumnInReferenceTableDialog dialog =
-			new JoinColumnInReferenceTableDialog(getShell(), getSubject(), joinColumn);
+		JoinColumnInReferenceTableDialog dialog = new JoinColumnInReferenceTableDialog(this.getShell(), this.getResourceManager(), this.getSubject(), joinColumn);
 
 		dialog.setBlockOnOpen(true);
 		dialog.open();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/TemporalTypeCombo.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/TemporalTypeCombo.java
index 74e418a931..d883bdcc27 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/TemporalTypeCombo.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/TemporalTypeCombo.java
@@ -11,12 +11,10 @@ package org.eclipse.jpt.jpa.ui.internal.details;
 
 import java.util.Comparator;
 import java.util.List;
-import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.internal.collection.ListTools;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.internal.model.value.SimpleListValueModel;
-import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
 import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter;
 import org.eclipse.jpt.common.utility.model.value.ListValueModel;
 import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
@@ -52,12 +50,8 @@ public class TemporalTypeCombo extends Pane<BaseTemporalConverter> {
 	private Control combo;
 
 
-	public TemporalTypeCombo(PropertyValueModel<? extends BaseTemporalConverter> subjectHolder,
-								PropertyValueModel<Boolean> enabledModel,
-        						Composite parent,
-        						WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public TemporalTypeCombo(Pane<?> parentPane, PropertyValueModel<? extends BaseTemporalConverter> subjectModel, Composite parentComposite) {
+		super(parentPane, subjectModel, parentComposite);
 	}
 
 	@Override
@@ -138,11 +132,6 @@ public class TemporalTypeCombo extends Pane<BaseTemporalConverter> {
 	}
 
 	protected PropertyValueModel<Boolean> buildBooleanHolder() {
-		return new TransformationPropertyValueModel<BaseTemporalConverter, Boolean>(getSubjectHolder()) {
-			@Override
-			protected Boolean transform(BaseTemporalConverter value) {
-				return Boolean.valueOf(value != null);
-			}
-		};
+		return this.buildNotNullSubjectModel();
 	}
-}
-\ No newline at end of file
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/TransientMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/TransientMappingComposite.java
index 066da8eead..7ae6e609a1 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/TransientMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/TransientMappingComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -16,36 +17,21 @@ import org.eclipse.jpt.jpa.core.context.TransientMapping;
 import org.eclipse.jpt.jpa.ui.details.JpaComposite;
 import org.eclipse.swt.widgets.Composite;
 
-/**
- * This pane does not have any widgets.
- *
- * @see TransientMapping
- *
- * @version 2.0
- * @since 1.0
- */
-public class TransientMappingComposite extends Pane<TransientMapping>
-                                       implements JpaComposite
+public class TransientMappingComposite
+	extends Pane<TransientMapping>
+	implements JpaComposite
 {
-	/**
-	 * Creates a new <code>TransientMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>ITransientMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public TransientMappingComposite(PropertyValueModel<? extends TransientMapping> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-	                                WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public TransientMappingComposite(
+			PropertyValueModel<? extends TransientMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 */
 	@Override
 	protected void initializeLayout(Composite container) {
+		// NOP
 	}
 }
 \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/VersionMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/VersionMappingComposite.java
index b8c8601b6b..a0780e747c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/VersionMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/VersionMappingComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.VersionMapping;
@@ -30,30 +31,17 @@ import org.eclipse.swt.widgets.Control;
  * | |                                                                       | |
  * | ------------------------------------------------------------------------- |
  * -----------------------------------------------------------------------------</pre>
- *
- * @see VersionMapping
- * @see ColumnComposite
- * @see TemporalTypeCombo
- *
- * @version 2.3
- * @since 1.0
  */
 public class VersionMappingComposite 
 	extends AbstractVersionMappingComposite<VersionMapping>
 {
-	/**
-	 * Creates a new <code>VersionMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>IVersionMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public VersionMappingComposite(PropertyValueModel<? extends VersionMapping> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-									WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public VersionMappingComposite(
+			PropertyValueModel<? extends VersionMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/AbstractJavaResourceUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/AbstractJavaResourceUiDefinition.java
index 12e85675fa..4c205714a3 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/AbstractJavaResourceUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/AbstractJavaResourceUiDefinition.java
@@ -11,6 +11,7 @@ package org.eclipse.jpt.jpa.ui.internal.details.java;
 
 import java.util.ArrayList;
 import java.util.List;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.core.JptResourceType;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.jface.SimpleItemTreeStateProviderFactoryProvider;
@@ -81,9 +82,9 @@ public abstract class AbstractJavaResourceUiDefinition
 
 	// ********** type mappings **********
 
-	public JpaComposite buildTypeMappingComposite(String mappingKey, PropertyValueModel<TypeMapping> mappingModel, Composite parent, WidgetFactory widgetFactory) {
+	public JpaComposite buildTypeMappingComposite(String mappingKey, PropertyValueModel<TypeMapping> mappingModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
 		JavaTypeMappingUiDefinition<TypeMapping> definition = this.getJavaTypeMappingUiDefinition(mappingModel.getValue());
-		return definition.buildTypeMappingComposite(this.factory, mappingModel, parent, widgetFactory);
+		return definition.buildTypeMappingComposite(this.factory, mappingModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@SuppressWarnings("unchecked")
@@ -137,9 +138,9 @@ public abstract class AbstractJavaResourceUiDefinition
 
 	// ********** attribute mappings **********
 
-	public JpaComposite buildAttributeMappingComposite(String mappingKey, PropertyValueModel<AttributeMapping> mappingModel,PropertyValueModel<Boolean> enabledModel,  Composite parent, WidgetFactory widgetFactory) {
+	public JpaComposite buildAttributeMappingComposite(String mappingKey, PropertyValueModel<AttributeMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
 		JavaAttributeMappingUiDefinition<AttributeMapping> definition = this.getAttributeMappingUiDefinition(mappingModel.getValue());
-		return definition.buildAttributeMappingComposite(this.factory, mappingModel, enabledModel, parent, widgetFactory);
+		return definition.buildAttributeMappingComposite(this.factory, mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@SuppressWarnings("unchecked")
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/AbstractJavaUiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/AbstractJavaUiFactory.java
new file mode 100644
index 0000000000..d209d6647e
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/AbstractJavaUiFactory.java
@@ -0,0 +1,163 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ *
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.jpa.ui.internal.details.java;
+
+import org.eclipse.jface.resource.ResourceManager;
+import org.eclipse.jpt.common.ui.WidgetFactory;
+import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
+import org.eclipse.jpt.jpa.core.context.java.JavaBasicMapping;
+import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddable;
+import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddedIdMapping;
+import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddedMapping;
+import org.eclipse.jpt.jpa.core.context.java.JavaEntity;
+import org.eclipse.jpt.jpa.core.context.java.JavaIdMapping;
+import org.eclipse.jpt.jpa.core.context.java.JavaManyToManyMapping;
+import org.eclipse.jpt.jpa.core.context.java.JavaManyToOneMapping;
+import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass;
+import org.eclipse.jpt.jpa.core.context.java.JavaOneToManyMapping;
+import org.eclipse.jpt.jpa.core.context.java.JavaOneToOneMapping;
+import org.eclipse.jpt.jpa.core.context.java.JavaTransientMapping;
+import org.eclipse.jpt.jpa.core.context.java.JavaVersionMapping;
+import org.eclipse.jpt.jpa.ui.details.JpaComposite;
+import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory;
+import org.eclipse.jpt.jpa.ui.internal.details.BasicMappingComposite;
+import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedIdMappingComposite;
+import org.eclipse.jpt.jpa.ui.internal.details.IdMappingComposite;
+import org.eclipse.jpt.jpa.ui.internal.details.ManyToManyMappingComposite;
+import org.eclipse.jpt.jpa.ui.internal.details.ManyToOneMappingComposite;
+import org.eclipse.jpt.jpa.ui.internal.details.OneToManyMappingComposite;
+import org.eclipse.jpt.jpa.ui.internal.details.OneToOneMappingComposite;
+import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingComposite;
+import org.eclipse.jpt.jpa.ui.internal.details.VersionMappingComposite;
+import org.eclipse.jpt.jpa.ui.internal.jpa2.details.java.JavaEmbeddedMapping2_0Composite;
+import org.eclipse.swt.widgets.Composite;
+
+public abstract class AbstractJavaUiFactory
+	implements JavaUiFactory
+{
+	// ********** type mappings **********
+
+	public JpaComposite createJavaMappedSuperclassComposite(
+			PropertyValueModel<JavaMappedSuperclass> mappedSuperclassModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new JavaMappedSuperclassComposite(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager);
+	}
+
+	public JpaComposite createJavaEntityComposite(
+			PropertyValueModel<JavaEntity> entityModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new JavaEntityComposite(entityModel, parentComposite, widgetFactory, resourceManager);
+	}
+
+	public JpaComposite createJavaEmbeddableComposite(
+			PropertyValueModel<JavaEmbeddable> embeddableModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new JavaEmbeddableComposite(embeddableModel, parentComposite, widgetFactory, resourceManager);
+	}
+
+
+	// ********** attribute mappings **********
+
+	public JpaComposite createJavaIdMappingComposite(
+			PropertyValueModel<JavaIdMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new IdMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
+	}
+
+	public JpaComposite createJavaEmbeddedIdMappingComposite(
+			PropertyValueModel<JavaEmbeddedIdMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new EmbeddedIdMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
+	}
+
+	public JpaComposite createJavaBasicMappingComposite(
+			PropertyValueModel<JavaBasicMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new BasicMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
+	}
+
+	public JpaComposite createJavaVersionMappingComposite(
+			PropertyValueModel<JavaVersionMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new VersionMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
+	}
+
+	public JpaComposite createJavaManyToOneMappingComposite(
+			PropertyValueModel<JavaManyToOneMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new ManyToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
+	}
+
+	public JpaComposite createJavaOneToManyMappingComposite(
+			PropertyValueModel<JavaOneToManyMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OneToManyMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
+	}
+
+	public JpaComposite createJavaOneToOneMappingComposite(
+			PropertyValueModel<JavaOneToOneMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OneToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
+	}
+
+	public JpaComposite createJavaManyToManyMappingComposite(
+			PropertyValueModel<JavaManyToManyMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new ManyToManyMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
+	}
+
+	public JpaComposite createJavaEmbeddedMappingComposite(
+			PropertyValueModel<JavaEmbeddedMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new JavaEmbeddedMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
+	}
+
+	public JpaComposite createJavaTransientMappingComposite(
+			PropertyValueModel<JavaTransientMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new TransientMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
+	}
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/BaseJavaUiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/BaseJavaUiFactory.java
deleted file mode 100644
index f1b5780b3c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/BaseJavaUiFactory.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2012 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.ui.internal.details.java;
-
-import org.eclipse.jpt.common.ui.WidgetFactory;
-import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.jpa.core.context.java.JavaBasicMapping;
-import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddable;
-import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddedIdMapping;
-import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddedMapping;
-import org.eclipse.jpt.jpa.core.context.java.JavaEntity;
-import org.eclipse.jpt.jpa.core.context.java.JavaIdMapping;
-import org.eclipse.jpt.jpa.core.context.java.JavaManyToManyMapping;
-import org.eclipse.jpt.jpa.core.context.java.JavaManyToOneMapping;
-import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass;
-import org.eclipse.jpt.jpa.core.context.java.JavaOneToManyMapping;
-import org.eclipse.jpt.jpa.core.context.java.JavaOneToOneMapping;
-import org.eclipse.jpt.jpa.core.context.java.JavaTransientMapping;
-import org.eclipse.jpt.jpa.core.context.java.JavaVersionMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddable;
-import org.eclipse.jpt.jpa.core.context.orm.OrmEntity;
-import org.eclipse.jpt.jpa.core.context.orm.OrmMappedSuperclass;
-import org.eclipse.jpt.jpa.ui.details.JpaComposite;
-import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory;
-import org.eclipse.jpt.jpa.ui.internal.details.BasicMappingComposite;
-import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedIdMappingComposite;
-import org.eclipse.jpt.jpa.ui.internal.details.IdMappingComposite;
-import org.eclipse.jpt.jpa.ui.internal.details.ManyToManyMappingComposite;
-import org.eclipse.jpt.jpa.ui.internal.details.ManyToOneMappingComposite;
-import org.eclipse.jpt.jpa.ui.internal.details.OneToManyMappingComposite;
-import org.eclipse.jpt.jpa.ui.internal.details.OneToOneMappingComposite;
-import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingComposite;
-import org.eclipse.jpt.jpa.ui.internal.details.VersionMappingComposite;
-import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmEmbeddableComposite;
-import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmEntityComposite;
-import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmMappedSuperclassComposite;
-import org.eclipse.jpt.jpa.ui.internal.jpa2.details.java.JavaEmbeddedMapping2_0Composite;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * The default implementation of the UI factory required to show the information
- * related to a JPA mapping (type or attribute).
- */
-public abstract class BaseJavaUiFactory implements JavaUiFactory
-{	
-	
-	// **************** java type mapping composites ***************************
-	
-	public JpaComposite createJavaMappedSuperclassComposite(
-			PropertyValueModel<JavaMappedSuperclass> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new JavaMappedSuperclassComposite(subjectHolder, parent, widgetFactory);
-	}
-	
-	public JpaComposite createJavaEntityComposite(
-			PropertyValueModel<JavaEntity> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new JavaEntityComposite(subjectHolder, parent, widgetFactory);
-	}
-	
-	public JpaComposite createJavaEmbeddableComposite(
-			PropertyValueModel<JavaEmbeddable> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new JavaEmbeddableComposite(subjectHolder, parent, widgetFactory);
-	}
-	
-	
-	// **************** orm type mapping composites ****************************
-	
-	public JpaComposite createOrmMappedSuperclassComposite(
-			PropertyValueModel<OrmMappedSuperclass> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmMappedSuperclassComposite(subjectHolder, parent, widgetFactory);
-	}
-	
-	public JpaComposite createOrmEntityComposite(
-			PropertyValueModel<OrmEntity> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEntityComposite(subjectHolder, parent, widgetFactory);
-	}
-	
-	public JpaComposite createOrmEmbeddableComposite(
-			PropertyValueModel<OrmEmbeddable> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEmbeddableComposite(subjectHolder, parent, widgetFactory);
-	}
-	
-	
-	// **************** java attribute mapping composites **********************
-	
-	public JpaComposite createJavaIdMappingComposite(
-			PropertyValueModel<JavaIdMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new IdMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
-	}
-	
-	public JpaComposite createJavaEmbeddedIdMappingComposite(
-			PropertyValueModel<JavaEmbeddedIdMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new EmbeddedIdMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
-	}
-	
-	public JpaComposite createJavaBasicMappingComposite(
-			PropertyValueModel<JavaBasicMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new BasicMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
-	}
-	
-	public JpaComposite createJavaVersionMappingComposite(
-			PropertyValueModel<JavaVersionMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new VersionMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
-	}
-	
-	public JpaComposite createJavaManyToOneMappingComposite(
-			PropertyValueModel<JavaManyToOneMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new ManyToOneMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
-	}
-	
-	public JpaComposite createJavaOneToManyMappingComposite(
-			PropertyValueModel<JavaOneToManyMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OneToManyMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
-	}
-	
-	public JpaComposite createJavaOneToOneMappingComposite(
-			PropertyValueModel<JavaOneToOneMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OneToOneMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
-	}
-	
-	public JpaComposite createJavaManyToManyMappingComposite(
-			PropertyValueModel<JavaManyToManyMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new ManyToManyMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
-	}
-
-	public JpaComposite createJavaEmbeddedMappingComposite(
-			PropertyValueModel<JavaEmbeddedMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new JavaEmbeddedMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory);
-	}
-	
-	public JpaComposite createJavaTransientMappingComposite(
-			PropertyValueModel<JavaTransientMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new TransientMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/DefaultBasicMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/DefaultBasicMappingUiDefinition.java
index 7e911adfc0..976ebb3c59 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/DefaultBasicMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/DefaultBasicMappingUiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.MappingKeys;
@@ -64,13 +65,7 @@ public class DefaultBasicMappingUiDefinition
 		return JptUiDetailsMessages.DefaultBasicMappingUiProvider_linkLabel;
 	}
 
-	public JpaComposite buildAttributeMappingComposite(
-				JavaUiFactory factory,
-				PropertyValueModel<JavaBasicMapping> subjectHolder,
-				PropertyValueModel<Boolean> enabledModel,
-				Composite parent,
-				WidgetFactory widgetFactory) {
-
-		return factory.createJavaBasicMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+	public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaBasicMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return factory.createJavaBasicMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/DefaultEmbeddedMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/DefaultEmbeddedMappingUiDefinition.java
index 03ee6da4e2..9c028885ef 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/DefaultEmbeddedMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/DefaultEmbeddedMappingUiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.MappingKeys;
@@ -63,7 +64,7 @@ public class DefaultEmbeddedMappingUiDefinition
 		return JptUiDetailsMessages.DefaultEmbeddedMappingUiProvider_linkLabel;
 	}
 
-	public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaEmbeddedMapping> subjectHolder, PropertyValueModel<Boolean> enabledModel, Composite parent, WidgetFactory widgetFactory) {
-		return factory.createJavaEmbeddedMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+	public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaEmbeddedMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return factory.createJavaEmbeddedMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/GenericJavaUiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/GenericJavaUiFactory.java
index 7de34d3485..fb61fff6d5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/GenericJavaUiFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/GenericJavaUiFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2012 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,15 +9,8 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.java;
 
-/**
- * The default implementation of the Java UI factory required to show the information
- * related to a JPA mapping (type or attribute).
- *
- * @see JavaUiFactory
- *
- * @version 3.0
- * @since 3.0
- */
-public class GenericJavaUiFactory extends BaseJavaUiFactory
+public class GenericJavaUiFactory
+	extends AbstractJavaUiFactory
 {
+	// nothing
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaBasicMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaBasicMappingUiDefinition.java
index 1c4366b2e3..2c0ec46eeb 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaBasicMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaBasicMappingUiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
@@ -43,14 +44,7 @@ public class JavaBasicMappingUiDefinition
 		super();
 	}
 	
-	
-	public JpaComposite buildAttributeMappingComposite(
-			JavaUiFactory factory,
-			PropertyValueModel<JavaBasicMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return factory.createJavaBasicMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+	public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaBasicMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return factory.createJavaBasicMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEmbeddableComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEmbeddableComposite.java
index 072d742600..caa146dcab 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEmbeddableComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEmbeddableComposite.java
@@ -9,41 +9,29 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
+import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.Embeddable;
+import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddable;
 import org.eclipse.jpt.jpa.ui.details.JpaComposite;
-import org.eclipse.jpt.jpa.ui.internal.details.AbstractEmbeddableComposite;
 import org.eclipse.swt.widgets.Composite;
 
-/**
- * This pane does not have any widgets.
- *
- * @see Embeddable
- * @see EmbeddableUiProvider
- *
- * @version 2.3
- * @since 2.0
- */
-public class JavaEmbeddableComposite extends AbstractEmbeddableComposite<Embeddable>
-                                 implements JpaComposite
+public class JavaEmbeddableComposite
+	extends Pane<Embeddable>
+	implements JpaComposite
 {
-	/**
-	 * Creates a new <code>EmbeddableComposite</code>.
-	 *
-	 * @param subjectHolder The holder of this pane's subject
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public JavaEmbeddableComposite(PropertyValueModel<? extends Embeddable> subjectHolder,
-	                           Composite parent,
-	                           WidgetFactory widgetFactory) {
-
-		super(subjectHolder, parent, widgetFactory);
+	public JavaEmbeddableComposite(
+			PropertyValueModel<JavaEmbeddable> embeddableModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(embeddableModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
 	protected void initializeLayout(Composite container) {
-		//nothing
+		// NOP
 	}
 }
 \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEmbeddableUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEmbeddableUiDefinition.java
index 1c08a85eed..cd63b8d656 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEmbeddableUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEmbeddableUiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.PersistentType;
@@ -42,13 +43,7 @@ public class JavaEmbeddableUiDefinition
 		super();
 	}
 	
-	
-	public JpaComposite buildTypeMappingComposite(
-			JavaUiFactory factory,
-			PropertyValueModel<JavaEmbeddable> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return factory.createJavaEmbeddableComposite(subjectHolder, parent, widgetFactory);
+	public JpaComposite buildTypeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaEmbeddable> mappingModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return factory.createJavaEmbeddableComposite(mappingModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEmbeddedIdMappingUDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEmbeddedIdMappingUDefinition.java
index 70f2a4426a..0f05b99215 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEmbeddedIdMappingUDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEmbeddedIdMappingUDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
@@ -43,14 +44,7 @@ public class JavaEmbeddedIdMappingUDefinition
 		super();
 	}	
 	
-	
-	public JpaComposite buildAttributeMappingComposite(
-			JavaUiFactory factory,
-			PropertyValueModel<JavaEmbeddedIdMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return factory.createJavaEmbeddedIdMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+	public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaEmbeddedIdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return factory.createJavaEmbeddedIdMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEmbeddedMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEmbeddedMappingUiDefinition.java
index abcab5dd97..22cd615621 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEmbeddedMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEmbeddedMappingUiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
@@ -43,14 +44,7 @@ public class JavaEmbeddedMappingUiDefinition
 		super();
 	}
 	
-	
-	public JpaComposite buildAttributeMappingComposite(
-			JavaUiFactory factory,
-			PropertyValueModel<JavaEmbeddedMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return factory.createJavaEmbeddedMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+	public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaEmbeddedMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return factory.createJavaEmbeddedMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEntityComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEntityComposite.java
index fc83dd415f..4fd36a9713 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEntityComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEntityComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.java.JavaEntity;
@@ -16,30 +17,15 @@ import org.eclipse.jpt.jpa.ui.internal.details.AbstractEntityComposite;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 
-/**
- * The pane used for a Java entity.
- *
- * @see JavaEntity
- * @see JavaUiFactory - The factory creating this pane
- * @see JavaSecondaryTablesComposite
- *
- * @version 2.3
- * @since 1.0
- */
-public class JavaEntityComposite extends AbstractEntityComposite<JavaEntity>
+public class JavaEntityComposite
+	extends AbstractEntityComposite<JavaEntity>
 {
-	/**
-	 * Creates a new <code>JavaEntityComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>JavaEntity</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public JavaEntityComposite(PropertyValueModel<? extends JavaEntity> subjectHolder,
-	                           Composite parent,
-	                           WidgetFactory widgetFactory) {
-
-		super(subjectHolder, parent, widgetFactory);
+	public JavaEntityComposite(
+			PropertyValueModel<? extends JavaEntity> entityModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(entityModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEntityUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEntityUiDefinition.java
index 2ec685800a..9685764f5d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEntityUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEntityUiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.PersistentType;
@@ -43,13 +44,7 @@ public class JavaEntityUiDefinition
 		super();
 	}
 	
-	
-	public JpaComposite buildTypeMappingComposite(
-			JavaUiFactory factory,
-			PropertyValueModel<JavaEntity> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return factory.createJavaEntityComposite(subjectHolder, parent, widgetFactory);
+	public JpaComposite buildTypeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaEntity> mappingModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return factory.createJavaEntityComposite(mappingModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaIdMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaIdMappingUiDefinition.java
index 9175e4dd94..8e0b5a7853 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaIdMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaIdMappingUiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
@@ -43,14 +44,7 @@ public class JavaIdMappingUiDefinition
 		super();
 	}
 	
-	
-	public JpaComposite buildAttributeMappingComposite(
-			JavaUiFactory factory,
-			PropertyValueModel<JavaIdMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return factory.createJavaIdMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+	public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaIdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return factory.createJavaIdMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaManyToManyMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaManyToManyMappingUiDefinition.java
index e23a9ddc43..741a463acd 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaManyToManyMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaManyToManyMappingUiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
@@ -43,14 +44,7 @@ public class JavaManyToManyMappingUiDefinition
 		super();
 	}
 	
-	
-	public JpaComposite buildAttributeMappingComposite(
-			JavaUiFactory factory,
-			PropertyValueModel<JavaManyToManyMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return factory.createJavaManyToManyMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+	public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaManyToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return factory.createJavaManyToManyMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaManyToOneMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaManyToOneMappingUiDefinition.java
index bba0eacfa5..83e61d17b0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaManyToOneMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaManyToOneMappingUiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
@@ -43,14 +44,7 @@ public class JavaManyToOneMappingUiDefinition
 		super();
 	}
 	
-	
-	public JpaComposite buildAttributeMappingComposite(
-			JavaUiFactory factory,
-			PropertyValueModel<JavaManyToOneMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return factory.createJavaManyToOneMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+	public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaManyToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return factory.createJavaManyToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaMappedSuperclassComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaMappedSuperclassComposite.java
index 58fa35564f..6a4fa5b697 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaMappedSuperclassComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaMappedSuperclassComposite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2005, 2012 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass;
@@ -32,30 +33,15 @@ import org.eclipse.swt.widgets.Composite;
  * | |                                                                       | |
  * | ------------------------------------------------------------------------- |
  * -----------------------------------------------------------------------------</pre>
- *
- * @see MappedSuperclass
- * @see BaseJavaUiFactory - The factory creating this pane
- * @see IdClassComposite
- *
- * @version 2.3
- * @since 2.0
  */
-
 public class JavaMappedSuperclassComposite
 	extends AbstractJavaMappedSuperclassComposite
 {
-	/**
-	 * Creates a new <code>MappedSuperclassComposite</code>.
-	 *
-	 * @param subjectHolder The holder of this pane's subject
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
 	public JavaMappedSuperclassComposite(
-			PropertyValueModel<? extends JavaMappedSuperclass> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<? extends JavaMappedSuperclass> mappedSuperclassModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaMappedSuperclassUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaMappedSuperclassUiDefinition.java
index 14d0c967d3..421e8b317a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaMappedSuperclassUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaMappedSuperclassUiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.PersistentType;
@@ -43,13 +44,7 @@ public class JavaMappedSuperclassUiDefinition
 		super();
 	}
 	
-	
-	public JpaComposite buildTypeMappingComposite(
-			JavaUiFactory factory,
-			PropertyValueModel<JavaMappedSuperclass> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return factory.createJavaMappedSuperclassComposite(subjectHolder, parent, widgetFactory);
+	public JpaComposite buildTypeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaMappedSuperclass> mappingModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return factory.createJavaMappedSuperclassComposite(mappingModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaOneToManyMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaOneToManyMappingUiDefinition.java
index 10a1664b10..a92d3596b3 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaOneToManyMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaOneToManyMappingUiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
@@ -43,14 +44,7 @@ public class JavaOneToManyMappingUiDefinition
 		super();
 	}
 	
-	
-	public JpaComposite buildAttributeMappingComposite(
-			JavaUiFactory factory,
-			PropertyValueModel<JavaOneToManyMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return factory.createJavaOneToManyMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+	public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaOneToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return factory.createJavaOneToManyMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaOneToOneMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaOneToOneMappingUiDefinition.java
index d2bf660b3f..ba1824d52f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaOneToOneMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaOneToOneMappingUiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
@@ -42,15 +43,8 @@ public class JavaOneToOneMappingUiDefinition
 	private JavaOneToOneMappingUiDefinition() {
 		super();
 	}
-	
-	
-	public JpaComposite buildAttributeMappingComposite(
-			JavaUiFactory factory,
-			PropertyValueModel<JavaOneToOneMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return factory.createJavaOneToOneMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+
+	public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaOneToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return factory.createJavaOneToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentAttributeDetailsPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentAttributeDetailsPageManager.java
index 8d95725865..bb7dfde5a1 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentAttributeDetailsPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentAttributeDetailsPageManager.java
@@ -9,11 +9,12 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.StaticPropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.jpa.ui.internal.details.PersistentAttributeDetailsPage;
+import org.eclipse.jpt.jpa.ui.internal.details.PersistentAttributeDetailsPageManager;
 import org.eclipse.jpt.jpa.ui.internal.details.PersistentAttributeMapAsComposite;
 import org.eclipse.swt.widgets.Composite;
 
@@ -26,7 +27,7 @@ import org.eclipse.swt.widgets.Composite;
  * -----------------------------------------------------------------------------
  * | ------------------------------------------------------------------------- |
  * | |                                                                       | |
- * | | JavaPersistentAttributeMapAsComposite                                 | |
+ * | | PersistentAttributeMapAsComposite                                     | |
  * | |                                                                       | |
  * | ------------------------------------------------------------------------- |
  * | ------------------------------------------------------------------------- |
@@ -35,33 +36,21 @@ import org.eclipse.swt.widgets.Composite;
  * | |                                                                       | |
  * | ------------------------------------------------------------------------- |
  * -----------------------------------------------------------------------------</pre>
- *
+ * 
  * @see JavaPersistentAttribute
- * @see JavaPersistentTypeMapAsComposite
- *
- * @version 2.2
- * @since 2.0
+ * @see PersistentAttributeMapAsComposite
  */
-public class JavaPersistentAttributeDetailsPage
-	extends PersistentAttributeDetailsPage<JavaPersistentAttribute>
+public class JavaPersistentAttributeDetailsPageManager
+	extends PersistentAttributeDetailsPageManager<JavaPersistentAttribute>
 {
-	/**
-	 * Creates a new <code>JavaPersistentAttributeDetailsPage</code>.
-	 *
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public JavaPersistentAttributeDetailsPage(Composite parent,
-	                                          WidgetFactory widgetFactory) {
-
-		super(parent, widgetFactory);
+	public JavaPersistentAttributeDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		super(parent, widgetFactory, resourceManager);
 	}
 
 	@Override
 	protected void initializeLayout(Composite container) {
 		new PersistentAttributeMapAsComposite(this, container);
-
-		this.buildMappingPageBook(container);
+		super.initializeLayout(container);
 	}
 
 	private static final PropertyValueModel<Boolean> TRUE_ENABLED_MODEL = new StaticPropertyValueModel<Boolean>(Boolean.TRUE);
@@ -70,5 +59,4 @@ public class JavaPersistentAttributeDetailsPage
 	protected PropertyValueModel<Boolean> getMappingCompositeEnabledModel() {
 		return TRUE_ENABLED_MODEL;
 	}
-
-}
-\ No newline at end of file
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentAttributeDetailsProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentAttributeDetailsProvider.java
index 868fdb922b..a5737e92c5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentAttributeDetailsProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentAttributeDetailsProvider.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.core.resource.java.JavaResourceCompilationUnit;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.ObjectTools;
@@ -50,10 +51,7 @@ public class JavaPersistentAttributeDetailsProvider
 				&& structureNode.getResourceType().getContentType().equals(JavaResourceCompilationUnit.CONTENT_TYPE);
 	}
 	
-	public JpaDetailsPageManager<JavaPersistentAttribute> buildDetailsPageManager(
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return new JavaPersistentAttributeDetailsPage(parent, widgetFactory);
+	public JpaDetailsPageManager<? extends JpaStructureNode> buildDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return new JavaPersistentAttributeDetailsPageManager(parent, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentTypeDetailsProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentTypeDetailsProvider.java
index 63ce7ecf07..afd5472819 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentTypeDetailsProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentTypeDetailsProvider.java
@@ -9,15 +9,15 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.core.resource.java.JavaResourceCompilationUnit;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.ObjectTools;
 import org.eclipse.jpt.jpa.core.JpaStructureNode;
-import org.eclipse.jpt.jpa.core.context.PersistentType;
 import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType;
 import org.eclipse.jpt.jpa.ui.details.JpaDetailsPageManager;
 import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider;
-import org.eclipse.jpt.jpa.ui.internal.details.PersistentTypeDetailsPage;
+import org.eclipse.jpt.jpa.ui.internal.details.PersistentTypeDetailsPageManager;
 import org.eclipse.swt.widgets.Composite;
 
 /**
@@ -52,10 +52,7 @@ public class JavaPersistentTypeDetailsProvider
 				&& structureNode.getResourceType().getContentType().equals(JavaResourceCompilationUnit.CONTENT_TYPE);
 	}
 	
-	public JpaDetailsPageManager<PersistentType> buildDetailsPageManager(
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return new PersistentTypeDetailsPage(parent, widgetFactory);
+	public JpaDetailsPageManager<? extends JpaStructureNode> buildDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return new PersistentTypeDetailsPageManager(parent, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaTransientMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaTransientMappingUiDefinition.java
index 2d1fedd03b..ca4bba958d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaTransientMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaTransientMappingUiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
@@ -43,14 +44,7 @@ public class JavaTransientMappingUiDefinition
 		super();
 	}
 	
-	
-	public JpaComposite buildAttributeMappingComposite(
-			JavaUiFactory factory,
-			PropertyValueModel<JavaTransientMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return factory.createJavaTransientMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+	public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaTransientMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return factory.createJavaTransientMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaVersionMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaVersionMappingUiDefinition.java
index 6fefe6f56a..c49ab4dd3d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaVersionMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaVersionMappingUiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
@@ -43,14 +44,7 @@ public class JavaVersionMappingUiDefinition
 		super();
 	}
 	
-	
-	public JpaComposite buildAttributeMappingComposite(
-			JavaUiFactory factory,
-			PropertyValueModel<JavaVersionMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return factory.createJavaVersionMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+	public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaVersionMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return factory.createJavaVersionMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/NullJavaAttributeMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/NullJavaAttributeMappingUiDefinition.java
index 21e9991216..c5ac40b6b7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/NullJavaAttributeMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/NullJavaAttributeMappingUiDefinition.java
@@ -9,18 +9,21 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
 import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 import org.eclipse.jpt.jpa.ui.details.JpaComposite;
 import org.eclipse.jpt.jpa.ui.details.java.DefaultJavaAttributeMappingUiDefinition;
 import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory;
-import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
 import org.eclipse.jpt.jpa.ui.internal.details.AbstractMappingUiDefinition;
 import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages;
+import org.eclipse.jpt.jpa.ui.internal.details.MapAsComposite;
 import org.eclipse.swt.widgets.Composite;
 
 public class NullJavaAttributeMappingUiDefinition
@@ -58,24 +61,24 @@ public class NullJavaAttributeMappingUiDefinition
 	}
 
 	/**
-	 * The MapAsComposite in the JPA Details view will display this text for
-	 * an unmapped attribute:
+	 * The {@link MapAsComposite} in the JPA Details view will display this text for
+	 * an unmapped attribute:<pre>
 	 * Attribute 'foo' is not mapped, click here to change the mapping type.
-	 * 
+	 * </pre>
 	 * We are returning the part of the string that will appear to the user as 
-	 * a link that they can click: 'click here'
+	 * a link that they can click; i.e. 'click here'.
 	 */
 	public String getLinkLabel() {
 		return JptUiDetailsMessages.MapAsComposite_unmappedAttributeText_linkLabel;
 	}
 
 	@Override
-	protected String getImageKey() {
-		return JptUiIcons.NULL_ATTRIBUTE_MAPPING;
+	public ImageDescriptor getImageDescriptor() {
+		return JptJpaUiImages.NULL_ATTRIBUTE_MAPPING;
 	}
 
-	public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaAttributeMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parent, WidgetFactory widgetFactory) {
-		return new NullComposite(mappingModel, parent, widgetFactory);
+	public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaAttributeMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return new NullComposite(mappingModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 
@@ -85,8 +88,8 @@ public class NullJavaAttributeMappingUiDefinition
 		extends Pane<JavaAttributeMapping>
 		implements JpaComposite
 	{
-		NullComposite(PropertyValueModel<JavaAttributeMapping> mappingModel, Composite parent, WidgetFactory widgetFactory) {
-			super(mappingModel, parent, widgetFactory);
+		NullComposite(PropertyValueModel<JavaAttributeMapping> mappingModel, Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+			super(mappingModel, parent, widgetFactory, resourceManager);
 		}
 		
 		@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/NullJavaTypeMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/NullJavaTypeMappingUiDefinition.java
index 25fb76355b..686ffeb92a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/NullJavaTypeMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/NullJavaTypeMappingUiDefinition.java
@@ -9,6 +9,9 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.java;
 
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ResourceManager;
+import org.eclipse.jpt.common.ui.JptCommonUiImages;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -18,7 +21,6 @@ import org.eclipse.jpt.jpa.core.context.java.JavaTypeMapping;
 import org.eclipse.jpt.jpa.ui.details.JpaComposite;
 import org.eclipse.jpt.jpa.ui.details.java.DefaultJavaTypeMappingUiDefinition;
 import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory;
-import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
 import org.eclipse.jpt.jpa.ui.internal.details.AbstractMappingUiDefinition;
 import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages;
 import org.eclipse.swt.widgets.Composite;
@@ -70,12 +72,12 @@ public class NullJavaTypeMappingUiDefinition
 	}
 
 	@Override
-	protected String getImageKey() {
-		return JptUiIcons.WARNING;
+	public ImageDescriptor getImageDescriptor() {
+		return JptCommonUiImages.WARNING;
 	}
 
-	public JpaComposite buildTypeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaTypeMapping> mappingModel, Composite parent, WidgetFactory widgetFactory) {
-		return new NullComposite(mappingModel, parent, widgetFactory);
+	public JpaComposite buildTypeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaTypeMapping> mappingModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return new NullComposite(mappingModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 
@@ -85,8 +87,8 @@ public class NullJavaTypeMappingUiDefinition
 		extends Pane<JavaTypeMapping>
 		implements JpaComposite 
 	{
-		NullComposite(PropertyValueModel<JavaTypeMapping> mappingModel, Composite parent, WidgetFactory widgetFactory) {
-			super(mappingModel, parent, widgetFactory);
+		NullComposite(PropertyValueModel<JavaTypeMapping> mappingModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+			super(mappingModel, parentComposite, widgetFactory, resourceManager);
 		}
 
 		@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractEntityMappingsDetailsPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractEntityMappingsDetailsPageManager.java
index 07c71d2860..b0f5eed13b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractEntityMappingsDetailsPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractEntityMappingsDetailsPageManager.java
@@ -11,6 +11,7 @@ package org.eclipse.jpt.jpa.ui.internal.details.orm;
 
 import java.util.Arrays;
 import java.util.Collection;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
@@ -22,7 +23,7 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmPersistenceUnitMetadata;
 import org.eclipse.jpt.jpa.db.SchemaContainer;
 import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
 import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
-import org.eclipse.jpt.jpa.ui.internal.details.AbstractJpaDetailsPage;
+import org.eclipse.jpt.jpa.ui.internal.details.AbstractJpaDetailsPageManager;
 import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer;
 import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages;
 import org.eclipse.jpt.jpa.ui.internal.details.QueriesComposite;
@@ -73,30 +74,18 @@ import org.eclipse.ui.forms.widgets.Section;
  * -----------------------------------------------------------------------------</pre>
  *
  * @see EntityMappings
- * @see AbstractEntityMappingsDetailsPage - The parent container
  * @see CatalogCombo
  * @see EnumFormComboViewer
  * @see EntityMappingsGeneratorsComposite
  * @see OrmPackageChooser
- * @see OrmQueriesComposite
  * @see PersistenceUnitMetadataComposite
  * @see SchemaCombo
- *
- * @version 2.3
- * @since 2.0
  */
-public abstract class AbstractEntityMappingsDetailsPage extends AbstractJpaDetailsPage<EntityMappings>
+public abstract class AbstractEntityMappingsDetailsPageManager
+	extends AbstractJpaDetailsPageManager<EntityMappings>
 {
-	/**
-	 * Creates a new <code>EntityMappingsDetailsPage</code>.
-	 *
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	protected AbstractEntityMappingsDetailsPage(Composite parent,
-	                                 WidgetFactory widgetFactory) {
-
-		super(parent, widgetFactory);
+	protected AbstractEntityMappingsDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		super(parent, widgetFactory, resourceManager);
 	}
 
 	@Override
@@ -312,4 +301,4 @@ public abstract class AbstractEntityMappingsDetailsPage extends AbstractJpaDetai
 			}
 		};
 	}
-}
-\ No newline at end of file
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractOrmEmbeddableComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractOrmEmbeddableComposite.java
new file mode 100644
index 0000000000..a010deaec0
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractOrmEmbeddableComposite.java
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ *
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.jpa.ui.internal.details.orm;
+
+import org.eclipse.jface.resource.ResourceManager;
+import org.eclipse.jpt.common.ui.WidgetFactory;
+import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
+import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddable;
+import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
+import org.eclipse.jpt.jpa.ui.internal.details.AbstractEmbeddableComposite;
+import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.forms.widgets.Hyperlink;
+import org.eclipse.ui.forms.widgets.Section;
+
+public abstract class AbstractOrmEmbeddableComposite
+	extends AbstractEmbeddableComposite<OrmEmbeddable>
+{
+	protected AbstractOrmEmbeddableComposite(
+			PropertyValueModel<? extends OrmEmbeddable> embeddableModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(embeddableModel, parentComposite, widgetFactory, resourceManager);
+	}
+
+	@Override
+	protected Control buildEmbeddableSectionClient(Section embeddableSection) {
+		Composite container = this.addSubPane(embeddableSection, 2, 0, 0, 0, 0);
+
+		// Java class widgets
+		Hyperlink javaClassHyperlink = this.addHyperlink(container, JptUiDetailsOrmMessages.OrmJavaClassChooser_javaClass);
+		new OrmJavaClassChooser(this, getSubjectHolder(), container, javaClassHyperlink);
+
+		// Access type widgets
+		this.addLabel(container, JptUiMessages.AccessTypeComposite_access);
+		new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container);
+
+		// Metadata complete widgets
+		MetadataCompleteTriStateCheckBox metadataCompleteCheckBox = new MetadataCompleteTriStateCheckBox(this, getSubjectHolder(), container);
+		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
+		gridData.horizontalSpan = 2;
+		metadataCompleteCheckBox.getControl().setLayoutData(gridData);
+
+		return container;
+	}
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractOrmEntityComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractOrmEntityComposite.java
index ebf4181bf7..59d418f3c0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractOrmEntityComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractOrmEntityComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -21,36 +22,20 @@ import org.eclipse.jpt.jpa.ui.internal.details.EntityNameCombo;
 import org.eclipse.jpt.jpa.ui.internal.details.IdClassChooser;
 import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages;
 import org.eclipse.jpt.jpa.ui.internal.details.TableComposite;
-import org.eclipse.jpt.jpa.ui.internal.details.java.BaseJavaUiFactory;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 
-/**
- * The pane used for an ORM entity.
- *
- * @see OrmEntity
- * @see BaseJavaUiFactory - The factory creating this pane
- *
- * @version 2.3
- * @since 1.0
- */
-public abstract class AbstractOrmEntityComposite extends AbstractEntityComposite<OrmEntity>
+public abstract class AbstractOrmEntityComposite
+	extends AbstractEntityComposite<OrmEntity>
 {
-	/**
-	 * Creates a new <code>OrmEntityComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>OrmEntity</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
 	protected AbstractOrmEntityComposite(
-			PropertyValueModel<? extends OrmEntity> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<? extends OrmEntity> entityModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(entityModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractOrmXmlResourceUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractOrmXmlResourceUiDefinition.java
index 6f2654dbc4..5a65bfae99 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractOrmXmlResourceUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractOrmXmlResourceUiDefinition.java
@@ -14,7 +14,6 @@ import java.util.List;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.ObjectTools;
 import org.eclipse.jpt.common.utility.internal.iterable.SuperIterableWrapper;
-import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.AttributeMapping;
 import org.eclipse.jpt.jpa.core.context.PersistentType;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
@@ -58,9 +57,9 @@ public abstract class AbstractOrmXmlResourceUiDefinition
 
 	// ********** type mappings **********
 
-	public JpaComposite buildTypeMappingComposite(String mappingKey, PropertyValueModel<TypeMapping> mappingModel, Composite parent, WidgetFactory widgetFactory) {
+	public JpaComposite buildTypeMappingComposite(String mappingKey, org.eclipse.jpt.common.utility.model.value.PropertyValueModel<TypeMapping> mappingModel, Composite parentComposite, WidgetFactory widgetFactory, org.eclipse.jface.resource.ResourceManager resourceManager) {
 		OrmTypeMappingUiDefinition<TypeMapping> definition = this.getOrmTypeMappingUiDefinition(mappingKey);
-		return definition.buildTypeMappingComposite(this.factory, mappingModel, parent, widgetFactory);
+		return definition.buildTypeMappingComposite(this.factory, mappingModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	public MappingUiDefinition<PersistentType, ? extends TypeMapping> getTypeMappingUiDefinition(String mappingKey) {
@@ -108,9 +107,9 @@ public abstract class AbstractOrmXmlResourceUiDefinition
 
 	// ********** attribute mappings **********
 
-	public JpaComposite buildAttributeMappingComposite(String mappingKey, PropertyValueModel<AttributeMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parent, WidgetFactory widgetFactory) {
+	public JpaComposite buildAttributeMappingComposite(String mappingKey, org.eclipse.jpt.common.utility.model.value.PropertyValueModel<AttributeMapping> mappingModel, org.eclipse.jpt.common.utility.model.value.PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, org.eclipse.jface.resource.ResourceManager resourceManager) {
 		OrmAttributeMappingUiDefinition<AttributeMapping> definition = this.getOrmAttributeMappingUiDefinition(mappingKey);
-		return definition.buildAttributeMappingComposite(this.factory, mappingModel, enabledModel, parent, widgetFactory);
+		return definition.buildAttributeMappingComposite(this.factory, mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	public MappingUiDefinition<ReadOnlyPersistentAttribute, ? extends AttributeMapping> getAttributeMappingUiDefinition(String mappingKey) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractOrmXmlUiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractOrmXmlUiFactory.java
new file mode 100644
index 0000000000..cdac6d3fda
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractOrmXmlUiFactory.java
@@ -0,0 +1,154 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ *
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.jpa.ui.internal.details.orm;
+
+import org.eclipse.jface.resource.ResourceManager;
+import org.eclipse.jpt.common.ui.WidgetFactory;
+import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
+import org.eclipse.jpt.jpa.core.context.orm.OrmBasicMapping;
+import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddable;
+import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddedIdMapping;
+import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddedMapping;
+import org.eclipse.jpt.jpa.core.context.orm.OrmEntity;
+import org.eclipse.jpt.jpa.core.context.orm.OrmIdMapping;
+import org.eclipse.jpt.jpa.core.context.orm.OrmManyToManyMapping;
+import org.eclipse.jpt.jpa.core.context.orm.OrmManyToOneMapping;
+import org.eclipse.jpt.jpa.core.context.orm.OrmMappedSuperclass;
+import org.eclipse.jpt.jpa.core.context.orm.OrmOneToManyMapping;
+import org.eclipse.jpt.jpa.core.context.orm.OrmOneToOneMapping;
+import org.eclipse.jpt.jpa.core.context.orm.OrmTransientMapping;
+import org.eclipse.jpt.jpa.core.context.orm.OrmVersionMapping;
+import org.eclipse.jpt.jpa.ui.details.JpaComposite;
+import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory;
+import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingComposite;
+import org.eclipse.swt.widgets.Composite;
+
+public abstract class AbstractOrmXmlUiFactory
+	implements OrmXmlUiFactory
+{
+	// ********** type mappings **********
+
+	public JpaComposite createOrmMappedSuperclassComposite(
+			PropertyValueModel<OrmMappedSuperclass> mappedSuperclassModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmMappedSuperclassComposite(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager);
+	}
+
+	public JpaComposite createOrmEntityComposite(
+			PropertyValueModel<OrmEntity> entityModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEntityComposite(entityModel, parentComposite, widgetFactory, resourceManager);
+	}
+
+	public JpaComposite createOrmEmbeddableComposite(
+			PropertyValueModel<OrmEmbeddable> embeddableModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEmbeddableComposite(embeddableModel, parentComposite, widgetFactory, resourceManager);
+	}
+
+
+	// ********** attribute mappings **********
+
+	public JpaComposite createOrmIdMappingComposite(
+			PropertyValueModel<OrmIdMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmIdMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
+	}
+
+	public JpaComposite createOrmEmbeddedIdMappingComposite(
+			PropertyValueModel<OrmEmbeddedIdMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEmbeddedIdMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
+	}
+
+	public JpaComposite createOrmBasicMappingComposite(
+			PropertyValueModel<OrmBasicMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmBasicMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
+	}
+
+	public JpaComposite createOrmVersionMappingComposite(
+			PropertyValueModel<OrmVersionMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmVersionMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
+	}
+
+	public JpaComposite createOrmManyToOneMappingComposite(
+			PropertyValueModel<OrmManyToOneMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmManyToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
+	}
+
+	public JpaComposite createOrmOneToManyMappingComposite(
+			PropertyValueModel<OrmOneToManyMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmOneToManyMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
+	}
+
+	public JpaComposite createOrmOneToOneMappingComposite(
+			PropertyValueModel<OrmOneToOneMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmOneToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
+	}
+
+	public JpaComposite createOrmManyToManyMappingComposite(
+			PropertyValueModel<OrmManyToManyMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmManyToManyMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
+	}
+
+	public JpaComposite createOrmEmbeddedMappingComposite(
+			PropertyValueModel<OrmEmbeddedMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEmbeddedMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
+	}
+
+	public JpaComposite createOrmTransientMappingComposite(
+			PropertyValueModel<OrmTransientMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new TransientMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
+	}
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AddGeneratorDialog.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AddGeneratorDialog.java
index a18bf6ac21..a380059407 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AddGeneratorDialog.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AddGeneratorDialog.java
@@ -11,6 +11,7 @@ package org.eclipse.jpt.jpa.ui.internal.details.orm;
 
 import java.util.ArrayList;
 import java.util.List;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.internal.widgets.DialogPane;
 import org.eclipse.jpt.common.ui.internal.widgets.ValidatingDialog;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
@@ -18,22 +19,16 @@ import org.eclipse.jpt.common.utility.internal.model.value.StaticListValueModel;
 import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter;
 import org.eclipse.jpt.common.utility.model.value.ListValueModel;
 import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
+import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.common.utility.transformer.Transformer;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
-/**
- * Clients can use this dialog to prompt the user for SecondaryTable settings.
- * Use the following once the dialog is closed:
- *     @see #getSelectedTable()
- *     @see #getSelectedCatalog()
- *     @see #getSelectedSchema()
- * @version 2.1
- * @since 2.1
- */
-public class AddGeneratorDialog extends ValidatingDialog<AddGeneratorStateObject> {
+public class AddGeneratorDialog
+	extends ValidatingDialog<AddGeneratorStateObject>
+{
 	public static final String SEQUENCE_GENERATOR = "sequenceGenerator"; //$NON-NLS-1$
 	public static final String TABLE_GENERATOR = "tableGenerator"; //$NON-NLS-1$
 
@@ -42,13 +37,14 @@ public class AddGeneratorDialog extends ValidatingDialog<AddGeneratorStateObject
 	 */
 	private PersistenceUnit pUnit;
 	
+
 	// ********** constructors **********
 
 	/**
 	 * Use this constructor to edit an existing conversion value
 	 */
-	public AddGeneratorDialog(Shell parent, PersistenceUnit pUnit) {
-		super(parent);
+	public AddGeneratorDialog(Shell parent, ResourceManager resourceManager, PersistenceUnit pUnit) {
+		super(parent, resourceManager, JptUiDetailsOrmMessages.AddGeneratorDialog_title);
 		this.pUnit = pUnit;
 	}
 
@@ -60,17 +56,6 @@ public class AddGeneratorDialog extends ValidatingDialog<AddGeneratorStateObject
 	// ********** open **********
 
 	@Override
-	protected void configureShell(Shell shell) {
-		super.configureShell(shell);
-		shell.setText(this.getTitle());
-	}
-
-	@Override
-	protected String getTitle() {
-		return JptUiDetailsOrmMessages.AddGeneratorDialog_title;
-	}
-
-	@Override
 	protected String getDescriptionTitle() {
 		return JptUiDetailsOrmMessages.AddGeneratorDialog_descriptionTitle;
 	}
@@ -82,7 +67,7 @@ public class AddGeneratorDialog extends ValidatingDialog<AddGeneratorStateObject
 	
 	@Override
 	protected DialogPane<AddGeneratorStateObject> buildLayout(Composite container) {
-		return new GeneratorDialogPane(container);
+		return new GeneratorDialogPane(this.getSubjectHolder(), container, this.resourceManager);
 	}
 	
 	@Override
@@ -111,13 +96,15 @@ public class AddGeneratorDialog extends ValidatingDialog<AddGeneratorStateObject
 	public String getGeneratorType() {
 		return getSubject().getGeneratorType();
 	}
-	
-	private class GeneratorDialogPane extends DialogPane<AddGeneratorStateObject> {
 
+
+	static class GeneratorDialogPane
+		extends DialogPane<AddGeneratorStateObject>
+	{
 		private Text nameText;
 
-		GeneratorDialogPane(Composite parent) {
-			super(AddGeneratorDialog.this.getSubjectHolder(), parent);
+		GeneratorDialogPane(PropertyValueModel<AddGeneratorStateObject> subjectModel, Composite parentComposite, ResourceManager resourceManager) {
+			super(subjectModel, parentComposite, resourceManager);
 		}
 
 		@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/BaseOrmXmlUiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/BaseOrmXmlUiFactory.java
deleted file mode 100644
index 3fde7f558c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/BaseOrmXmlUiFactory.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2010 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.ui.internal.details.orm;
-
-import org.eclipse.jpt.common.ui.WidgetFactory;
-import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.jpa.core.context.orm.OrmBasicMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddable;
-import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddedIdMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddedMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmEntity;
-import org.eclipse.jpt.jpa.core.context.orm.OrmIdMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmManyToManyMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmManyToOneMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmMappedSuperclass;
-import org.eclipse.jpt.jpa.core.context.orm.OrmOneToManyMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmOneToOneMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmTransientMapping;
-import org.eclipse.jpt.jpa.core.context.orm.OrmVersionMapping;
-import org.eclipse.jpt.jpa.ui.details.JpaComposite;
-import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory;
-import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingComposite;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * The default implementation of the Orm Xml UI factory required to show the information
- * related to a JPA mapping (type or attribute).
- */
-public abstract class BaseOrmXmlUiFactory implements OrmXmlUiFactory
-{
-	
-	// **************** orm type mapping composites ****************************
-	
-	public JpaComposite createOrmMappedSuperclassComposite(
-			PropertyValueModel<OrmMappedSuperclass> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmMappedSuperclassComposite(subjectHolder, parent, widgetFactory);
-	}
-	
-	public JpaComposite createOrmEntityComposite(
-			PropertyValueModel<OrmEntity> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEntityComposite(subjectHolder, parent, widgetFactory);
-	}
-	
-	public JpaComposite createOrmEmbeddableComposite(
-			PropertyValueModel<OrmEmbeddable> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEmbeddableComposite(subjectHolder, parent, widgetFactory);
-	}
-	
-	
-	// **************** orm attribute mapping composites ***********************
-	
-	public JpaComposite createOrmIdMappingComposite(
-			PropertyValueModel<OrmIdMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmIdMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
-	}
-	
-	public JpaComposite createOrmEmbeddedIdMappingComposite(
-			PropertyValueModel<OrmEmbeddedIdMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEmbeddedIdMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
-	}
-	
-	public JpaComposite createOrmBasicMappingComposite(
-			PropertyValueModel<OrmBasicMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmBasicMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
-	}
-	
-	public JpaComposite createOrmVersionMappingComposite(
-			PropertyValueModel<OrmVersionMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmVersionMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
-	}
-	
-	public JpaComposite createOrmManyToOneMappingComposite(
-			PropertyValueModel<OrmManyToOneMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmManyToOneMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
-	}
-	
-	public JpaComposite createOrmOneToManyMappingComposite(
-			PropertyValueModel<OrmOneToManyMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmOneToManyMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
-	}
-	
-	public JpaComposite createOrmOneToOneMappingComposite(
-			PropertyValueModel<OrmOneToOneMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmOneToOneMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
-	}
-	
-	public JpaComposite createOrmManyToManyMappingComposite(
-			PropertyValueModel<OrmManyToManyMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmManyToManyMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
-	}
-	
-	public JpaComposite createOrmEmbeddedMappingComposite(
-			PropertyValueModel<OrmEmbeddedMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEmbeddedMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
-	}
-	
-	public JpaComposite createOrmTransientMappingComposite(
-			PropertyValueModel<OrmTransientMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new TransientMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/EntityMappingsDetailsPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/EntityMappingsDetailsPage.java
deleted file mode 100644
index 0c9ec4c6df..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/EntityMappingsDetailsPage.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2009 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.ui.internal.details.orm;
-
-import org.eclipse.jpt.common.ui.WidgetFactory;
-import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer;
-import org.eclipse.jpt.jpa.core.context.orm.EntityMappings;
-import org.eclipse.jpt.jpa.ui.internal.details.db.CatalogCombo;
-import org.eclipse.jpt.jpa.ui.internal.details.db.SchemaCombo;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | XmlPackageChooser                                                     | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * |              ------------------------------------------------------------ |
- * | Schema:      | SchemaCombo                                              | |
- * |              ------------------------------------------------------------ |
- * |              ------------------------------------------------------------ |
- * | Catalog:     | CatalogCombo                                             | |
- * |              ------------------------------------------------------------ |
- * |              ------------------------------------------------------------ |
- * | Access Type: |                                                        |v| |
- * |              ------------------------------------------------------------ |
- * |                                                                           |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | PersistenceUnitMetadataComposite                                      | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | OrmGeneratorsComposite                                                | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | OrmQueriesComposite                                                   | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see EntityMappings
- * @see EntityMappingsDetailsPage - The parent container
- * @see CatalogCombo
- * @see EnumFormComboViewer
- * @see EntityMappingsGeneratorsComposite
- * @see OrmPackageChooser
- * @see OrmQueriesComposite
- * @see PersistenceUnitMetadataComposite
- * @see SchemaCombo
- *
- * @version 2.2
- * @since 2.0
- */
-public class EntityMappingsDetailsPage extends AbstractEntityMappingsDetailsPage
-{
-	/**
-	 * Creates a new <code>EntityMappingsDetailsPage</code>.
-	 *
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public EntityMappingsDetailsPage(Composite parent,
-	                                 WidgetFactory widgetFactory) {
-
-		super(parent, widgetFactory);
-	}
-
-}
-\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/EntityMappingsDetailsPageManager.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/EntityMappingsDetailsPageManager.java
new file mode 100644
index 0000000000..d952657e82
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/EntityMappingsDetailsPageManager.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ *
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.jpa.ui.internal.details.orm;
+
+import org.eclipse.jface.resource.ResourceManager;
+import org.eclipse.jpt.common.ui.WidgetFactory;
+import org.eclipse.swt.widgets.Composite;
+
+public class EntityMappingsDetailsPageManager
+	extends AbstractEntityMappingsDetailsPageManager
+{
+	public EntityMappingsDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		super(parent, widgetFactory, resourceManager);
+	}
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/EntityMappingsDetailsProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/EntityMappingsDetailsProvider.java
index bd3c90517f..903af6ecda 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/EntityMappingsDetailsProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/EntityMappingsDetailsProvider.java
@@ -9,9 +9,10 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.core.JptResourceType;
 import org.eclipse.jpt.common.ui.WidgetFactory;
-import org.eclipse.jpt.jpa.core.context.orm.EntityMappings;
+import org.eclipse.jpt.jpa.core.JpaStructureNode;
 import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.GenericOrmXmlDefinition;
 import org.eclipse.jpt.jpa.ui.details.JpaDetailsPageManager;
 import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider;
@@ -51,10 +52,7 @@ public class EntityMappingsDetailsProvider
 		return resourceType.equals(GenericOrmXmlDefinition.instance().getResourceType());
 	}
 	
-	public JpaDetailsPageManager<EntityMappings> buildDetailsPageManager(
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return new EntityMappingsDetailsPage(parent, widgetFactory);
+	public JpaDetailsPageManager<? extends JpaStructureNode> buildDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return new EntityMappingsDetailsPageManager(parent, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/EntityMappingsGeneratorsComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/EntityMappingsGeneratorsComposite.java
index 806255508b..8a9e350da9 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/EntityMappingsGeneratorsComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/EntityMappingsGeneratorsComposite.java
@@ -126,7 +126,7 @@ public class EntityMappingsGeneratorsComposite extends Pane<EntityMappings>
 	}
 	
 	protected AddGeneratorDialog buildAddGeneratorDialog() {
-		return new AddGeneratorDialog(getShell(), this.getSubject().getPersistenceUnit());
+		return new AddGeneratorDialog(this.getShell(), this.getResourceManager(), this.getSubject().getPersistenceUnit());
 	}
 
 	protected OrmGenerator addGeneratorFromDialog(AddGeneratorDialog dialog) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/GenericOrmXmlUiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/GenericOrmXmlUiFactory.java
index 5ea741c22d..5fa79c0775 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/GenericOrmXmlUiFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/GenericOrmXmlUiFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2009 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2012 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,7 +9,8 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.orm;
 
-public class GenericOrmXmlUiFactory extends BaseOrmXmlUiFactory
+public class GenericOrmXmlUiFactory
+	extends AbstractOrmXmlUiFactory
 {
-	//nothing
+	// nothing
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmBasicMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmBasicMappingComposite.java
index e3a3bfeffe..89bebf4585 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmBasicMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmBasicMappingComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.BasicMapping;
@@ -21,21 +22,16 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 
-public class OrmBasicMappingComposite extends AbstractBasicMappingComposite<BasicMapping>
+public class OrmBasicMappingComposite
+	extends AbstractBasicMappingComposite<BasicMapping>
 {
-	/**
-	 * Creates a new <code>EclipseLink1_1OrmBasicMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>BasicMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public OrmBasicMappingComposite(PropertyValueModel<? extends BasicMapping> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-	                               	Composite parent,
-	                               	WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public OrmBasicMappingComposite(
+			PropertyValueModel<? extends BasicMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmBasicMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmBasicMappingUiDefinition.java
index 21e925b595..0e7832b021 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmBasicMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmBasicMappingUiDefinition.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
@@ -42,14 +43,8 @@ public class OrmBasicMappingUiDefinition
 	private OrmBasicMappingUiDefinition() {
 		super();
 	}
-	
-	public JpaComposite buildAttributeMappingComposite(
-			OrmXmlUiFactory factory, 
-			PropertyValueModel<OrmBasicMapping> subjectHolder, 
-			PropertyValueModel<Boolean> enabledModel, 
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return factory.createOrmBasicMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+
+	public JpaComposite buildAttributeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<OrmBasicMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return factory.createOrmBasicMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEmbeddableComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEmbeddableComposite.java
index 3f2b0c0c10..1b40b478cd 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEmbeddableComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEmbeddableComposite.java
@@ -9,64 +9,20 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
-import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.jpa.core.context.AccessHolder;
 import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddable;
-import org.eclipse.jpt.jpa.ui.details.JpaComposite;
-import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
-import org.eclipse.jpt.jpa.ui.internal.details.AbstractEmbeddableComposite;
-import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer;
-import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.forms.widgets.Hyperlink;
 
-public class OrmEmbeddableComposite extends AbstractEmbeddableComposite<OrmEmbeddable> implements JpaComposite
+public class OrmEmbeddableComposite
+	extends AbstractOrmEmbeddableComposite
 {
-	public OrmEmbeddableComposite(PropertyValueModel<? extends OrmEmbeddable> subjectHolder,
-	                          Composite parent,
-	                          WidgetFactory widgetFactory) {
-
-		super(subjectHolder, parent, widgetFactory);
-	}
-
-	@Override
-	protected void initializeLayout(Composite container) {
-		this.initializeEmbeddableCollapsibleSection(container);
+	public OrmEmbeddableComposite(
+			PropertyValueModel<? extends OrmEmbeddable> embeddableModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(embeddableModel, parentComposite, widgetFactory, resourceManager);
 	}
-
-	@Override
-	protected Control initializeEmbeddableSection(Composite container) {
-		container = this.addSubPane(container, 2, 0, 0, 0, 0);
-
-		// Java class widgets
-		Hyperlink javaClassHyperlink = this.addHyperlink(container, JptUiDetailsOrmMessages.OrmJavaClassChooser_javaClass);
-		new OrmJavaClassChooser(this, getSubjectHolder(), container, javaClassHyperlink);
-
-		// Access type widgets
-		this.addLabel(container, JptUiMessages.AccessTypeComposite_access);
-		new AccessTypeComboViewer(this, buildAccessHolder(), container);
-
-		// Metadata complete widgets
-		MetadataCompleteTriStateCheckBox metadataCompleteCheckBox = new MetadataCompleteTriStateCheckBox(this, getSubjectHolder(), container);
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.horizontalSpan = 2;
-		metadataCompleteCheckBox.getControl().setLayoutData(gridData);
-
-		return container;
-	}
-	
-	protected PropertyValueModel<AccessHolder> buildAccessHolder() {
-		return new PropertyAspectAdapter<OrmEmbeddable, AccessHolder>(
-			getSubjectHolder())
-		{
-			@Override
-			protected AccessHolder buildValue_() {
-				return this.subject.getPersistentType();
-			}
-		};
-	}
-
-}
-\ No newline at end of file
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEmbeddableUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEmbeddableUiDefinition.java
index 9d611ac30e..3e0e5e0299 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEmbeddableUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEmbeddableUiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.PersistentType;
@@ -42,13 +43,7 @@ public class OrmEmbeddableUiDefinition
 		super();
 	}
 	
-	
-	public JpaComposite buildTypeMappingComposite(
-			OrmXmlUiFactory factory,
-			PropertyValueModel<OrmEmbeddable> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return factory.createOrmEmbeddableComposite(subjectHolder, parent, widgetFactory);
+	public JpaComposite buildTypeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<OrmEmbeddable> mappingModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return factory.createOrmEmbeddableComposite(mappingModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEmbeddedIdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEmbeddedIdMappingComposite.java
index d59eb45db8..be968bee65 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEmbeddedIdMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEmbeddedIdMappingComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping;
@@ -22,12 +23,12 @@ public class OrmEmbeddedIdMappingComposite
 	extends AbstractEmbeddedIdMappingComposite<EmbeddedIdMapping>
 {
 	public OrmEmbeddedIdMappingComposite(
-			PropertyValueModel<? extends EmbeddedIdMapping> subjectHolder,
+			PropertyValueModel<? extends EmbeddedIdMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEmbeddedIdMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEmbeddedIdMappingUiDefinition.java
index 3f35a515c3..f02ce8885b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEmbeddedIdMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEmbeddedIdMappingUiDefinition.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
@@ -44,14 +45,7 @@ public class OrmEmbeddedIdMappingUiDefinition
 		super();
 	}	
 	
-	
-	public JpaComposite buildAttributeMappingComposite(
-			OrmXmlUiFactory factory,
-			PropertyValueModel<OrmEmbeddedIdMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return factory.createOrmEmbeddedIdMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+	public JpaComposite buildAttributeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<OrmEmbeddedIdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return factory.createOrmEmbeddedIdMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEmbeddedMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEmbeddedMappingComposite.java
index e5f25852cf..a5deb02851 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEmbeddedMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEmbeddedMappingComposite.java
@@ -9,49 +9,26 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.EmbeddedMapping;
 import org.eclipse.jpt.jpa.ui.internal.details.AbstractEmbeddedMappingComposite;
 import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedMappingOverridesComposite;
-import org.eclipse.jpt.jpa.ui.internal.details.java.BaseJavaUiFactory;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | EmbeddedAttributeOverridesComposite                                   | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see EmbeddedMapping
- * @see BaseJavaUiFactory - The factory creating this pane
- *
- * @version 2.3
- * @since 2.2
- */
 public class OrmEmbeddedMappingComposite
 	extends AbstractEmbeddedMappingComposite<EmbeddedMapping>
 {
-	/**
-	 * Creates a new <code>EmbeddedMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>EmbeddedMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public OrmEmbeddedMappingComposite(PropertyValueModel<? extends EmbeddedMapping> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-	                                WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public OrmEmbeddedMappingComposite(
+			PropertyValueModel<? extends EmbeddedMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEmbeddedMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEmbeddedMappingUiDefinition.java
index 1e4d7e008f..fabb84f4c5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEmbeddedMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEmbeddedMappingUiDefinition.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
@@ -44,14 +45,7 @@ public class OrmEmbeddedMappingUiDefinition
 		super();
 	}
 	
-	
-	public JpaComposite buildAttributeMappingComposite(
-			OrmXmlUiFactory factory,
-			PropertyValueModel<OrmEmbeddedMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return factory.createOrmEmbeddedMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+	public JpaComposite buildAttributeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<OrmEmbeddedMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return factory.createOrmEmbeddedMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEntityComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEntityComposite.java
index ebbbcdbcfd..cbd7199d91 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEntityComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEntityComposite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2012 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,35 +9,21 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.orm.OrmEntity;
 import org.eclipse.swt.widgets.Composite;
 
-/**
- * The pane used for an ORM entity.
- *
- * @see OrmEntity
- * @see BaseJavaUiFactory - The factory creating this pane
- * @see OrmSecondaryTablesComposite
- *
- * @version 2.0
- * @since 1.0
- */
-public class OrmEntityComposite extends AbstractOrmEntityComposite
+public class OrmEntityComposite
+	extends AbstractOrmEntityComposite
 {
-	/**
-	 * Creates a new <code>OrmEntityComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>OrmEntity</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public OrmEntityComposite(PropertyValueModel<? extends OrmEntity> subjectHolder,
-	                          Composite parent,
-	                          WidgetFactory widgetFactory) {
-
-		super(subjectHolder, parent, widgetFactory);
+	public OrmEntityComposite(
+			PropertyValueModel<? extends OrmEntity> entityModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(entityModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 }
 \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEntityUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEntityUiDefinition.java
index 28ec546536..5f8c8d32dc 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEntityUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEntityUiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.PersistentType;
@@ -43,13 +44,7 @@ public class OrmEntityUiDefinition
 		super();
 	}
 	
-	
-	public JpaComposite buildTypeMappingComposite(
-			OrmXmlUiFactory factory,
-			PropertyValueModel<OrmEntity> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return factory.createOrmEntityComposite(subjectHolder, parent, widgetFactory);
+	public JpaComposite buildTypeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<OrmEntity> mappingModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return factory.createOrmEntityComposite(mappingModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmIdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmIdMappingComposite.java
index 4a5c5309e6..198af36740 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmIdMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmIdMappingComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.IdMapping;
@@ -22,12 +23,12 @@ public class OrmIdMappingComposite
 	extends AbstractIdMappingComposite<IdMapping>
 {
 	public OrmIdMappingComposite(
-			PropertyValueModel<? extends IdMapping> subjectHolder,
+			PropertyValueModel<? extends IdMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-	        WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmIdMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmIdMappingUiDefinition.java
index bfc26d38c0..ae67441bd6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmIdMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmIdMappingUiDefinition.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
@@ -44,14 +45,7 @@ public class OrmIdMappingUiDefinition
 		super();
 	}
 	
-	
-	public JpaComposite buildAttributeMappingComposite(
-			OrmXmlUiFactory factory,
-			PropertyValueModel<OrmIdMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return factory.createOrmIdMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+	public JpaComposite buildAttributeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<OrmIdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return factory.createOrmIdMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmManyToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmManyToManyMappingComposite.java
index 9420412445..7bebe22197 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmManyToManyMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmManyToManyMappingComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ManyToManyMapping;
@@ -17,71 +18,22 @@ import org.eclipse.jpt.jpa.ui.internal.details.AbstractManyToManyMappingComposit
 import org.eclipse.jpt.jpa.ui.internal.details.CascadeComposite;
 import org.eclipse.jpt.jpa.ui.internal.details.FetchTypeComboViewer;
 import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages;
-import org.eclipse.jpt.jpa.ui.internal.details.ManyToManyJoiningStrategyPane;
-import org.eclipse.jpt.jpa.ui.internal.details.OrderingComposite;
 import org.eclipse.jpt.jpa.ui.internal.details.TargetEntityClassChooser;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | TargetEntityComposite                                                 | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | JoiningStrategyComposite                                              | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | FetchTypeComposite                                                    | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | CascadeComposite                                                      | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | OrderingComposite                                                     | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see {@link ManyToManyMapping}
- * @see {@link TargetEntityClassChooser}
- * @see {@link ManyToManyJoiningStrategyPane}
- * @see {@link FetchTypeComboViewer}
- * @see {@link CascadeComposite}
- * @see {@link OrderingComposite}
- *
- * @version 2.3
- * @since 1.0
- */
 public class OrmManyToManyMappingComposite 
 	extends AbstractManyToManyMappingComposite<ManyToManyMapping, ManyToManyRelationship>
 {
-	/**
-	 * Creates a new <code>ManyToManyMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>IManyToManyMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public OrmManyToManyMappingComposite(PropertyValueModel<? extends ManyToManyMapping> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-	                                WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public OrmManyToManyMappingComposite(
+			PropertyValueModel<? extends ManyToManyMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmManyToManyMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmManyToManyMappingUiDefinition.java
index db65fae6e6..f22191f414 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmManyToManyMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmManyToManyMappingUiDefinition.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
@@ -44,14 +45,7 @@ public class OrmManyToManyMappingUiDefinition
 		super();
 	}
 	
-	
-	public JpaComposite buildAttributeMappingComposite(
-			OrmXmlUiFactory factory,
-			PropertyValueModel<OrmManyToManyMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return factory.createOrmManyToManyMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+	public JpaComposite buildAttributeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<OrmManyToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return factory.createOrmManyToManyMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmManyToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmManyToOneMappingComposite.java
index 9b1b1be7a1..1f7ea96de6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmManyToOneMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmManyToOneMappingComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ManyToOneMapping;
@@ -26,63 +27,16 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | TargetEntityComposite                                                 | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | JoiningStrategyComposite                                              | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | FetchTypeComposite                                                    | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | OptionalComposite                                                     | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | CascadeComposite                                                      | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see {@link ManyToOneMapping}
- * @see {@link TargetEntityClassChooser}
- * @see {@link ManyToOneJoiningStrategyPane}
- * @see {@link FetchTypeComboViewer}
- * @see {@link OptionalTriStateCheckBox}
- * @see {@link CascadeComposite}
- *
- * @version 2.3
- * @since 1.0
- */
 public class OrmManyToOneMappingComposite 
 	extends AbstractManyToOneMappingComposite<OrmManyToOneMapping, OrmManyToOneRelationship>
 {
-	/**
-	 * Creates a new <code>ManyToOneMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>IManyToOneMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public OrmManyToOneMappingComposite(PropertyValueModel<? extends OrmManyToOneMapping> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-	                                WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public OrmManyToOneMappingComposite(
+			PropertyValueModel<? extends OrmManyToOneMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+	        WidgetFactory widgetFactory,
+	        ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmManyToOneMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmManyToOneMappingUiDefinition.java
index d54ff6310f..ad41b138f8 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmManyToOneMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmManyToOneMappingUiDefinition.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
@@ -44,14 +45,7 @@ public class OrmManyToOneMappingUiDefinition
 		super();
 	}
 	
-	
-	public JpaComposite buildAttributeMappingComposite(
-			OrmXmlUiFactory factory,
-			PropertyValueModel<OrmManyToOneMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return factory.createOrmManyToOneMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+	public JpaComposite buildAttributeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<OrmManyToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return factory.createOrmManyToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmMappedSuperclassComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmMappedSuperclassComposite.java
index b16ecc441d..33e2e1b782 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmMappedSuperclassComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmMappedSuperclassComposite.java
@@ -9,12 +9,12 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.AccessHolder;
 import org.eclipse.jpt.jpa.core.context.orm.OrmMappedSuperclass;
-import org.eclipse.jpt.jpa.ui.details.JpaComposite;
 import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
 import org.eclipse.jpt.jpa.ui.internal.details.AbstractMappedSuperclassComposite;
 import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer;
@@ -27,14 +27,13 @@ import org.eclipse.ui.forms.widgets.Hyperlink;
 
 public class OrmMappedSuperclassComposite
 	extends AbstractMappedSuperclassComposite<OrmMappedSuperclass>
-    implements JpaComposite
 {
 	public OrmMappedSuperclassComposite(
-			PropertyValueModel<? extends OrmMappedSuperclass> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<? extends OrmMappedSuperclass> mappedSuperclassModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmMappedSuperclassUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmMappedSuperclassUiDefinition.java
index 3b919460e1..a35ed296e1 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmMappedSuperclassUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmMappedSuperclassUiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.PersistentType;
@@ -43,13 +44,7 @@ public class OrmMappedSuperclassUiDefinition
 		super();
 	}
 	
-	
-	public JpaComposite buildTypeMappingComposite(
-			OrmXmlUiFactory factory,
-			PropertyValueModel<OrmMappedSuperclass> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return factory.createOrmMappedSuperclassComposite(subjectHolder, parent, widgetFactory);
+	public JpaComposite buildTypeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<OrmMappedSuperclass> mappingModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return factory.createOrmMappedSuperclassComposite(mappingModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmMappingNameText.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmMappingNameText.java
index 83672c7013..41b1ffa1b6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmMappingNameText.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmMappingNameText.java
@@ -20,7 +20,7 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Text;
 
 /**
- * @see OrmPersistentAttributeDetailsPage - The parent container
+ * @see OrmPersistentAttributeDetailsPageManager - The parent container
  *
  * @version 2.3
  * @since 1.0
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmOneToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmOneToManyMappingComposite.java
index 2811f1c55b..022d113c83 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmOneToManyMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmOneToManyMappingComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.OneToManyMapping;
@@ -16,72 +17,23 @@ import org.eclipse.jpt.jpa.core.context.OneToManyRelationship;
 import org.eclipse.jpt.jpa.ui.internal.details.AbstractOneToManyMappingComposite;
 import org.eclipse.jpt.jpa.ui.internal.details.CascadeComposite;
 import org.eclipse.jpt.jpa.ui.internal.details.FetchTypeComboViewer;
-import org.eclipse.jpt.jpa.ui.internal.details.JoinTableComposite;
 import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages;
-import org.eclipse.jpt.jpa.ui.internal.details.OrderingComposite;
 import org.eclipse.jpt.jpa.ui.internal.details.TargetEntityClassChooser;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | TargetEntityComposite                                                 | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | JoiningStrategyComposite                                              | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | FetchTypeComposite                                                    | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | CascadeComposite                                                      | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | OrderingComposite                                                     | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see OneToManyMapping
- * @see CascadeComposite
- * @see FetchTypeComboViewer
- * @see JoinTableComposite
- * @see OrderingComposite
- * @see TargetEntityClassChooser
- *
- * @version 2.3
- * @since 1.0
- */
 public class OrmOneToManyMappingComposite 
 	extends AbstractOneToManyMappingComposite<OneToManyMapping, OneToManyRelationship>
 {
-	/**
-	 * Creates a new <code>OneToManyMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>IOneToManyMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public OrmOneToManyMappingComposite(PropertyValueModel<? extends OneToManyMapping> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-	                                WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public OrmOneToManyMappingComposite(
+			PropertyValueModel<? extends OneToManyMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmOneToManyMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmOneToManyMappingUiDefinition.java
index 2d1ed9c681..ee93e15454 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmOneToManyMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmOneToManyMappingUiDefinition.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
@@ -44,14 +45,7 @@ public class OrmOneToManyMappingUiDefinition
 		super();
 	}
 	
-	
-	public JpaComposite buildAttributeMappingComposite(
-			OrmXmlUiFactory factory,
-			PropertyValueModel<OrmOneToManyMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return factory.createOrmOneToManyMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+	public JpaComposite buildAttributeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<OrmOneToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return factory.createOrmOneToManyMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmOneToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmOneToOneMappingComposite.java
index 27b2e0fd3c..0e639b2a77 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmOneToOneMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmOneToOneMappingComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.OneToOneMapping;
@@ -24,63 +25,16 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | TargetEntityComposite                                                 | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | JoiningStrategyComposite                                              | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | FetchTypeComposite                                                    | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | OptionalComposite                                                     | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | CascadeComposite                                                      | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see OneToOneMapping
- * @see TargetEntityClassChooser
- * @see JoiningStrategyComposite
- * @see FetchTypeComboViewer
- * @see OptionalTriStateCheckBox
- * @see CascadeComposite
- *
- * @version 2.3
- * @since 1.0
- */
 public class OrmOneToOneMappingComposite 
 	extends AbstractOneToOneMappingComposite<OneToOneMapping, OneToOneRelationship>
 {
-	/**
-	 * Creates a new <code>OneToOneMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>IOneToOneMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public OrmOneToOneMappingComposite(PropertyValueModel<? extends OneToOneMapping> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-	                                WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public OrmOneToOneMappingComposite(
+			PropertyValueModel<? extends OneToOneMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+	        WidgetFactory widgetFactory,
+	        ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}	
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmOneToOneMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmOneToOneMappingUiDefinition.java
index 03c5626dc3..ad1897df02 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmOneToOneMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmOneToOneMappingUiDefinition.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
@@ -44,14 +45,7 @@ public class OrmOneToOneMappingUiDefinition
 		super();
 	}
 	
-	
-	public JpaComposite buildAttributeMappingComposite(
-			OrmXmlUiFactory factory,
-			PropertyValueModel<OrmOneToOneMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return factory.createOrmOneToOneMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+	public JpaComposite buildAttributeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<OrmOneToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return factory.createOrmOneToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPackageChooser.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPackageChooser.java
index 702f0b266f..2563bc8917 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPackageChooser.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPackageChooser.java
@@ -27,7 +27,7 @@ import org.eclipse.swt.widgets.Composite;
  * -----------------------------------------------------------------------------</pre>
  *
  * @see EntityMappings
- * @see EntityMappingsDetailsPage - The parent container
+ * @see EntityMappingsDetailsPageManager - The parent container
  * @see PackageChooserPane
  *
  * @version 2.0
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentAttributeDetailsPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentAttributeDetailsPageManager.java
index 3f335f1c23..9c7f266969 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentAttributeDetailsPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentAttributeDetailsPageManager.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
@@ -16,7 +17,7 @@ import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
 import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyPersistentAttribute;
-import org.eclipse.jpt.jpa.ui.internal.details.PersistentAttributeDetailsPage;
+import org.eclipse.jpt.jpa.ui.internal.details.PersistentAttributeDetailsPageManager;
 import org.eclipse.jpt.jpa.ui.internal.details.PersistentAttributeMapAsComposite;
 import org.eclipse.swt.widgets.Composite;
 
@@ -29,7 +30,7 @@ import org.eclipse.swt.widgets.Composite;
  * -----------------------------------------------------------------------------
  * | ------------------------------------------------------------------------- |
  * | |                                                                       | |
- * | | OrmPersistentAttributeMapAsComposite                                  | |
+ * | | PersistentAttributeMapAsComposite                                     | |
  * | |                                                                       | |
  * | ------------------------------------------------------------------------- |
  * | ------------------------------------------------------------------------- |
@@ -40,27 +41,15 @@ import org.eclipse.swt.widgets.Composite;
  * -----------------------------------------------------------------------------</pre>
  *
  * @see OrmPersistentAttribute
- * @see OrmPersistentAttributeMapAsComposite
- *
- * @version 2.3
- * @since 2.0
+ * @see PersistentAttributeMapAsComposite
  */
-public class OrmPersistentAttributeDetailsPage
-	extends PersistentAttributeDetailsPage<OrmReadOnlyPersistentAttribute>
+public class OrmPersistentAttributeDetailsPageManager
+	extends PersistentAttributeDetailsPageManager<OrmReadOnlyPersistentAttribute>
 {
-	
 	private PropertyValueModel<Boolean> virtualAttributeEnabledModel;
 
-	/**
-	 * Creates a new <code>OrmPersistentAttributeDetailsPage</code>.
-	 *
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public OrmPersistentAttributeDetailsPage(Composite parent,
-	                                         WidgetFactory widgetFactory) {
-
-		super(parent, widgetFactory);
+	public OrmPersistentAttributeDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		super(parent, widgetFactory, resourceManager);
 	}
 
 	@Override
@@ -71,10 +60,8 @@ public class OrmPersistentAttributeDetailsPage
 
 	@Override
 	protected void initializeLayout(Composite container) {
-		// Map As composite
 		this.buildMapAsPane(container);
-
-		this.buildMappingPageBook(container);
+		super.initializeLayout(container);
 	}
 
 	protected Pane<ReadOnlyPersistentAttribute> buildMapAsPane(Composite parent) {
@@ -84,8 +71,8 @@ public class OrmPersistentAttributeDetailsPage
 	private PropertyValueModel<Boolean> buildVirtualAttributeEnabledModel() {
 		return new TransformationPropertyValueModel<OrmReadOnlyPersistentAttribute, Boolean>(getSubjectHolder()) {
 			@Override
-			protected Boolean transform_(OrmReadOnlyPersistentAttribute value) {
-				return Boolean.valueOf(!value.isVirtual());
+			protected Boolean transform_(OrmReadOnlyPersistentAttribute attribute) {
+				return Boolean.valueOf( ! attribute.isVirtual());
 			}
 		};
 	}
@@ -94,4 +81,4 @@ public class OrmPersistentAttributeDetailsPage
 	protected PropertyValueModel<Boolean> getMappingCompositeEnabledModel() {
 		return this.virtualAttributeEnabledModel;
 	}
-}
-\ No newline at end of file
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentAttributeDetailsProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentAttributeDetailsProvider.java
index 12bf330005..ae2b359b0a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentAttributeDetailsProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentAttributeDetailsProvider.java
@@ -9,11 +9,11 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.ObjectTools;
 import org.eclipse.jpt.jpa.core.JpaStructureNode;
 import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
-import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyPersistentAttribute;
 import org.eclipse.jpt.jpa.core.resource.ResourceMappingFile;
 import org.eclipse.jpt.jpa.ui.details.JpaDetailsPageManager;
 import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider;
@@ -52,10 +52,7 @@ public class OrmPersistentAttributeDetailsProvider
 				&& structureNode.getResourceType().getContentType().isKindOf(ResourceMappingFile.Root.CONTENT_TYPE);
 	}
 	
-	public JpaDetailsPageManager<OrmReadOnlyPersistentAttribute> buildDetailsPageManager(
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return new OrmPersistentAttributeDetailsPage(parent, widgetFactory);
+	public JpaDetailsPageManager<? extends JpaStructureNode> buildDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return new OrmPersistentAttributeDetailsPageManager(parent, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentTypeDetailsProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentTypeDetailsProvider.java
index e813797c3c..783734ee4f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentTypeDetailsProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentTypeDetailsProvider.java
@@ -9,15 +9,15 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.ObjectTools;
 import org.eclipse.jpt.jpa.core.JpaStructureNode;
-import org.eclipse.jpt.jpa.core.context.PersistentType;
 import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType;
 import org.eclipse.jpt.jpa.core.resource.ResourceMappingFile;
 import org.eclipse.jpt.jpa.ui.details.JpaDetailsPageManager;
 import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider;
-import org.eclipse.jpt.jpa.ui.internal.details.PersistentTypeDetailsPage;
+import org.eclipse.jpt.jpa.ui.internal.details.PersistentTypeDetailsPageManager;
 import org.eclipse.swt.widgets.Composite;
 
 /**
@@ -53,10 +53,7 @@ public class OrmPersistentTypeDetailsProvider
 				&& structureNode.getResourceType().getContentType().isKindOf(ResourceMappingFile.Root.CONTENT_TYPE);
 	}
 	
-	public JpaDetailsPageManager<PersistentType> buildDetailsPageManager(
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return new PersistentTypeDetailsPage(parent, widgetFactory);
+	public JpaDetailsPageManager<? extends JpaStructureNode> buildDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return new PersistentTypeDetailsPageManager(parent, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmTransientMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmTransientMappingUiDefinition.java
index 921fc4e903..f5a2ffee23 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmTransientMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmTransientMappingUiDefinition.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
@@ -44,14 +45,7 @@ public class OrmTransientMappingUiDefinition
 		super();
 	}
 	
-	
-	public JpaComposite buildAttributeMappingComposite(
-			OrmXmlUiFactory factory,
-			PropertyValueModel<OrmTransientMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return factory.createOrmTransientMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+	public JpaComposite buildAttributeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<OrmTransientMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return factory.createOrmTransientMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmVersionMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmVersionMappingComposite.java
index c84437fcfd..041665db4d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmVersionMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmVersionMappingComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.VersionMapping;
@@ -21,19 +22,13 @@ import org.eclipse.swt.widgets.Control;
 public class OrmVersionMappingComposite
 	extends AbstractVersionMappingComposite<VersionMapping>
 {
-	/**
-	 * Creates a new <code>EclipseLinkOrmVersionMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>VersionMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public OrmVersionMappingComposite(PropertyValueModel<? extends VersionMapping> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-									WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public OrmVersionMappingComposite(
+			PropertyValueModel<? extends VersionMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmVersionMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmVersionMappingUiDefinition.java
index 0c787c9d39..336bc66a72 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmVersionMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmVersionMappingUiDefinition.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
@@ -44,14 +45,7 @@ public class OrmVersionMappingUiDefinition
 		super();
 	}
 	
-	
-	public JpaComposite buildAttributeMappingComposite(
-			OrmXmlUiFactory factory,
-			PropertyValueModel<OrmVersionMapping> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return factory.createOrmVersionMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+	public JpaComposite buildAttributeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<OrmVersionMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return factory.createOrmVersionMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/PersistenceUnitMetadataComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/PersistenceUnitMetadataComposite.java
index 1c330ea95b..a55b7d0752 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/PersistenceUnitMetadataComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/PersistenceUnitMetadataComposite.java
@@ -57,7 +57,7 @@ import org.eclipse.swt.widgets.Composite;
  *
  * @see PersistenceUnitMetadata
  * @see OrmPersistenceUnitDefaults
- * @see EntityMappingsDetailsPage - The parent container
+ * @see EntityMappingsDetailsPageManager - The parent container
  * @see CatalogCombo
  * @see SchemaCombo
  * @see EnumFormComboViewer
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/UnsupportedOrmAttributeMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/UnsupportedOrmAttributeMappingUiDefinition.java
index fa650579d8..cdf509a705 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/UnsupportedOrmAttributeMappingUiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/UnsupportedOrmAttributeMappingUiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -52,17 +53,17 @@ public class UnsupportedOrmAttributeMappingUiDefinition
 	public String getLinkLabel() {
 		return JptUiDetailsOrmMessages.UnsupportedOrmMappingUiProvider_linkLabel;
 	}
-	
-	public JpaComposite buildAttributeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel mappingModel, PropertyValueModel enabledModel, Composite parent, WidgetFactory widgetFactory) {
-		return new NullComposite(mappingModel, parent, widgetFactory);
+
+	public JpaComposite buildAttributeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel mappingModel, PropertyValueModel enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return new NullComposite(mappingModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	public static class NullComposite
 		extends Pane<JavaAttributeMapping>
 		implements JpaComposite
 	{
-		NullComposite(PropertyValueModel<JavaAttributeMapping> mappingModel, Composite parent, WidgetFactory widgetFactory) {
-			super(mappingModel, parent, widgetFactory);
+		NullComposite(PropertyValueModel<JavaAttributeMapping> mappingModel, Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+			super(mappingModel, parent, widgetFactory, resourceManager);
 		}
 		@Override
 		protected void initializeLayout(Composite container) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/editors/JpaXmlEditor.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/editors/JpaXmlEditor.java
index 4c37dbf3b7..0aafef549b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/editors/JpaXmlEditor.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/editors/JpaXmlEditor.java
@@ -12,12 +12,10 @@ package org.eclipse.jpt.jpa.ui.internal.editors;
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IToolBarManager;
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.resource.LocalResourceManager;
 import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.core.JptResourceType;
+import org.eclipse.jpt.common.core.internal.utility.PlatformTools;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.util.SWTUtil;
 import org.eclipse.jpt.common.ui.internal.widgets.FormWidgetFactory;
@@ -42,6 +40,7 @@ import org.eclipse.jpt.jpa.core.JpaPlatform;
 import org.eclipse.jpt.jpa.core.JpaStructureNode;
 import org.eclipse.jpt.jpa.ui.JpaFileModel;
 import org.eclipse.jpt.jpa.ui.JpaPlatformUi;
+import org.eclipse.jpt.jpa.ui.JpaWorkbench;
 import org.eclipse.jpt.jpa.ui.ResourceUiDefinition;
 import org.eclipse.jpt.jpa.ui.editors.JpaEditorPageDefinition;
 import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
@@ -55,6 +54,7 @@ import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.IFileEditorInput;
 import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.forms.IManagedForm;
@@ -62,6 +62,7 @@ import org.eclipse.ui.forms.editor.FormEditor;
 import org.eclipse.ui.forms.editor.FormPage;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
+import org.eclipse.ui.part.MultiPageEditorPart;
 import org.eclipse.ui.part.MultiPageEditorSite;
 import org.eclipse.wst.sse.ui.StructuredTextEditor;
 
@@ -92,7 +93,7 @@ public class JpaXmlEditor
 	 * persistence.xml and orm.xml models.
 	 * <p>
 	 * We listen to changes to this model and swap out the editor pages.
-	 * Do not use this model as the subjectModel for the pages, 
+	 * Do not use this model as the subjectModel for the pages,
 	 * we need to control that model ourselves.
 	 * @see #pageRootStructureNodeModel
 	 */
@@ -117,22 +118,25 @@ public class JpaXmlEditor
 	private final StructuredTextEditor structuredTextEditor;
 
 	/**
-	 * The factory used to create the various widgets.
-	 * The widgetFactory wraps the editor's toolkit, is created 
-	 * when the editor's toolkit is {@link #createToolkit(Display) created}
-	 * and disposed, when the editor is {@link #dispose() disposed}.
+	 * The (local) resource manager used by the editor pages to create
+	 * and destroy images. The resource manager wraps the
+	 * {@link JpaWorkbench JPA workbench}'s resource manager, is created
+	 * when the editor's {@link #createToolkit(Display) toolkit is created},
+	 * and is disposed when the editor is {@link #dispose() disposed}.
 	 */
-	private WidgetFactory widgetFactory;
+	ResourceManager resourceManager;
 
 	/**
-	 * The local resource manager, used to create/destroy Images
+	 * The factory used by the editor pages to create the various widgets.
+	 * The widget factory wraps the editor's toolkit, is created
+	 * when the editor's {@link #createToolkit(Display) toolkit is created},
+	 * and is disposed when the editor is {@link #dispose() disposed}.
 	 */
-	final ResourceManager localResourceManager;
+	WidgetFactory widgetFactory;
 
 
 	public JpaXmlEditor() {
 		super();
-		this.localResourceManager = new LocalResourceManager(JFaceResources.getResources());
 		this.structuredTextEditor = new StructuredTextEditor();
 		this.structuredTextEditor.setEditorPart(this);
 	}
@@ -140,10 +144,19 @@ public class JpaXmlEditor
 	@Override
 	protected FormToolkit createToolkit(Display display) {
 		FormToolkit toolkit = super.createToolkit(display);
+		this.resourceManager = this.getJpaWorkbench().buildLocalResourceManager();
 		this.widgetFactory = new FormWidgetFactory(toolkit);
 		return toolkit;
 	}
 
+	private JpaWorkbench getJpaWorkbench() {
+		return PlatformTools.getAdapter(this.getWorkbench(), JpaWorkbench.class);
+	}
+
+	private IWorkbench getWorkbench() {
+		return this.getSite().getWorkbenchWindow().getWorkbench();
+	}
+
 	@Override
 	public void init(IEditorSite site, IEditorInput editorInput) throws PartInitException {
 		Assert.isLegal(editorInput instanceof IFileEditorInput, "Invalid Input: Must be IFileEditorInput"); //$NON-NLS-1$
@@ -178,7 +191,7 @@ public class JpaXmlEditor
 	/**
 	 * Adds the page containing the XML source editor.
 	 */
-	protected void addXMLSourceEditorPage() {
+	private void addXMLSourceEditorPage() {
 		try {
 			int index = this.addPage(this.structuredTextEditor, this.getEditorInput());
 			this.setPageText(index, JptUiMessages.JpaXmlEditor_sourcePage);
@@ -192,10 +205,10 @@ public class JpaXmlEditor
 	 * Add the pages for editing the selected JpaStructureNode. These
 	 * will be the pages that come before the XML source editor.
 	 * <p>
-	 * @see #getRootStructureNode()
+	 * @see #setPageRootStructureNode_(JpaStructureNode)
 	 * @see Page
 	 */
-	protected void addSpecificPages(PropertyValueModel<JpaStructureNode> structureNodeModel) {
+	private void addSpecificPages(PropertyValueModel<JpaStructureNode> structureNodeModel) {
 		JpaStructureNode rootStructureNode = structureNodeModel.getValue();
 		JptResourceType resourceType = rootStructureNode.getResourceType();
 		if (resourceType == null) {
@@ -223,18 +236,25 @@ public class JpaXmlEditor
 
 	@Override
 	protected IEditorSite createSite(IEditorPart editor) {
-		if (editor == this.structuredTextEditor) {
-			return new MultiPageEditorSite(this, editor) {
-				@Override
-				public String getId() {
-					// sets this id so nested editor is considered an xml source page
-					// I know this makes the XML source toolbar buttons appear on all
-					// the tabs instead of just the Source tab, not sure what else it does ~kfb
-					return "org.eclipse.core.runtime.xml.source"; //$NON-NLS-1$;
-				}
-			};
+		return (editor == this.structuredTextEditor) ?
+				new Site(this, editor) :
+				super.createSite(editor);
+	}
+
+	/* CU private */ static class Site
+		extends MultiPageEditorSite
+	{
+		Site(MultiPageEditorPart multiPageEditor, IEditorPart editor) {
+			super(multiPageEditor, editor);
+		}
+
+		@Override
+		public String getId() {
+			// sets this id so nested editor is considered an xml source page
+			// I know this makes the XML source toolbar buttons appear on all
+			// the tabs instead of just the Source tab, not sure what else it does ~kfb
+			return "org.eclipse.core.runtime.xml.source"; //$NON-NLS-1$;
 		}
-		return super.createSite(editor);
 	}
 
 	/**
@@ -296,7 +316,7 @@ public class JpaXmlEditor
 		this.execute(new SetPageRootStructureNodeRunnable(jpaStructureNode));
 	}
 
-	protected void setPageRootStructureNode_(JpaStructureNode rootStructureNode) {
+	/* CU private */ void setPageRootStructureNode_(JpaStructureNode rootStructureNode) {
 		if (this.pageRootStructureNodeModel != null) {
 			this.pageRootStructureNodeModel.setValue(null);
 			this.pageRootStructureNodeModel = null;
@@ -319,27 +339,42 @@ public class JpaXmlEditor
 	}
 
 	//*should* be only 1 root structure node for the jpa file (this is true for persistence.xml and orm.xml files)
-	protected PropertyValueModel<JpaStructureNode> buildRootStructureNodeModel() {
-		return new CollectionPropertyValueModelAdapter<JpaStructureNode, JpaStructureNode>(this.buildRootStructureNodesCollectionModel()) {
-			@Override
-			protected JpaStructureNode buildValue() {
-				return this.collectionModel.size() > 0 ? this.collectionModel.iterator().next() : null;
-			}
-		};
+	private PropertyValueModel<JpaStructureNode> buildRootStructureNodeModel() {
+		return new RootStructureNodeModel(this.buildRootStructureNodesCollectionModel());
 	}
 
-	protected CollectionValueModel<JpaStructureNode> buildRootStructureNodesCollectionModel() {
-		return new CollectionAspectAdapter<JpaFile, JpaStructureNode>(this.buildJpaFileModel(), JpaFile.ROOT_STRUCTURE_NODES_COLLECTION) {
-			@Override
-			protected Iterable<JpaStructureNode> getIterable() {
-				return this.subject.getRootStructureNodes();
-			}
-	
-			@Override
-			protected int size_() {
-				return this.subject.getRootStructureNodesSize();
-			}
-		};
+	/* CU private */ static class RootStructureNodeModel
+		extends CollectionPropertyValueModelAdapter<JpaStructureNode, JpaStructureNode>
+	{
+		RootStructureNodeModel(CollectionValueModel<? extends JpaStructureNode> collectionModel) {
+			super(collectionModel);
+		}
+		@Override
+		protected JpaStructureNode buildValue() {
+			return this.collectionModel.size() > 0 ? this.collectionModel.iterator().next() : null;
+		}
+	}
+
+	private CollectionValueModel<JpaStructureNode> buildRootStructureNodesCollectionModel() {
+		return new RootStructureNodesCollectionModel(this.buildJpaFileModel());
+	}
+
+	/* CU private */ static class RootStructureNodesCollectionModel
+		extends CollectionAspectAdapter<JpaFile, JpaStructureNode>
+	{
+		RootStructureNodesCollectionModel(PropertyValueModel<? extends JpaFile> subjectModel) {
+			super(subjectModel, JpaFile.ROOT_STRUCTURE_NODES_COLLECTION);
+		}
+
+		@Override
+		protected Iterable<JpaStructureNode> getIterable() {
+			return this.subject.getRootStructureNodes();
+		}
+
+		@Override
+		protected int size_() {
+			return this.subject.getRootStructureNodesSize();
+		}
 	}
 
 	/* CU private */ class SetPageRootStructureNodeRunnable
@@ -363,13 +398,13 @@ public class JpaXmlEditor
 	}
 
 
-	
+
 	@Override
 	public void dispose() {
 		this.editorInputModel.setValue(null);
-		this.localResourceManager.dispose();
 		this.rootStructureNodeModel.removePropertyChangeListener(PropertyValueModel.VALUE, this.rootStructureNodeListener);
 		this.widgetFactory.dispose();
+		this.resourceManager.dispose();
 
 		super.dispose();
 	}
@@ -382,10 +417,6 @@ public class JpaXmlEditor
 		return (IFileEditorInput) super.getEditorInput();
 	}
 
-	public WidgetFactory getWidgetFactory() {
-		return this.widgetFactory;
-	}
-
 	private void execute(Runnable runnable) {
 		SWTUtil.execute(this.getSite().getShell().getDisplay(), runnable);
 	}
@@ -400,33 +431,29 @@ public class JpaXmlEditor
 
 	/**
 	 * This extension over <code>FormPage</code> simply completes the layout by
-	 * using the <code>JpaEditorPageDefinition</code> 
-	 * 
-	 * @see JpaEditorPageDefinition#buildEditorPageContent(IManagedForm, WidgetFactory, PropertyValueModel)
+	 * using the <code>JpaEditorPageDefinition</code>
+	 *
+	 * @see JpaEditorPageDefinition#buildContent(IManagedForm, WidgetFactory, ResourceManager, PropertyValueModel)
 	 */
-	class Page
+	/* CU private */ class Page
 		extends FormPage
 	{
 		/**
-		 * The editor page definition, find the page's text, image, help ID
-		 * and build the content.
+		 * The editor page definition; supplies the page's text, image, help ID,
+		 * and content.
 		 */
 		private final JpaEditorPageDefinition editorPageDefinition;
 
 		/**
-		 * This root structure node model.
+		 * The root structure node model.
 		 */
-		private PropertyValueModel<JpaStructureNode> structureNodeModel;
+		private final PropertyValueModel<JpaStructureNode> structureNodeModel;
 
-		/**
-		 * The FormPage's image descriptor, stored so that we can dispose of it.
-		 */
-		private ImageDescriptor imageDescriptor;
 
 		Page(JpaEditorPageDefinition editorPageDefinition, PropertyValueModel<JpaStructureNode> structureNodeModel) {
 			super(JpaXmlEditor.this,
 					editorPageDefinition.getClass().getName(),
-					editorPageDefinition.getPageText());
+					editorPageDefinition.getTitleText());
 
 			this.editorPageDefinition = editorPageDefinition;
 			this.structureNodeModel = structureNodeModel;
@@ -434,42 +461,45 @@ public class JpaXmlEditor
 
 		@Override
 		protected void createFormContent(IManagedForm managedForm) {
-
 			ScrolledForm form = managedForm.getForm();
 			managedForm.getToolkit().decorateFormHeading(form.getForm());
 
 			// Update the text and image
-			updateForm(form);
+			this.updateForm(form);
 
 			// Update the layout
-			updateBody(managedForm);
+			this.updateBody(managedForm);
 
 			// This will finish the initialization of the buttons
-			updateHelpButton();
+			this.updateHelpButton();
 			form.updateToolBar();
 		}
 
 		/**
-		 * Updates the text and image of the form. The image can be null.
-		 * 
+		 * Set the form's title text and image.
+		 * The image can be <code>null</code>.
 		 */
 		private void updateForm(ScrolledForm form) {
-			form.setText(this.editorPageDefinition.getPageText());
-
-			this.imageDescriptor = this.editorPageDefinition.getPageImageDescriptor();
-			if (this.imageDescriptor != null) {
-				form.setImage(JpaXmlEditor.this.localResourceManager.createImage(this.imageDescriptor));
+			form.setText(this.editorPageDefinition.getTitleText());
+			ImageDescriptor imageDescriptor = this.editorPageDefinition.getTitleImageDescriptor();
+			if (imageDescriptor != null) {
+				form.setImage(JpaXmlEditor.this.resourceManager.createImage(imageDescriptor));
 			}
 		}
 
 		/**
-		 * Adds the page's control to this page.
+		 * Build the page's control.
 		 */
 		private void updateBody(IManagedForm form) {
 			Composite body = form.getForm().getBody();
 			body.setLayout(new GridLayout(1, true));
 
-			this.editorPageDefinition.buildEditorPageContent(form, getWidgetFactory(), this.structureNodeModel);
+			this.editorPageDefinition.buildContent(
+					form,
+					JpaXmlEditor.this.widgetFactory,
+					JpaXmlEditor.this.resourceManager,
+					this.structureNodeModel
+				);
 			//calling this because it makes the scroll bar appear on the editor tabs when the content
 			//is larger than the editor tab area. Not sure how else to make this happen
 			form.reflow(true);
@@ -480,19 +510,17 @@ public class JpaXmlEditor
 		 */
 		private void updateHelpButton() {
 			String helpID = this.editorPageDefinition.getHelpID();
-
 			if (helpID != null) {
-				Action helpAction = new HelpAction(helpID);
-
-				ScrolledForm form = getManagedForm().getForm();
-				IToolBarManager manager = form.getToolBarManager();
-				manager.add(helpAction);
+				this.getManagedForm().getForm().getToolBarManager().add(new HelpAction(helpID));
 			}
 		}
 
 		@Override
 		public void dispose() {
-			JpaXmlEditor.this.localResourceManager.destroyImage(this.imageDescriptor);
+			ImageDescriptor imageDescriptor = this.editorPageDefinition.getTitleImageDescriptor();
+			if (imageDescriptor != null) {
+				JpaXmlEditor.this.resourceManager.destroyImage(imageDescriptor);
+			}
 			super.dispose();
 		}
 
@@ -501,7 +529,7 @@ public class JpaXmlEditor
 			StringBuilder sb = new StringBuilder();
 			StringBuilderTools.appendHashCodeToString(sb, this);
 			sb.append('(');
-			sb.append(this.editorPageDefinition.getPageText());
+			sb.append(this.editorPageDefinition.getTitleText());
 			sb.append(')');
 			return sb.toString();
 		}
@@ -523,7 +551,7 @@ public class JpaXmlEditor
 
 			@Override
 			public void run() {
-				BusyIndicator.showWhile(getManagedForm().getForm().getDisplay(), new Runnable() {
+				BusyIndicator.showWhile(Page.this.getManagedForm().getForm().getDisplay(), new Runnable() {
 					public void run() {
 						PlatformUI.getWorkbench().getHelpSystem().displayHelp(HelpAction.this.helpID);
 					}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/GenericOrmXml2_0UiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/GenericOrmXml2_0UiFactory.java
index 5f5815dbf9..e7815706dc 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/GenericOrmXml2_0UiFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/GenericOrmXml2_0UiFactory.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.jpa2;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.orm.OrmBasicMapping;
@@ -25,7 +26,7 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmVersionMapping;
 import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmElementCollectionMapping2_0;
 import org.eclipse.jpt.jpa.ui.details.JpaComposite;
 import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingComposite;
-import org.eclipse.jpt.jpa.ui.internal.details.orm.BaseOrmXmlUiFactory;
+import org.eclipse.jpt.jpa.ui.internal.details.orm.AbstractOrmXmlUiFactory;
 import org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm.OrmBasicMapping2_0Composite;
 import org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm.OrmElementCollectionMapping2_0Composite;
 import org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm.OrmEmbeddedIdMapping2_0Composite;
@@ -40,119 +41,130 @@ import org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm.OrmVersionMapping2_0Comp
 import org.eclipse.jpt.jpa.ui.jpa2.details.orm.OrmXmlUiFactory2_0;
 import org.eclipse.swt.widgets.Composite;
 
-public class GenericOrmXml2_0UiFactory 
-	extends BaseOrmXmlUiFactory
+public class GenericOrmXml2_0UiFactory
+	extends AbstractOrmXmlUiFactory
 	implements OrmXmlUiFactory2_0
 {
-	// **************** orm type mapping composites ****************************
-		
+	// ********** type mappings **********
+
 	@Override
 	public JpaComposite createOrmEntityComposite(
-			PropertyValueModel<OrmEntity> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEntity2_0Composite(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<OrmEntity> entityModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEntity2_0Composite(entityModel, parentComposite, widgetFactory, resourceManager);
 	}
 
-	
-	// **************** orm attribute mapping composites ***********************
-	
+
+	// **************** attribute mappings ***********************
+
 	@Override
 	public JpaComposite createOrmIdMappingComposite(
-			PropertyValueModel<OrmIdMapping> subjectHolder,
+			PropertyValueModel<OrmIdMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmIdMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmIdMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
-	
+
 	@Override
 	public JpaComposite createOrmEmbeddedIdMappingComposite(
-			PropertyValueModel<OrmEmbeddedIdMapping> subjectHolder,
+			PropertyValueModel<OrmEmbeddedIdMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEmbeddedIdMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEmbeddedIdMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
-	
+
 	@Override
 	public JpaComposite createOrmBasicMappingComposite(
-			PropertyValueModel<OrmBasicMapping> subjectHolder,
+			PropertyValueModel<OrmBasicMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmBasicMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmBasicMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
-	
+
 	@Override
 	public JpaComposite createOrmVersionMappingComposite(
-			PropertyValueModel<OrmVersionMapping> subjectHolder,
+			PropertyValueModel<OrmVersionMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmVersionMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmVersionMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
-	
+
 	@Override
 	public JpaComposite createOrmManyToOneMappingComposite(
-			PropertyValueModel<OrmManyToOneMapping> subjectHolder,
+			PropertyValueModel<OrmManyToOneMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmManyToOneMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmManyToOneMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
-	
+
 	@Override
 	public JpaComposite createOrmOneToManyMappingComposite(
-			PropertyValueModel<OrmOneToManyMapping> subjectHolder,
+			PropertyValueModel<OrmOneToManyMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmOneToManyMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmOneToManyMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
-	
+
 	@Override
 	public JpaComposite createOrmOneToOneMappingComposite(
-			PropertyValueModel<OrmOneToOneMapping> subjectHolder,
+			PropertyValueModel<OrmOneToOneMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmOneToOneMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmOneToOneMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
-	
+
 	@Override
 	public JpaComposite createOrmManyToManyMappingComposite(
-			PropertyValueModel<OrmManyToManyMapping> subjectHolder,
+			PropertyValueModel<OrmManyToManyMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmManyToManyMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmManyToManyMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
-	
+
 	@Override
 	public JpaComposite createOrmEmbeddedMappingComposite(
-			PropertyValueModel<OrmEmbeddedMapping> subjectHolder,
+			PropertyValueModel<OrmEmbeddedMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmEmbeddedMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmEmbeddedMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
-	
+
 	@Override
 	public JpaComposite createOrmTransientMappingComposite(
-			PropertyValueModel<OrmTransientMapping> subjectHolder,
+			PropertyValueModel<OrmTransientMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new TransientMappingComposite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new TransientMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
-	
+
 	public JpaComposite createOrmElementCollectionMapping2_0Composite(
-			PropertyValueModel<OrmElementCollectionMapping2_0> subjectHolder,
+			PropertyValueModel<OrmElementCollectionMapping2_0> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new OrmElementCollectionMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new OrmElementCollectionMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
-
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/OrmXml2_0FlagModel.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/OrmXml2_0FlagModel.java
index ad3304e542..f998b260a2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/OrmXml2_0FlagModel.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/OrmXml2_0FlagModel.java
@@ -17,7 +17,7 @@ import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.GenericOrmXml2_0Defini
 public class OrmXml2_0FlagModel<R extends JptResourceTypeReference>
 	extends TransformationPropertyValueModel<R, Boolean>
 {
-	public OrmXml2_0FlagModel(PropertyValueModel<R> valueModel) {
+	public OrmXml2_0FlagModel(PropertyValueModel<? extends R> valueModel) {
 		super(valueModel);
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractElementCollectionMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractElementCollectionMapping2_0Composite.java
index 581fed6ef5..d04264f6f9 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractElementCollectionMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractElementCollectionMapping2_0Composite.java
@@ -9,22 +9,22 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.jpa2.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.util.ControlSwitcher;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
-import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
+import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.common.utility.transformer.Transformer;
-import org.eclipse.jpt.jpa.core.context.BasicMapping;
+import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter;
+import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
 import org.eclipse.jpt.jpa.core.context.CollectionMapping;
 import org.eclipse.jpt.jpa.core.context.Column;
 import org.eclipse.jpt.jpa.core.context.Converter;
 import org.eclipse.jpt.jpa.core.context.ConvertibleMapping;
-import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter;
 import org.eclipse.jpt.jpa.core.context.LobConverter;
-import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
 import org.eclipse.jpt.jpa.core.jpa2.context.CollectionTable2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.ElementCollectionMapping2_0;
 import org.eclipse.jpt.jpa.ui.details.JpaComposite;
@@ -46,53 +46,6 @@ import org.eclipse.ui.forms.widgets.Hyperlink;
 import org.eclipse.ui.forms.widgets.Section;
 import org.eclipse.ui.part.PageBook;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | ColumnComposite                                                       | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | FetchTypeComposite                                                    | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | TemporalTypeComposite                                                 | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | EnumTypeComposite                                                     | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | OptionalComposite                                                     | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | LobComposite                                                          | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see BasicMapping
- * @see OrderColumnComposite
- * @see EnumTypeComboViewer
- * @see FetchTypeComboViewer
- * @see LobComposite
- * @see OptionalTriStateCheckBox
- * @see TemporalTypeCombo
- *
- * @version 2.3
- * @since 2.3
- */
 public abstract class AbstractElementCollectionMapping2_0Composite<T extends ElementCollectionMapping2_0> 
 	extends Pane<T>
 	implements JpaComposite
@@ -102,19 +55,13 @@ public abstract class AbstractElementCollectionMapping2_0Composite<T extends Ele
 	
 	private Control embeddableValueComposite;
 	
-	/**
-	 * Creates a new <code>BasicMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>IBasicMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	protected AbstractElementCollectionMapping2_0Composite(PropertyValueModel<? extends T> subjectHolder,
-								 PropertyValueModel<Boolean> enabledModel,
-	                             Composite parent,
-	                             WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	protected AbstractElementCollectionMapping2_0Composite(
+			PropertyValueModel<? extends T> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
@@ -259,7 +206,7 @@ public abstract class AbstractElementCollectionMapping2_0Composite<T extends Ele
 			JptUiDetailsMessages.TypeSection_temporal, 
 			buildTemporalBooleanHolder(), 
 			null);
-		registerSubPane(new TemporalTypeCombo(buildTemporalConverterHolder(converterHolder), getEnabledModel(), container, getWidgetFactory()));
+		new TemporalTypeCombo(this, this.buildTemporalConverterHolder(converterHolder), container);
 
 
 		// Enumerated
@@ -268,7 +215,7 @@ public abstract class AbstractElementCollectionMapping2_0Composite<T extends Ele
 			JptUiDetailsMessages.TypeSection_enumerated, 
 			buildEnumeratedBooleanHolder(), 
 			null);
-		registerSubPane(new EnumTypeComboViewer(buildEnumeratedConverterHolder(converterHolder), getEnabledModel(), container, getWidgetFactory()));
+		new EnumTypeComboViewer(this, this.buildEnumeratedConverterHolder(converterHolder), container);
 
 		return container;
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractElementCollectionMapping2_0UiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractElementCollectionMapping2_0UiDefinition.java
index c4a40b7ecd..97b46d1c65 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractElementCollectionMapping2_0UiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractElementCollectionMapping2_0UiDefinition.java
@@ -9,9 +9,10 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.jpa2.details;
 
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jpt.jpa.core.jpa2.MappingKeys2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.ElementCollectionMapping2_0;
-import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 import org.eclipse.jpt.jpa.ui.internal.details.AbstractMappingUiDefinition;
 
 public abstract class AbstractElementCollectionMapping2_0UiDefinition<M, T extends ElementCollectionMapping2_0>
@@ -34,7 +35,7 @@ public abstract class AbstractElementCollectionMapping2_0UiDefinition<M, T exten
 	}
 
 	@Override
-	protected String getImageKey() {
-		return JptUiIcons.ELEMENT_COLLECTION;
+	public ImageDescriptor getImageDescriptor() {
+		return JptJpaUiImages.ELEMENT_COLLECTION;
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractManyToOneMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractManyToOneMapping2_0Composite.java
index 479809119b..94984a5341 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractManyToOneMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractManyToOneMapping2_0Composite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.jpa2.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -23,12 +24,12 @@ public abstract class AbstractManyToOneMapping2_0Composite<T extends ManyToOneMa
 	extends AbstractManyToOneMappingComposite<T, R>
 {
 	protected AbstractManyToOneMapping2_0Composite(
-			PropertyValueModel<? extends T> subjectHolder,
+			PropertyValueModel<? extends T> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-	        WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+	        WidgetFactory widgetFactory,
+	        ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractOneToOneMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractOneToOneMapping2_0Composite.java
index bf230d0031..850468be72 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractOneToOneMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractOneToOneMapping2_0Composite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.jpa2.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -23,12 +24,12 @@ public abstract class AbstractOneToOneMapping2_0Composite<T extends OneToOneMapp
 	extends AbstractOneToOneMappingComposite<T, R>
 {
 	protected AbstractOneToOneMapping2_0Composite(
-			PropertyValueModel<? extends T> subjectHolder,
+			PropertyValueModel<? extends T> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-	        WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+	        WidgetFactory widgetFactory,
+	        ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/CascadePane2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/CascadePane2_0.java
index f79276acda..1f563e79e7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/CascadePane2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/CascadePane2_0.java
@@ -9,11 +9,10 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.jpa2.details;
 
-import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
-import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
+import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.Cascade;
 import org.eclipse.jpt.jpa.core.context.RelationshipMapping;
 import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0;
@@ -25,19 +24,11 @@ public class CascadePane2_0
 	extends CascadeComposite
 {
 	public CascadePane2_0(
-			Pane<? extends RelationshipMapping> parentPane,
-	        PropertyValueModel<? extends Cascade> subjectHolder,
-	        Composite parent) {
-		
-		super(parentPane, subjectHolder, parent);
-	}
-	
-	public CascadePane2_0(
-			PropertyValueModel<? extends Cascade> subjectHolder,
-			Composite parent,
-		    WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, parent, widgetFactory);
+		Pane<? extends RelationshipMapping> parentPane,
+		PropertyValueModel<? extends Cascade> cascadeModel,
+		Composite parent
+	) {
+		super(parentPane, cascadeModel, parent);
 	}
 	
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/CollectionTable2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/CollectionTable2_0Composite.java
index 63be9a1ee1..1d907cb9f7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/CollectionTable2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/CollectionTable2_0Composite.java
@@ -9,11 +9,9 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.jpa2.details;
 
-import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyReferenceTable;
-import org.eclipse.jpt.jpa.core.jpa2.context.CollectionTable2_0;
 import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
 import org.eclipse.jpt.jpa.ui.internal.details.JoinColumnsComposite;
 import org.eclipse.jpt.jpa.ui.internal.details.ReferenceTableComposite;
@@ -21,68 +19,14 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Group;
 
-/**
- * The layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * |            ------------------------------------------------------------   |
- * |   Name:    |                                                        |v|   |
- * |            ------------------------------------------------------------   |
- * |            ------------------------------------------------------------   |
- * |   Schema:  |                                                        |v|   |
- * |            ------------------------------------------------------------   |
- * |            ------------------------------------------------------------   |
- * |   Catalog: |                                                        |v|   |
- * |            ------------------------------------------------------------   |
- * |                                                                           |
- * | - Join Columns ---------------------------------------------------------- |
- * | |                                                                       | |
- * | | x Override Default                                                    | |
- * | |                                                                       | |
- * | | --------------------------------------------------------------------- | |
- * | | |                                                                   | | |
- * | | | JoinColumnsComposite                                              | | |
- * | | |                                                                   | | |
- * | | --------------------------------------------------------------------- | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see {@link CollectionTable2_0}
- * @see {@link JoinColumnsComposite
- *
- * @version 3.0
- * @since 3.0
- */
 public class CollectionTable2_0Composite
 	extends ReferenceTableComposite<ReadOnlyReferenceTable>
 {
-	/**
-	 * Creates a new <code>CollectionTable2_0Composite</code>.
-	 *
-	 * @param parentPane The parent container of this one
-	 * @param subjectHolder The holder of this pane's subject
-	 * @param parent The parent container
-	 */
 	public CollectionTable2_0Composite(
 			Pane<?> parentPane,
-			PropertyValueModel<? extends ReadOnlyReferenceTable> subjectHolder,
-			Composite parent) {
-
-		super(parentPane, subjectHolder, parent);
-	}
-
-	/**
-	 * Creates a new <code>CollectionTable2_0Composite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>CollectionTable2_0</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public CollectionTable2_0Composite(PropertyValueModel<? extends CollectionTable2_0> subjectHolder,
-	                          Composite parent,
-	                          WidgetFactory widgetFactory) {
-
-		super(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<? extends ReadOnlyReferenceTable> tableModel,
+			Composite parentComposite) {
+		super(parentPane, tableModel, parentComposite);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/ElementCollectionMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/ElementCollectionMapping2_0Composite.java
index 0851e6ec44..7eefb8bf56 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/ElementCollectionMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/ElementCollectionMapping2_0Composite.java
@@ -9,74 +9,22 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.jpa2.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.BasicMapping;
 import org.eclipse.jpt.jpa.core.jpa2.context.ElementCollectionMapping2_0;
 import org.eclipse.swt.widgets.Composite;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | TargetClassComposite                                                  | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | FetchTypeComposite                                                    | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | CollectionTableComposite                                              | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | ColumnComposite                                                       | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | OptionalComposite                                                     | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | LobComposite                                                          | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see BasicMapping
- * @see OrderColumnComposite
- * @see EnumTypeComboViewer
- * @see FetchTypeComboViewer
- * @see LobComposite
- * @see OptionalTriStateCheckBox
- * @see TemporalTypeCombo
- *
- * @version 2.3
- * @since 2.3
- */
-public class ElementCollectionMapping2_0Composite extends AbstractElementCollectionMapping2_0Composite<ElementCollectionMapping2_0>
+public class ElementCollectionMapping2_0Composite
+	extends AbstractElementCollectionMapping2_0Composite<ElementCollectionMapping2_0>
 {
-	/**
-	 * Creates a new <code>BasicMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>IBasicMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public ElementCollectionMapping2_0Composite(PropertyValueModel<? extends ElementCollectionMapping2_0> subjectHolder,
-								PropertyValueModel<Boolean> enabledModel,
-								Composite parent,
-	                            WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public ElementCollectionMapping2_0Composite(
+			PropertyValueModel<? extends ElementCollectionMapping2_0> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
-
-}
-\ No newline at end of file
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/EmbeddedIdMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/EmbeddedIdMapping2_0Composite.java
index e4579aad2f..07725d7367 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/EmbeddedIdMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/EmbeddedIdMapping2_0Composite.java
@@ -1,15 +1,15 @@
 /*******************************************************************************
- *  Copyright (c) 2010, 2012  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
+ * Copyright (c) 2010, 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ *
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.jpa2.details;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping;
@@ -22,12 +22,12 @@ public class EmbeddedIdMapping2_0Composite
 	extends AbstractEmbeddedIdMappingComposite<EmbeddedIdMapping>
 {
 	public EmbeddedIdMapping2_0Composite(
-			PropertyValueModel<? extends EmbeddedIdMapping> subjectHolder,
+			PropertyValueModel<? extends EmbeddedIdMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/Ordering2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/Ordering2_0Composite.java
index a8e214cfc9..12910557e0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/Ordering2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/Ordering2_0Composite.java
@@ -44,24 +44,14 @@ import org.eclipse.swt.widgets.Text;
  * -----------------------------------------------------------------------------</pre>
  *
  * @see CollectionMapping
- * @see OrmManyToManyMappingComposite - A container of this pane
- * @see OrmOneToManyMappingComposite - A container of this pane
- *
- * @version 2.3
- * @since 1.0
+ * @see OrmManyToManyMappingComposite
+ * @see OrmOneToManyMappingComposite
  */
-public class Ordering2_0Composite extends AbstractOrderingComposite
+public class Ordering2_0Composite
+	extends AbstractOrderingComposite
 {
-	/**
-	 * Creates a new <code>OrderingComposite</code>.
-	 *
-	 * @param parentPane The parent container of this one
-	 * @param parent The parent container
-	 */
-	public Ordering2_0Composite(Pane<? extends CollectionMapping> parentPane,
-	                         Composite parent) {
-
-		super(parentPane, parent);
+	public Ordering2_0Composite(Pane<? extends CollectionMapping> parentPane, Composite parentComposite) {
+		super(parentPane, parentComposite);
 	}
 	
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/Generic2_0JavaUiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/Generic2_0JavaUiFactory.java
index 68786d3bfc..d43fb82aa5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/Generic2_0JavaUiFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/Generic2_0JavaUiFactory.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.jpa2.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddable;
@@ -23,117 +24,124 @@ import org.eclipse.jpt.jpa.core.context.java.JavaOneToManyMapping;
 import org.eclipse.jpt.jpa.core.context.java.JavaOneToOneMapping;
 import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaElementCollectionMapping2_0;
 import org.eclipse.jpt.jpa.ui.details.JpaComposite;
-import org.eclipse.jpt.jpa.ui.internal.details.java.BaseJavaUiFactory;
+import org.eclipse.jpt.jpa.ui.internal.details.java.AbstractJavaUiFactory;
 import org.eclipse.jpt.jpa.ui.internal.jpa2.details.ElementCollectionMapping2_0Composite;
 import org.eclipse.jpt.jpa.ui.internal.jpa2.details.EmbeddedIdMapping2_0Composite;
 import org.eclipse.jpt.jpa.ui.jpa2.details.java.JavaUiFactory2_0;
 import org.eclipse.swt.widgets.Composite;
 
-/**
- * The default implementation of the UI factory required to show the information
- * related to a JPA mapping (type or attribute).
- *
- * @version 1.0
- * @since 1.0
- */
 public class Generic2_0JavaUiFactory
-	extends BaseJavaUiFactory
+	extends AbstractJavaUiFactory
 	implements JavaUiFactory2_0
 {
-	// **************** java type mapping composites ***************************
-	
+	// ********** type mappings **********
+
 	@Override
 	public JpaComposite createJavaMappedSuperclassComposite(
-			PropertyValueModel<JavaMappedSuperclass> subjectHolder,
-			Composite parent, WidgetFactory widgetFactory) {
-		return new JavaMappedSuperclass2_0Composite(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<JavaMappedSuperclass> mappedSuperclassModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new JavaMappedSuperclass2_0Composite(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager);
 	}
-	
+
 	@Override
 	public JpaComposite createJavaEntityComposite(
-			PropertyValueModel<JavaEntity> subjectHolder,
-			Composite parent, WidgetFactory widgetFactory) {
-		return new JavaEntity2_0Composite(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<JavaEntity> entityModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new JavaEntity2_0Composite(entityModel, parentComposite, widgetFactory, resourceManager);
 	}
-	
+
 	@Override
 	public JpaComposite createJavaEmbeddableComposite(
-			PropertyValueModel<JavaEmbeddable> subjectHolder,
-			Composite parent, WidgetFactory widgetFactory) {
-		return new JavaEmbeddable2_0Composite(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<JavaEmbeddable> embeddableModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new JavaEmbeddable2_0Composite(embeddableModel, parentComposite, widgetFactory, resourceManager);
 	}
-	
-	
-	// **************** java attribute mapping composites **********************
-	
+
+
+	// ********** attribute mappings **********
+
 	@Override
 	public JpaComposite createJavaIdMappingComposite(
-			PropertyValueModel<JavaIdMapping> subjectHolder,
+			PropertyValueModel<JavaIdMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new JavaIdMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new JavaIdMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
 	public JpaComposite createJavaEmbeddedIdMappingComposite(
-			PropertyValueModel<JavaEmbeddedIdMapping> subjectHolder, 
+			PropertyValueModel<JavaEmbeddedIdMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent, 
-			WidgetFactory widgetFactory) {
-		return new EmbeddedIdMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new EmbeddedIdMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
-	
+
 	@Override
 	public JpaComposite createJavaEmbeddedMappingComposite(
-			PropertyValueModel<JavaEmbeddedMapping> subjectHolder,
+			PropertyValueModel<JavaEmbeddedMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new JavaEmbeddedMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new JavaEmbeddedMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
-	
+
 	@Override
 	public JpaComposite createJavaManyToManyMappingComposite(
-			PropertyValueModel<JavaManyToManyMapping> subjectHolder, 
+			PropertyValueModel<JavaManyToManyMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent, 
-			WidgetFactory widgetFactory) {
-		return new JavaManyToManyMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new JavaManyToManyMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
-	
+
 	@Override
 	public JpaComposite createJavaManyToOneMappingComposite(
-			PropertyValueModel<JavaManyToOneMapping> subjectHolder, 
+			PropertyValueModel<JavaManyToOneMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent, 
-			WidgetFactory widgetFactory) {
-		return new JavaManyToOneMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new JavaManyToOneMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
 	public JpaComposite createJavaOneToManyMappingComposite(
-			PropertyValueModel<JavaOneToManyMapping> subjectHolder,
+			PropertyValueModel<JavaOneToManyMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new JavaOneToManyMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new JavaOneToManyMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
-	
+
 	@Override
 	public JpaComposite createJavaOneToOneMappingComposite(
-			PropertyValueModel<JavaOneToOneMapping> subjectHolder, 
+			PropertyValueModel<JavaOneToOneMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent, 
-			WidgetFactory widgetFactory) {
-		return new JavaOneToOneMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new JavaOneToOneMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
-	
+
 	public JpaComposite createJavaElementCollectionMapping2_0Composite(
-			PropertyValueModel<JavaElementCollectionMapping2_0> subjectHolder,
+			PropertyValueModel<JavaElementCollectionMapping2_0> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		return new ElementCollectionMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		return new ElementCollectionMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaElementCollectionMapping2_0UiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaElementCollectionMapping2_0UiDefinition.java
index 11ef945fa1..aa14677b15 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaElementCollectionMapping2_0UiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaElementCollectionMapping2_0UiDefinition.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.jpa2.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
@@ -44,14 +45,7 @@ public class JavaElementCollectionMapping2_0UiDefinition
 		super();
 	}
 	
-	
-	public JpaComposite buildAttributeMappingComposite(
-			JavaUiFactory factory,
-			PropertyValueModel<JavaElementCollectionMapping2_0> subjectHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return ((JavaUiFactory2_0) factory).createJavaElementCollectionMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory);
+	public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaElementCollectionMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return ((JavaUiFactory2_0) factory).createJavaElementCollectionMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaEmbeddable2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaEmbeddable2_0Composite.java
index a921dbae36..c33562390c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaEmbeddable2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaEmbeddable2_0Composite.java
@@ -9,69 +9,36 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.jpa2.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
-import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.jpa.core.context.AccessHolder;
 import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddable;
-import org.eclipse.jpt.jpa.ui.details.JpaComposite;
 import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
 import org.eclipse.jpt.jpa.ui.internal.details.AbstractEmbeddableComposite;
 import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.forms.widgets.Section;
 
-/**
- * This pane does not have any widgets.
- *
- * @see Embeddable
- * @see EmbeddableUiProvider
- *
- * @version 2.3
- * @since 2.0
- */
-public class JavaEmbeddable2_0Composite extends AbstractEmbeddableComposite<JavaEmbeddable>
-                                 implements JpaComposite
+public class JavaEmbeddable2_0Composite
+	extends AbstractEmbeddableComposite<JavaEmbeddable>
 {
-	/**
-	 * Creates a new <code>EmbeddableComposite</code>.
-	 *
-	 * @param subjectHolder The holder of this pane's subject
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public JavaEmbeddable2_0Composite(PropertyValueModel<? extends JavaEmbeddable> subjectHolder,
-	                           Composite parent,
-	                           WidgetFactory widgetFactory) {
-
-		super(subjectHolder, parent, widgetFactory);
+	public JavaEmbeddable2_0Composite(
+			PropertyValueModel<? extends JavaEmbeddable> embeddableModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(embeddableModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
-	protected void initializeLayout(Composite container) {
-		this.initializeEmbeddableCollapsibleSection(container);
-	}
-
-	@Override
-	protected Control initializeEmbeddableSection(Composite container) {
-		container = this.addSubPane(container, 2, 0, 0, 0, 0);
+	protected Control buildEmbeddableSectionClient(Section embeddableSection) {
+		Composite sectionClient = this.addSubPane(embeddableSection, 2, 0, 0, 0, 0);
 
 		// Access type widgets
-		this.addLabel(container, JptUiMessages.AccessTypeComposite_access);
-		new AccessTypeComboViewer(this, buildAccessHolder(), container);
-
-		return container;
-	}
+		this.addLabel(sectionClient, JptUiMessages.AccessTypeComposite_access);
+		new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), sectionClient);
 
-	protected PropertyValueModel<AccessHolder> buildAccessHolder() {
-		return new PropertyAspectAdapter<JavaEmbeddable, AccessHolder>(
-			getSubjectHolder())
-		{
-			@Override
-			protected AccessHolder buildValue_() {
-				return this.subject.getPersistentType();
-			}
-		};
+		return sectionClient;
 	}
-
-}
-\ No newline at end of file
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaEmbeddedMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaEmbeddedMapping2_0Composite.java
index 3885e6e6c2..c60f49b71a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaEmbeddedMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaEmbeddedMapping2_0Composite.java
@@ -9,47 +9,25 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.jpa2.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddedMapping;
-import org.eclipse.jpt.jpa.ui.details.JpaComposite;
 import org.eclipse.jpt.jpa.ui.internal.details.AbstractEmbeddedMappingComposite;
 import org.eclipse.jpt.jpa.ui.internal.jpa2.details.EmbeddedMapping2_0OverridesComposite;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | EmbeddedAttributeOverridesComposite                                   | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see EmbeddedMapping
- *
- * @version 2.3
- * @since 1.0
- */
-public class JavaEmbeddedMapping2_0Composite extends AbstractEmbeddedMappingComposite<JavaEmbeddedMapping>
-                                      implements JpaComposite
+public class JavaEmbeddedMapping2_0Composite
+	extends AbstractEmbeddedMappingComposite<JavaEmbeddedMapping>
 {
-	/**
-	 * Creates a new <code>EmbeddedMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>EmbeddedMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public JavaEmbeddedMapping2_0Composite(PropertyValueModel<? extends JavaEmbeddedMapping> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-	                                WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public JavaEmbeddedMapping2_0Composite(
+			PropertyValueModel<? extends JavaEmbeddedMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaEntity2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaEntity2_0Composite.java
index d15023442c..fe1f79b8ae 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaEntity2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaEntity2_0Composite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.jpa2.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -33,31 +34,15 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 
-/**
- * The pane used for a Java entity.
- *
- * @see JavaEntity
- * @see JavaSecondaryTablesComposite
- *
- * @version 2.3
- * @since 1.0
- */
 public class JavaEntity2_0Composite
 	extends AbstractEntityComposite<JavaEntity>
 {
-	/**
-	 * Creates a new <code>JavaEntityComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>JavaEntity</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
 	public JavaEntity2_0Composite(
-			PropertyValueModel<? extends JavaEntity> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<? extends JavaEntity> entityModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(entityModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaIdMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaIdMapping2_0Composite.java
index b3b10d3aa0..70ad519e10 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaIdMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaIdMapping2_0Composite.java
@@ -1,14 +1,15 @@
 /*******************************************************************************
-* Copyright (c) 2009, 2012 Oracle. All rights reserved.
-* This program and the accompanying materials are made available under the
-* terms of the Eclipse Public License v1.0, which accompanies this distribution
-* and is available at http://www.eclipse.org/legal/epl-v10.html.
-* 
-* Contributors:
-*     Oracle - initial API and implementation
-*******************************************************************************/
+ * Copyright (c) 2009, 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ *
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.jpa2.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.IdMapping;
@@ -23,12 +24,12 @@ public class JavaIdMapping2_0Composite
 	extends AbstractIdMappingComposite<IdMapping>
 {
 	public JavaIdMapping2_0Composite(
-			PropertyValueModel<? extends IdMapping> subjectHolder,
+			PropertyValueModel<? extends IdMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaManyToManyMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaManyToManyMapping2_0Composite.java
index 9953c4281c..9d1824c671 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaManyToManyMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaManyToManyMapping2_0Composite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.jpa2.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.java.JavaManyToManyMapping;
@@ -28,12 +29,12 @@ public class JavaManyToManyMapping2_0Composite
 	extends AbstractManyToManyMappingComposite<JavaManyToManyMapping, JavaManyToManyRelationship>
 {
 	public JavaManyToManyMapping2_0Composite(
-			PropertyValueModel<? extends JavaManyToManyMapping> subjectHolder,
+			PropertyValueModel<? extends JavaManyToManyMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-	        WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaManyToOneMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaManyToOneMapping2_0Composite.java
index fbd5433503..153eb53030 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaManyToOneMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaManyToOneMapping2_0Composite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.jpa2.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.java.JavaManyToOneMapping;
@@ -28,12 +29,12 @@ public class JavaManyToOneMapping2_0Composite
 	extends AbstractManyToOneMapping2_0Composite<JavaManyToOneMapping, JavaManyToOneRelationship2_0>
 {
 	public JavaManyToOneMapping2_0Composite(
-			PropertyValueModel<? extends JavaManyToOneMapping> subjectHolder,
+			PropertyValueModel<? extends JavaManyToOneMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-	        WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+	        WidgetFactory widgetFactory,
+	        ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaMappedSuperclass2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaMappedSuperclass2_0Composite.java
index 832a89cb47..1fe0139815 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaMappedSuperclass2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaMappedSuperclass2_0Composite.java
@@ -9,13 +9,12 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.jpa2.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.AccessHolder;
-import org.eclipse.jpt.jpa.core.context.MappedSuperclass;
 import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass;
-import org.eclipse.jpt.jpa.ui.details.JpaComposite;
 import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
 import org.eclipse.jpt.jpa.ui.internal.details.AbstractJavaMappedSuperclassComposite;
 import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer;
@@ -48,33 +47,16 @@ import org.eclipse.ui.forms.widgets.Hyperlink;
  * | |                                                                       | |
  * | ------------------------------------------------------------------------- |
  * -----------------------------------------------------------------------------</pre>
- *
- * @see MappedSuperclass
- * @see Generic2_0JavaUiFactory - The factory creating this pane
- * @see AccessTypeComposite
- * @see IdClassComposite
- *
- * @version 2.3
- * @since 2.0
  */
-
 public class JavaMappedSuperclass2_0Composite
 	extends AbstractJavaMappedSuperclassComposite
-    implements JpaComposite
 {
-	/**
-	 * Creates a new <code>MappedSuperclassComposite</code>.
-	 *
-	 * @param subjectHolder The holder of this pane's subject
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
 	public JavaMappedSuperclass2_0Composite(
-			PropertyValueModel<? extends JavaMappedSuperclass> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<? extends JavaMappedSuperclass> mappedSuperclassModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaOneToManyMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaOneToManyMapping2_0Composite.java
index f9fd2aea22..85e0c54c3e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaOneToManyMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaOneToManyMapping2_0Composite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.jpa2.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -33,12 +34,12 @@ public class JavaOneToManyMapping2_0Composite
 	extends AbstractOneToManyMappingComposite<JavaOneToManyMapping, JavaOneToManyRelationship2_0>
 {
 	public JavaOneToManyMapping2_0Composite(
-			PropertyValueModel<? extends JavaOneToManyMapping> subjectHolder,
+			PropertyValueModel<? extends JavaOneToManyMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-	        WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaOneToOneMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaOneToOneMapping2_0Composite.java
index 950e26366c..6bd43546af 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaOneToOneMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaOneToOneMapping2_0Composite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.jpa2.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -33,12 +34,12 @@ public class JavaOneToOneMapping2_0Composite
 	extends AbstractOneToOneMapping2_0Composite<JavaOneToOneMapping, JavaOneToOneRelationship2_0>
 {
 	public JavaOneToOneMapping2_0Composite(
-			PropertyValueModel<? extends JavaOneToOneMapping> subjectHolder,
+			PropertyValueModel<? extends JavaOneToOneMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+	        WidgetFactory widgetFactory,
+	        ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/EntityMappings2_0DetailsProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/EntityMappings2_0DetailsProvider.java
index 38a8e1f645..8e50e71ff2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/EntityMappings2_0DetailsProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/EntityMappings2_0DetailsProvider.java
@@ -9,9 +9,10 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.core.JptResourceType;
 import org.eclipse.jpt.common.ui.WidgetFactory;
-import org.eclipse.jpt.jpa.core.context.orm.EntityMappings;
+import org.eclipse.jpt.jpa.core.JpaStructureNode;
 import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.GenericOrmXml2_0Definition;
 import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.GenericOrmXml2_1Definition;
 import org.eclipse.jpt.jpa.ui.details.JpaDetailsPageManager;
@@ -51,10 +52,7 @@ public class EntityMappings2_0DetailsProvider
 			|| resourceType.equals(GenericOrmXml2_1Definition.instance().getResourceType());
 	}
 	
-	public JpaDetailsPageManager<EntityMappings> buildDetailsPageManager(
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return new EntityMappings2_0DetailsPage(parent, widgetFactory);
+	public JpaDetailsPageManager<? extends JpaStructureNode> buildDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return new EntityMappingsDetailsPageManager2_0(parent, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/EntityMappings2_0DetailsPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/EntityMappingsDetailsPageManager2_0.java
index 0b45dd4e24..11f9fd030b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/EntityMappings2_0DetailsPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/EntityMappingsDetailsPageManager2_0.java
@@ -9,27 +9,18 @@
 *******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
-import org.eclipse.jpt.jpa.ui.internal.details.orm.AbstractEntityMappingsDetailsPage;
+import org.eclipse.jpt.jpa.ui.internal.details.orm.AbstractEntityMappingsDetailsPageManager;
 import org.eclipse.jpt.jpa.ui.internal.jpa2.details.Queries2_0Composite;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 
-/**
- *  EntityMappings2_0DetailsPage
- */
-public class EntityMappings2_0DetailsPage extends AbstractEntityMappingsDetailsPage
+public class EntityMappingsDetailsPageManager2_0
+	extends AbstractEntityMappingsDetailsPageManager
 {
-	/**
-	 * Creates a new <code>EntityMappings2_0DetailsPage</code>.
-	 *
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public EntityMappings2_0DetailsPage(Composite parent,
-	                                 WidgetFactory widgetFactory) {
-
-		super(parent, widgetFactory);
+	public EntityMappingsDetailsPageManager2_0(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		super(parent, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmBasicMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmBasicMapping2_0Composite.java
index a57d801e8f..b40d2d2a8b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmBasicMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmBasicMapping2_0Composite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -27,21 +28,16 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 
-public class OrmBasicMapping2_0Composite extends AbstractBasicMappingComposite<BasicMapping>
+public class OrmBasicMapping2_0Composite
+	extends AbstractBasicMappingComposite<BasicMapping>
 {
-	/**
-	 * Creates a new <code>EclipseLink1_1OrmBasicMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>BasicMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public OrmBasicMapping2_0Composite(PropertyValueModel<? extends BasicMapping> subjectHolder,
-       								PropertyValueModel<Boolean> enabledModel,
-	                               	Composite parent,
-	                               	WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public OrmBasicMapping2_0Composite(
+			PropertyValueModel<? extends BasicMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmElementCollectionMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmElementCollectionMapping2_0Composite.java
index 193a162524..5e27e20df5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmElementCollectionMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmElementCollectionMapping2_0Composite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -32,19 +33,13 @@ import org.eclipse.ui.forms.widgets.Hyperlink;
 public class OrmElementCollectionMapping2_0Composite
 	extends AbstractElementCollectionMapping2_0Composite<ElementCollectionMapping2_0>
 {
-	/**
-	 * Creates a new <code>EclipseLink1_1OrmBasicMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>BasicMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public OrmElementCollectionMapping2_0Composite(PropertyValueModel<? extends ElementCollectionMapping2_0> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-	                                WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public OrmElementCollectionMapping2_0Composite(
+			PropertyValueModel<? extends ElementCollectionMapping2_0> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmElementCollectionMapping2_0UiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmElementCollectionMapping2_0UiDefinition.java
index af39779a89..1d43ee5e17 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmElementCollectionMapping2_0UiDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmElementCollectionMapping2_0UiDefinition.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
@@ -44,14 +45,8 @@ public class OrmElementCollectionMapping2_0UiDefinition
 	private OrmElementCollectionMapping2_0UiDefinition() {
 		super();
 	}
-	
-	public JpaComposite buildAttributeMappingComposite(
-			OrmXmlUiFactory factory, 
-			PropertyValueModel<OrmElementCollectionMapping2_0> subjectHolder, 
-			PropertyValueModel<Boolean> enabledModel, 
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		return ((OrmXmlUiFactory2_0) factory).createOrmElementCollectionMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory);
+
+	public JpaComposite buildAttributeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<OrmElementCollectionMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return ((OrmXmlUiFactory2_0) factory).createOrmElementCollectionMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmEmbeddedIdMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmEmbeddedIdMapping2_0Composite.java
index b53870f075..35a5503936 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmEmbeddedIdMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmEmbeddedIdMapping2_0Composite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -29,12 +30,12 @@ public class OrmEmbeddedIdMapping2_0Composite
 	extends AbstractEmbeddedIdMappingComposite<EmbeddedIdMapping>
 {
 	public OrmEmbeddedIdMapping2_0Composite(
-			PropertyValueModel<? extends EmbeddedIdMapping> subjectHolder,
+			PropertyValueModel<? extends EmbeddedIdMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmEmbeddedMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmEmbeddedMapping2_0Composite.java
index ee4fb8a059..8966e5bd9b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmEmbeddedMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmEmbeddedMapping2_0Composite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -17,7 +18,6 @@ import org.eclipse.jpt.jpa.core.context.EmbeddedMapping;
 import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
 import org.eclipse.jpt.jpa.ui.internal.details.AbstractEmbeddedMappingComposite;
 import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer;
-import org.eclipse.jpt.jpa.ui.internal.details.java.BaseJavaUiFactory;
 import org.eclipse.jpt.jpa.ui.internal.details.orm.JptUiDetailsOrmMessages;
 import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmMappingNameText;
 import org.eclipse.jpt.jpa.ui.internal.jpa2.details.EmbeddedMapping2_0OverridesComposite;
@@ -25,39 +25,16 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | EmbeddedAttributeOverridesComposite                                   | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see EmbeddedMapping
- * @see BaseJavaUiFactory - The factory creating this pane
- *
- * @version 2.3
- * @since 2.2
- */
 public class OrmEmbeddedMapping2_0Composite
 	extends AbstractEmbeddedMappingComposite<EmbeddedMapping>
 {
-	/**
-	 * Creates a new <code>EmbeddedMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>EmbeddedMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public OrmEmbeddedMapping2_0Composite(PropertyValueModel<? extends EmbeddedMapping> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-			                        Composite parent,
-	                                WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public OrmEmbeddedMapping2_0Composite(
+			PropertyValueModel<? extends EmbeddedMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmEntity2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmEntity2_0Composite.java
index 56d755f0d7..26fd4ab2cf 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmEntity2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmEntity2_0Composite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -34,28 +35,15 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 
-/**
- * The pane used for an ORM entity 2.0.
- *
- * @see OrmEntity
- * @see Entity2_0OverridesComposite
- */
 public class OrmEntity2_0Composite
 	extends AbstractOrmEntityComposite
 {
-	/**
-	 * Creates a new <code>OrmEntityComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>OrmEntity</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
 	public OrmEntity2_0Composite(
-			PropertyValueModel<? extends OrmEntity> subjectHolder,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<? extends OrmEntity> entityModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(entityModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmIdMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmIdMapping2_0Composite.java
index 15bb79896c..c3d58006cb 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmIdMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmIdMapping2_0Composite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -30,12 +31,12 @@ public class OrmIdMapping2_0Composite
 	extends AbstractIdMappingComposite<IdMapping>
 {
 	public OrmIdMapping2_0Composite(
-			PropertyValueModel<? extends IdMapping> subjectHolder,
+			PropertyValueModel<? extends IdMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-	        WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmManyToManyMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmManyToManyMapping2_0Composite.java
index fa5f543c77..6e22190555 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmManyToManyMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmManyToManyMapping2_0Composite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ManyToManyMapping;
@@ -31,20 +32,13 @@ import org.eclipse.ui.forms.widgets.Hyperlink;
 public class OrmManyToManyMapping2_0Composite
 	extends AbstractManyToManyMappingComposite<ManyToManyMapping, ManyToManyRelationship>
 {
-	/**
-	 * Creates a new <code>ManyToManyMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>IManyToManyMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
 	public OrmManyToManyMapping2_0Composite(
-			PropertyValueModel<? extends ManyToManyMapping> subjectHolder,
+			PropertyValueModel<? extends ManyToManyMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-	        WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmManyToOneMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmManyToOneMapping2_0Composite.java
index 3b6321c283..502de0e70a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmManyToOneMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmManyToOneMapping2_0Composite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -34,12 +35,12 @@ public class OrmManyToOneMapping2_0Composite
 	extends AbstractManyToOneMapping2_0Composite<ManyToOneMapping, ManyToOneRelationship2_0>
 {
 	public OrmManyToOneMapping2_0Composite(
-			PropertyValueModel<? extends ManyToOneMapping> subjectHolder,
+			PropertyValueModel<? extends ManyToOneMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-	        WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+	        WidgetFactory widgetFactory,
+	        ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmOneToManyMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmOneToManyMapping2_0Composite.java
index c0125984fb..9e184fa7c2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmOneToManyMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmOneToManyMapping2_0Composite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -38,12 +39,12 @@ public class OrmOneToManyMapping2_0Composite
 	extends AbstractOneToManyMappingComposite<OneToManyMapping, OneToManyRelationship2_0>
 {
 	public OrmOneToManyMapping2_0Composite(
-			PropertyValueModel<? extends OneToManyMapping> subjectHolder,
+			PropertyValueModel<? extends OneToManyMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmOneToOneMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmOneToOneMapping2_0Composite.java
index db1626a004..93a26491c7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmOneToOneMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmOneToOneMapping2_0Composite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -38,12 +39,12 @@ public class OrmOneToOneMapping2_0Composite
 	extends AbstractOneToOneMapping2_0Composite<OneToOneMapping, OneToOneRelationship2_0>
 {
 	public OrmOneToOneMapping2_0Composite(
-			PropertyValueModel<? extends OneToOneMapping> subjectHolder,
+			PropertyValueModel<? extends OneToOneMapping> mappingModel,
 			PropertyValueModel<Boolean> enabledModel,
-			Composite parent,
-			WidgetFactory widgetFactory) {
-		
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+			Composite parentComposite,
+	        WidgetFactory widgetFactory,
+	        ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 	
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmVersionMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmVersionMapping2_0Composite.java
index 5b59374ed2..07b921864f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmVersionMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmVersionMapping2_0Composite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -27,19 +28,13 @@ import org.eclipse.swt.widgets.Control;
 public class OrmVersionMapping2_0Composite
 	extends AbstractVersionMappingComposite<VersionMapping>
 {
-	/**
-	 * Creates a new <code>EclipseLinkOrmVersionMappingComposite</code>.
-	 *
-	 * @param subjectHolder The holder of the subject <code>VersionMapping</code>
-	 * @param parent The parent container
-	 * @param widgetFactory The factory used to create various common widgets
-	 */
-	public OrmVersionMapping2_0Composite(PropertyValueModel<? extends VersionMapping> subjectHolder,
-									PropertyValueModel<Boolean> enabledModel,
-									Composite parent,
-									WidgetFactory widgetFactory) {
-
-		super(subjectHolder, enabledModel, parent, widgetFactory);
+	public OrmVersionMapping2_0Composite(
+			PropertyValueModel<? extends VersionMapping> mappingModel,
+			PropertyValueModel<Boolean> enabledModel,
+			Composite parentComposite,
+			WidgetFactory widgetFactory,
+			ResourceManager resourceManager) {
+		super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/PersistenceUnit2_0OptionsEditorPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/PersistenceUnit2_0OptionsEditorPage.java
index a670887179..7cfbb4b934 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/PersistenceUnit2_0OptionsEditorPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/PersistenceUnit2_0OptionsEditorPage.java
@@ -10,7 +10,6 @@
 package org.eclipse.jpt.jpa.ui.internal.jpa2.persistence;
 
 import java.util.Collection;
-
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.IType;
@@ -19,6 +18,7 @@ import org.eclipse.jdt.core.search.IJavaSearchScope;
 import org.eclipse.jdt.core.search.SearchEngine;
 import org.eclipse.jdt.ui.IJavaElementSearchConstants;
 import org.eclipse.jdt.ui.JavaUI;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.window.Window;
@@ -53,14 +53,14 @@ import org.eclipse.ui.forms.widgets.Section;
 import org.eclipse.ui.progress.IProgressService;
 
 public class PersistenceUnit2_0OptionsEditorPage 
-	extends Pane<JpaOptions2_0> {
-
+	extends Pane<JpaOptions2_0>
+{
 	public PersistenceUnit2_0OptionsEditorPage(
 			PropertyValueModel<JpaOptions2_0> subjectModel,
             Composite parent,
-            WidgetFactory widgetFactory) {
-
-		super(subjectModel, parent, widgetFactory);
+            WidgetFactory widgetFactory,
+            ResourceManager resourceManager) {
+		super(subjectModel, parent, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/PersistenceUnitConnection2_0EditorPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/PersistenceUnitConnection2_0EditorPage.java
index e8fd27c200..372e882018 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/PersistenceUnitConnection2_0EditorPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/PersistenceUnitConnection2_0EditorPage.java
@@ -10,6 +10,7 @@
 package org.eclipse.jpt.jpa.ui.internal.jpa2.persistence;
 
 import java.util.Collection;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
@@ -29,14 +30,14 @@ import org.eclipse.ui.forms.widgets.ExpandableComposite;
 import org.eclipse.ui.forms.widgets.Section;
 
 public class PersistenceUnitConnection2_0EditorPage
-	extends Pane<JpaConnection2_0> {
-
+	extends Pane<JpaConnection2_0>
+{
 	public PersistenceUnitConnection2_0EditorPage(
 			PropertyValueModel<JpaConnection2_0> subjectModel,
             Composite parent,
-            WidgetFactory widgetFactory) {
-
-		super(subjectModel, parent, widgetFactory);
+            WidgetFactory widgetFactory,
+            ResourceManager resourceManager) {
+		super(subjectModel, parent, widgetFactory, resourceManager);
 	}
 	
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/PersistenceUnitConnection2_0EditorPageDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/PersistenceUnitConnection2_0EditorPageDefinition.java
index f1c8f7e862..31f706b98a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/PersistenceUnitConnection2_0EditorPageDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/PersistenceUnitConnection2_0EditorPageDefinition.java
@@ -10,10 +10,12 @@
 package org.eclipse.jpt.jpa.ui.internal.jpa2.persistence;
 
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
+import org.eclipse.jpt.common.utility.internal.transformer.AbstractTransformer;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.jpa.core.JpaStructureNode;
+import org.eclipse.jpt.common.utility.transformer.Transformer;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
 import org.eclipse.jpt.jpa.core.jpa2.context.persistence.PersistenceUnit2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.persistence.connection.JpaConnection2_0;
@@ -43,12 +45,12 @@ public class PersistenceUnitConnection2_0EditorPageDefinition
 		super();
 	}
 
-	public String getPageText() {
-		return JptUiPersistence2_0Messages.GenericPersistenceUnit2_0ConnectionTab_title;
+	public ImageDescriptor getTitleImageDescriptor() {
+		return null;
 	}
 
-	public ImageDescriptor getPageImageDescriptor() {
-		return null;
+	public String getTitleText() {
+		return JptUiPersistence2_0Messages.GenericPersistenceUnit2_0ConnectionTab_title;
 	}
 
 	public String getHelpID() {
@@ -56,16 +58,22 @@ public class PersistenceUnitConnection2_0EditorPageDefinition
 	}
 
 	@Override
-	public void buildEditorPageContent(Composite parent, WidgetFactory widgetFactory, PropertyValueModel<JpaStructureNode> jpaRootStructureNodeModel) {
-		new PersistenceUnitConnection2_0EditorPage(this.buildJpaConnection2_0Model(jpaRootStructureNodeModel), parent, widgetFactory);
+	protected void buildEditorPageContent(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager, PropertyValueModel<PersistenceUnit> persistenceUnitModel) {
+		new PersistenceUnitConnection2_0EditorPage(buildConnectionModel(persistenceUnitModel), parent, widgetFactory, resourceManager);
 	}
 
-	protected PropertyValueModel<JpaConnection2_0> buildJpaConnection2_0Model(PropertyValueModel<JpaStructureNode> jpaRootStructureNodeModel) {
-		return new TransformationPropertyValueModel<PersistenceUnit, JpaConnection2_0>(this.buildPersistenceUnitModel(jpaRootStructureNodeModel)) {
-			@Override
-			protected JpaConnection2_0 transform_(PersistenceUnit value) {
-				return (JpaConnection2_0) ((PersistenceUnit2_0) value).getConnection();
-			}
-		};
+	public static PropertyValueModel<JpaConnection2_0> buildConnectionModel(PropertyValueModel<PersistenceUnit> persistenceUnitModel) {
+		return new TransformationPropertyValueModel<PersistenceUnit, JpaConnection2_0>(persistenceUnitModel, CONNECTION_TRANSFORMER);
+	}
+
+	public static final Transformer<PersistenceUnit, JpaConnection2_0> CONNECTION_TRANSFORMER = new ConnectionTransformer();
+
+	public static class ConnectionTransformer
+		extends AbstractTransformer<PersistenceUnit, JpaConnection2_0>
+	{
+		@Override
+		protected JpaConnection2_0 transform_(PersistenceUnit persistenceUnit) {
+			return (JpaConnection2_0) ((PersistenceUnit2_0) persistenceUnit).getConnection();
+		}
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/PersistenceUnitEditorPageDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/PersistenceUnitEditorPageDefinition.java
index ea6726d1d2..bacdfa6bfd 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/PersistenceUnitEditorPageDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/PersistenceUnitEditorPageDefinition.java
@@ -9,12 +9,11 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.jpa2.persistence;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.ListAspectAdapter;
 import org.eclipse.jpt.common.utility.internal.model.value.ListPropertyValueModelAdapter;
-import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
 import org.eclipse.jpt.common.utility.iterable.ListIterable;
-import org.eclipse.jpt.common.utility.model.value.ListValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.JpaStructureNode;
 import org.eclipse.jpt.jpa.core.context.persistence.Persistence;
@@ -31,46 +30,48 @@ public abstract class PersistenceUnitEditorPageDefinition
 		super();
 	}
 
-	public void buildEditorPageContent(IManagedForm form, WidgetFactory widgetFactory, PropertyValueModel<JpaStructureNode> jpaRootStructureNodeModel) {
-		this.buildEditorPageContent(form.getForm().getBody(), widgetFactory, jpaRootStructureNodeModel);
+	public void buildContent(IManagedForm form, WidgetFactory widgetFactory, ResourceManager resourceManager, PropertyValueModel<JpaStructureNode> jpaRootStructureNodeModel) {
+		this.buildEditorPageContent(form.getForm().getBody(), widgetFactory, resourceManager, new PersistenceUnitModel(jpaRootStructureNodeModel));
 	}
 
-	protected abstract void buildEditorPageContent(Composite parent, WidgetFactory widgetFactory, PropertyValueModel<JpaStructureNode> jpaRootStructureNodeModel);
+	protected abstract void buildEditorPageContent(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager, PropertyValueModel<PersistenceUnit> persistenceUnitModel);
 
-	protected PropertyValueModel<PersistenceUnit> buildPersistenceUnitModel(PropertyValueModel<JpaStructureNode> jpaStructureNodeModel) {
-		return new ListPropertyValueModelAdapter<PersistenceUnit>(this.buildPersistenceUnitListModel(jpaStructureNodeModel)) {
-			@Override
-			protected PersistenceUnit buildValue() {
-				return this.listModel.size() > 0 ? (PersistenceUnit) this.listModel.get(0) : null;
-			}
-		};
-	}
+	protected static class PersistenceUnitModel
+		extends ListPropertyValueModelAdapter<PersistenceUnit>
+	{
+		protected PersistenceUnitModel(PropertyValueModel<JpaStructureNode> jpaStructureNodeModel) {
+			super(new PersistenceUnitListModel(jpaStructureNodeModel));
+		}
 
-	protected ListValueModel<PersistenceUnit> buildPersistenceUnitListModel(PropertyValueModel<JpaStructureNode> jpaStructureNodeModel) {
-		return new ListAspectAdapter<Persistence, PersistenceUnit>(this.buildPersistenceModel(jpaStructureNodeModel), Persistence.PERSISTENCE_UNITS_LIST) {
-			@Override
-			protected ListIterable<PersistenceUnit> getListIterable() {
-				return this.subject.getPersistenceUnits();
-			}
-	
-			@Override
-			protected int size_() {
-				return this.subject.getPersistenceUnitsSize();
-			}
-		};
+		@Override
+		protected PersistenceUnit buildValue() {
+			return (this.listModel.size() > 0) ? (PersistenceUnit) this.listModel.get(0) : null;
+		}
 	}
 
-	protected PropertyValueModel<Persistence> buildPersistenceModel(PropertyValueModel<JpaStructureNode> jpaStructureNodeModel) {
-		return new TransformationPropertyValueModel<JpaStructureNode, Persistence>(jpaStructureNodeModel) {
-			@Override
-			protected Persistence transform(JpaStructureNode jpaStructureNode) {
-				return (Persistence) jpaStructureNode;
-			}
-		};
+	/**
+	 * Assume the JPA structure node is a persistence.
+	 */
+	protected static class PersistenceUnitListModel
+		extends ListAspectAdapter<JpaStructureNode, PersistenceUnit>
+	{
+		protected PersistenceUnitListModel(PropertyValueModel<JpaStructureNode> jpaStructureNodeModel) {
+			super(jpaStructureNodeModel, Persistence.PERSISTENCE_UNITS_LIST);
+		}
+
+		@Override
+		protected ListIterable<PersistenceUnit> getListIterable() {
+			return ((Persistence) this.subject).getPersistenceUnits();
+		}
+
+		@Override
+		protected int size_() {
+			return ((Persistence) this.subject).getPersistenceUnitsSize();
+		}
 	}
 
 	@Override
 	public String toString() {
-		return this.getPageText();
+		return this.getTitleText();
 	}
-}
-\ No newline at end of file
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/PersistenceUnitOptions2_0EditorPageDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/PersistenceUnitOptions2_0EditorPageDefinition.java
index 63ec14026d..0390df0196 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/PersistenceUnitOptions2_0EditorPageDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/PersistenceUnitOptions2_0EditorPageDefinition.java
@@ -10,10 +10,12 @@
 package org.eclipse.jpt.jpa.ui.internal.jpa2.persistence;
 
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
+import org.eclipse.jpt.common.utility.internal.transformer.AbstractTransformer;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.jpa.core.JpaStructureNode;
+import org.eclipse.jpt.common.utility.transformer.Transformer;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
 import org.eclipse.jpt.jpa.core.jpa2.context.persistence.PersistenceUnit2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.persistence.options.JpaOptions2_0;
@@ -42,12 +44,12 @@ public class PersistenceUnitOptions2_0EditorPageDefinition
 		super();
 	}
 
-	public String getPageText() {
-		return JptUiPersistence2_0Messages.GenericPersistenceUnit2_0OptionsTab_title;
+	public ImageDescriptor getTitleImageDescriptor() {
+		return null;
 	}
 
-	public ImageDescriptor getPageImageDescriptor() {
-		return null;
+	public String getTitleText() {
+		return JptUiPersistence2_0Messages.GenericPersistenceUnit2_0OptionsTab_title;
 	}
 
 	public String getHelpID() {
@@ -55,16 +57,22 @@ public class PersistenceUnitOptions2_0EditorPageDefinition
 	}
 
 	@Override
-	public void buildEditorPageContent(Composite parent, WidgetFactory widgetFactory, PropertyValueModel<JpaStructureNode> jpaRootStructureNodeModel) {
-		new PersistenceUnit2_0OptionsEditorPage(this.buildJpaOptions2_0Model(jpaRootStructureNodeModel), parent, widgetFactory);
+	protected void buildEditorPageContent(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager, PropertyValueModel<PersistenceUnit> persistenceUnitModel) {
+		new PersistenceUnit2_0OptionsEditorPage(buildOptionsModel(persistenceUnitModel), parent, widgetFactory, resourceManager);
 	}
 
-	private PropertyValueModel<JpaOptions2_0> buildJpaOptions2_0Model(PropertyValueModel<JpaStructureNode> jpaRootStructureNodeModel) {
-		return new TransformationPropertyValueModel<PersistenceUnit, JpaOptions2_0>(this.buildPersistenceUnitModel(jpaRootStructureNodeModel)) {
-			@Override
-			protected JpaOptions2_0 transform_(PersistenceUnit value) {
-				return (JpaOptions2_0) ((PersistenceUnit2_0) value).getOptions();
-			}
-		};
+	public static PropertyValueModel<JpaOptions2_0> buildOptionsModel(PropertyValueModel<PersistenceUnit> persistenceUnitModel) {
+		return new TransformationPropertyValueModel<PersistenceUnit, JpaOptions2_0>(persistenceUnitModel, OPTIONS_TRANSFORMER);
+	}
+
+	public static final Transformer<PersistenceUnit, JpaOptions2_0> OPTIONS_TRANSFORMER = new OptionsTransformer();
+
+	public static class OptionsTransformer
+		extends AbstractTransformer<PersistenceUnit, JpaOptions2_0>
+	{
+		@Override
+		protected JpaOptions2_0 transform_(PersistenceUnit persistenceUnit) {
+			return (JpaOptions2_0) ((PersistenceUnit2_0) persistenceUnit).getOptions();
+		}
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpql/JpaJpqlContentProposalProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpql/JpaJpqlContentProposalProvider.java
index 6845c3a351..b4f20d4910 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpql/JpaJpqlContentProposalProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpql/JpaJpqlContentProposalProvider.java
@@ -618,7 +618,8 @@ public final class JpaJpqlContentProposalProvider extends JpqlCompletionProposal
 				jpqlQuery,
 				0,
 				jpqlQuery.length(),
-				position
+				position,
+				getResourceManager(viewer.getTextWidget())
 			);
 
 			return proposals.toArray(new ICompletionProposal[proposals.size()]);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpql/JpaJpqlJavaCompletionProposalComputer.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpql/JpaJpqlJavaCompletionProposalComputer.java
index 50f095a33d..c68a764758 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpql/JpaJpqlJavaCompletionProposalComputer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpql/JpaJpqlJavaCompletionProposalComputer.java
@@ -36,6 +36,7 @@ import org.eclipse.jdt.core.dom.StringLiteral;
 import org.eclipse.jdt.ui.text.java.ContentAssistInvocationContext;
 import org.eclipse.jdt.ui.text.java.IJavaCompletionProposalComputer;
 import org.eclipse.jdt.ui.text.java.JavaContentAssistInvocationContext;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jface.text.contentassist.ICompletionProposal;
 import org.eclipse.jface.text.contentassist.IContextInformation;
 import org.eclipse.jpt.common.core.internal.utility.jdt.ASTTools;
@@ -168,7 +169,8 @@ public final class JpaJpqlJavaCompletionProposalComputer extends JpqlCompletionP
 		String jpqlQuery = retrieveQuery(astRoot, tokenStart, tokenEnd, position);
 
 		// Now create the proposals
-		return buildProposals(namedQuery, jpqlQuery, tokenStart[0], tokenEnd[0], position[0]);
+		ResourceManager resourceManager = this.getResourceManager(context.getViewer().getTextWidget());
+		return buildProposals(namedQuery, jpqlQuery, tokenStart[0], tokenEnd[0], position[0], resourceManager);
 	}
 
 	/**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpql/JpaJpqlSseCompletionProposalComputer.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpql/JpaJpqlSseCompletionProposalComputer.java
index e3299b054a..35bf3554f5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpql/JpaJpqlSseCompletionProposalComputer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpql/JpaJpqlSseCompletionProposalComputer.java
@@ -22,6 +22,7 @@ import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.contentassist.ICompletionProposal;
@@ -131,7 +132,8 @@ public final class JpaJpqlSseCompletionProposalComputer extends JpqlCompletionPr
 			int tokenEnd   = tokenStart + jpqlQuery.length();
 
 			// Now create the proposals
-			return buildProposals(namedQuery, jpqlQuery, tokenStart, tokenEnd, position[0]);
+			ResourceManager resourceManager = this.getResourceManager(context.getViewer().getTextWidget());
+			return buildProposals(namedQuery, jpqlQuery, tokenStart, tokenEnd, position[0], resourceManager);
 		}
 		catch (Exception ex) {
 			JptJpaUiPlugin.instance().logError(ex, JptUiMessages.JpaJpqlSseCompletionProposalComputer_Error);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpql/JpqlCompletionProposalComputer.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpql/JpqlCompletionProposalComputer.java
index 530173c2f9..5a4c5b6750 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpql/JpqlCompletionProposalComputer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpql/JpqlCompletionProposalComputer.java
@@ -13,17 +13,29 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.jpql;
 
+import static org.eclipse.persistence.jpa.jpql.spi.IMappingType.BASIC;
+import static org.eclipse.persistence.jpa.jpql.spi.IMappingType.ELEMENT_COLLECTION;
+import static org.eclipse.persistence.jpa.jpql.spi.IMappingType.EMBEDDED;
+import static org.eclipse.persistence.jpa.jpql.spi.IMappingType.EMBEDDED_ID;
+import static org.eclipse.persistence.jpa.jpql.spi.IMappingType.ID;
+import static org.eclipse.persistence.jpa.jpql.spi.IMappingType.MANY_TO_MANY;
+import static org.eclipse.persistence.jpa.jpql.spi.IMappingType.MANY_TO_ONE;
+import static org.eclipse.persistence.jpa.jpql.spi.IMappingType.ONE_TO_MANY;
+import static org.eclipse.persistence.jpa.jpql.spi.IMappingType.ONE_TO_ONE;
+import static org.eclipse.persistence.jpa.jpql.spi.IMappingType.VERSION;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
+import org.eclipse.jface.resource.ResourceManager;
+import org.eclipse.jpt.common.core.internal.utility.PlatformTools;
 import org.eclipse.jpt.common.utility.internal.iterable.IterableTools;
 import org.eclipse.jpt.jpa.core.JpaPreferences;
 import org.eclipse.jpt.jpa.core.context.NamedQuery;
 import org.eclipse.jpt.jpa.core.jpql.JpaJpqlQueryHelper;
-import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
+import org.eclipse.jpt.jpa.ui.JpaWorkbench;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 import org.eclipse.jpt.jpa.ui.internal.plugin.JptJpaUiPlugin;
 import org.eclipse.persistence.jpa.jpql.ContentAssistProposals;
 import org.eclipse.persistence.jpa.jpql.WordParser;
@@ -32,9 +44,8 @@ import org.eclipse.persistence.jpa.jpql.parser.IdentifierRole;
 import org.eclipse.persistence.jpa.jpql.spi.IEntity;
 import org.eclipse.persistence.jpa.jpql.spi.IMapping;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-
-import static org.eclipse.persistence.jpa.jpql.spi.IMappingType.*;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.PlatformUI;
 
 /**
  * The abstract definition of JPQL content assist support.
@@ -62,12 +73,6 @@ abstract class JpqlCompletionProposalComputer<T> {
 	ContentAssistProposals contentAssistProposals;
 
 	/**
-	 * The local registry containing the images used to display the possible proposals. The registry is
-	 * disposed when the session ended.
-	 */
-	private ImageRegistry imageRegistry;
-
-	/**
 	 * The same value as {@link #actualQuery} or the modified query that was used by the Hermes parser.
 	 */
 	String jpqlQuery;
@@ -106,7 +111,7 @@ abstract class JpqlCompletionProposalComputer<T> {
 	/**
 	 * Creates a new <code>JpqlCompletionProposalComputer</code>.
 	 */
-	public JpqlCompletionProposalComputer() {
+	JpqlCompletionProposalComputer() {
 		super();
 	}
 
@@ -115,9 +120,9 @@ abstract class JpqlCompletionProposalComputer<T> {
 	 *
 	 * @param proposals The list used to store the new completion proposals
 	 */
-	private void addAbstractSchemaNames(List<T> proposals) {
+	private void addAbstractSchemaNames(List<T> proposals, ResourceManager resourceManager) {
 		for (IEntity abstractSchemaType : sortByNames(contentAssistProposals.abstractSchemaTypes())) {
-			proposals.add(buildAbstractSchemaNameProposal(abstractSchemaType));
+			proposals.add(buildAbstractSchemaNameProposal(abstractSchemaType, resourceManager));
 		}
 	}
 
@@ -126,9 +131,9 @@ abstract class JpqlCompletionProposalComputer<T> {
 	 *
 	 * @param proposals The list used to store the new completion proposals
 	 */
-	private void addIdentificationVariables(List<T> proposals) {
+	private void addIdentificationVariables(List<T> proposals, ResourceManager resourceManager) {
 		for (String variable : sort(contentAssistProposals.identificationVariables())) {
-			proposals.add(buildIdentificationVariableProposal(variable));
+			proposals.add(buildIdentificationVariableProposal(variable, resourceManager));
 		}
 	}
 
@@ -137,9 +142,9 @@ abstract class JpqlCompletionProposalComputer<T> {
 	 *
 	 * @param proposals The list used to store the new completion proposals
 	 */
-	private void addIdentifiers(List<T> proposals) {
+	private void addIdentifiers(List<T> proposals, ResourceManager resourceManager) {
 		for (String identifier : sort(contentAssistProposals.identifiers())) {
-			proposals.add(buildIdentifierProposal(identifier));
+			proposals.add(buildIdentifierProposal(identifier, resourceManager));
 		}
 	}
 
@@ -152,15 +157,15 @@ abstract class JpqlCompletionProposalComputer<T> {
 	 *
 	 * @param proposals The list used to store the new completion proposals
 	 */
-	private void addMappings(List<T> proposals) {
+	private void addMappings(List<T> proposals, ResourceManager resourceManager) {
 		for (IMapping mapping : sort(contentAssistProposals.mappings())) {
-			proposals.add(buildMappingProposal(mapping));
+			proposals.add(buildMappingProposal(mapping, resourceManager));
 		}
 	}
 
-	private T buildAbstractSchemaNameProposal(IEntity abstractSchemaType) {
+	private T buildAbstractSchemaNameProposal(IEntity abstractSchemaType, ResourceManager resourceManager) {
 		String proposal = abstractSchemaType.getName();
-		return buildProposal(proposal, proposal, entityImage());
+		return buildProposal(proposal, proposal, resourceManager.createImage(JptJpaUiImages.ENTITY));
 	}
 
 	private Comparator<IEntity> buildEntityNameComparator() {
@@ -186,15 +191,15 @@ abstract class JpqlCompletionProposalComputer<T> {
 		return identificationVariable;
 	}
 
-	private T buildIdentificationVariableProposal(String proposal) {
+	private T buildIdentificationVariableProposal(String proposal, ResourceManager resourceManager) {
 		return buildProposal(
 			proposal,
 			buildIdentificationVariableDisplayString(proposal),
-			identificationVariableImage()
+			resourceManager.createImage(JptJpaUiImages.JPQL_VARIABLE)
 		);
 	}
 
-	private T buildIdentifierProposal(String proposal) {
+	private T buildIdentifierProposal(String proposal, ResourceManager resourceManager) {
 
 		String additionalInfo = additionalInfo(proposal);
 		IdentifierRole role = queryHelper.getQueryContext().getExpressionRegistry().getIdentifierRole(proposal);
@@ -220,22 +225,20 @@ abstract class JpqlCompletionProposalComputer<T> {
 			cursorOffset--;
 		}
 
+		Image image = resourceManager.createImage(realFunction ? JptJpaUiImages.JPQL_FUNCTION : JptJpaUiImages.JPQL_IDENTIFIER);
 		return buildProposal(
 			proposal,
 			proposal,
 			additionalInfo,
-			identifierImage(realFunction),
+			image,
 			cursorOffset
 		);
 	}
 
-	private ImageDescriptor buildImageDescriptor(String key) {
-		return JptJpaUiPlugin.instance().buildImageDescriptor(key);
-	}
-
-	private T buildMappingProposal(IMapping mapping) {
+	private T buildMappingProposal(IMapping mapping, ResourceManager resourceManager) {
 		String proposal = mapping.getName();
-		return buildProposal(proposal, proposal, mappingImage(mapping));
+		Image image = resourceManager.createImage(mappingImageDescriptor(mapping));
+		return buildProposal(proposal, proposal, image);
 	}
 
 	private T buildProposal(String proposal, String displayString, Image image) {
@@ -277,7 +280,8 @@ abstract class JpqlCompletionProposalComputer<T> {
 	                             String actualQuery,
 	                             int tokenStart,
 	                             int tokenEnd,
-	                             int position) {
+	                             int position,
+	                             ResourceManager resourceManager) {
 
 		try {
 			this.tokenStart     = tokenStart;
@@ -303,10 +307,10 @@ abstract class JpqlCompletionProposalComputer<T> {
 
 			// Create the proposals for those proposals
 			List<T> proposals = new ArrayList<T>();
-			addAbstractSchemaNames    (proposals);
-			addIdentificationVariables(proposals);
-			addIdentifiers            (proposals);
-			addMappings               (proposals);
+			addAbstractSchemaNames    (proposals, resourceManager);
+			addIdentificationVariables(proposals, resourceManager);
+			addIdentifiers            (proposals, resourceManager);
+			addMappings               (proposals, resourceManager);
 
 			return proposals;
 		}
@@ -338,10 +342,6 @@ abstract class JpqlCompletionProposalComputer<T> {
 		contentAssistProposals = null;
 	}
 
-	private Image entityImage() {
-		return getImage(JptUiIcons.ENTITY);
-	}
-
 	/**
 	 * Returns the reason why this computer was unable to produce any completion proposals or
 	 * context information.
@@ -352,34 +352,12 @@ abstract class JpqlCompletionProposalComputer<T> {
 		return null;
 	}
 
-	private Image getImage(String key) {
-		ImageRegistry registry = getImageRegistry();
-		Image image = registry.get(key);
-		if (image == null) {
-			registry.put(key, buildImageDescriptor(key));
-			image = registry.get(key);
-		}
-		return image;
+	ResourceManager getResourceManager(Control control) {
+		return this.getJpaWorkbench().getResourceManager(control);
 	}
 
-	private synchronized ImageRegistry getImageRegistry() {
-		if (imageRegistry == null) {
-			imageRegistry = new ImageRegistry(Display.getCurrent());
-		}
-		return imageRegistry;
-	}
-
-	private Image identificationVariableImage() {
-		return getImage(JptUiIcons.JPQL_VARIABLE);
-	}
-
-	private Image identifierImage(boolean function) {
-
-		if (function) {
-			return getImage(JptUiIcons.JPQL_FUNCTION);
-		}
-
-		return getImage(JptUiIcons.JPQL_IDENTIFIER);
+	JpaWorkbench getJpaWorkbench() {
+		return PlatformTools.getAdapter(PlatformUI.getWorkbench(), JpaWorkbench.class);
 	}
 
 	private boolean isRealFunction(String identifier) {
@@ -391,23 +369,23 @@ abstract class JpqlCompletionProposalComputer<T> {
 		       identifier != Expression.CURRENT_TIMESTAMP;
 	}
 
-	private Image mappingImage(IMapping mapping) {
+	private ImageDescriptor mappingImageDescriptor(IMapping mapping) {
 		switch (mapping.getMappingType()) {
-			case BASIC:               return getImage(JptUiIcons.BASIC);
-//			case BASIC_COLLECTION:    return getImage(JptUiIcons.ELEMENT_COLLECTION);
-//			case BASIC_MAP:           return getImage(JptUiIcons.ELEMENT_COLLECTION);
-			case ELEMENT_COLLECTION:  return getImage(JptUiIcons.ELEMENT_COLLECTION);
-			case EMBEDDED:            return getImage(JptUiIcons.EMBEDDED);
-			case EMBEDDED_ID:         return getImage(JptUiIcons.EMBEDDED_ID);
-			case ID:                  return getImage(JptUiIcons.ID);
-			case MANY_TO_MANY:        return getImage(JptUiIcons.MANY_TO_MANY);
-			case MANY_TO_ONE:         return getImage(JptUiIcons.MANY_TO_ONE);
-			case ONE_TO_MANY:         return getImage(JptUiIcons.ONE_TO_MANY);
-			case ONE_TO_ONE:          return getImage(JptUiIcons.ONE_TO_ONE);
-//			case TRANSFORMATION:      return getImage(JptUiIcons.BASIC);      // TODO
-//			case VARIABLE_ONE_TO_ONE: return getImage(JptUiIcons.ONE_TO_ONE); // TODO
-			case VERSION:             return getImage(JptUiIcons.VERSION);
-			default:                  return getImage(JptUiIcons.TRANSIENT);
+			case BASIC:               return JptJpaUiImages.BASIC;
+//			case BASIC_COLLECTION:    return JptJpaUiImages.ELEMENT_COLLECTION;
+//			case BASIC_MAP:           return JptJpaUiImages.ELEMENT_COLLECTION;
+			case ELEMENT_COLLECTION:  return JptJpaUiImages.ELEMENT_COLLECTION;
+			case EMBEDDED:            return JptJpaUiImages.EMBEDDED;
+			case EMBEDDED_ID:         return JptJpaUiImages.EMBEDDED_ID;
+			case ID:                  return JptJpaUiImages.ID;
+			case MANY_TO_MANY:        return JptJpaUiImages.MANY_TO_MANY;
+			case MANY_TO_ONE:         return JptJpaUiImages.MANY_TO_ONE;
+			case ONE_TO_MANY:         return JptJpaUiImages.ONE_TO_MANY;
+			case ONE_TO_ONE:          return JptJpaUiImages.ONE_TO_ONE;
+//			case TRANSFORMATION:      return JptJpaUiImages.BASIC;      // TODO
+//			case VARIABLE_ONE_TO_ONE: return JptJpaUiImages.ONE_TO_ONE; // TODO
+			case VERSION:             return JptJpaUiImages.VERSION;
+			default:                  return JptJpaUiImages.TRANSIENT;
 		}
 	}
 
@@ -436,10 +414,6 @@ abstract class JpqlCompletionProposalComputer<T> {
 
 		queryHelper = null;
 		clearInformation();
-
-		if (imageRegistry != null) {
-			imageRegistry.dispose();
-		}
 	}
 
 	/**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/menus/MapAsContribution.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/menus/MapAsContribution.java
index 5a452556e1..09688ace01 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/menus/MapAsContribution.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/menus/MapAsContribution.java
@@ -15,12 +15,15 @@ import java.util.Map;
 import org.eclipse.jface.action.IContributionItem;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jpt.common.core.JptResourceType;
-import org.eclipse.jpt.common.ui.internal.jface.ImageImageDescriptor;
+import org.eclipse.jpt.common.utility.filter.Filter;
 import org.eclipse.jpt.common.utility.internal.ArrayTools;
+import org.eclipse.jpt.common.utility.internal.ComparatorAdapter;
+import org.eclipse.jpt.common.utility.internal.filter.FilterAdapter;
 import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable;
 import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable;
 import org.eclipse.jpt.common.utility.internal.iterable.IterableTools;
 import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable;
+import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter;
 import org.eclipse.jpt.jpa.core.JpaPlatform;
 import org.eclipse.jpt.jpa.core.JpaStructureNode;
 import org.eclipse.jpt.jpa.ui.JpaPlatformUi;
@@ -38,163 +41,173 @@ import com.ibm.icu.text.Collator;
 /**
  * This menu contribution is responsible to populate the Map As menu with the
  * registered mapping types defined in the <code>JptPlatformUi</code>.
- *
+ * 
  * @see JpaPlatform
  * @see JpaPlatformUi
- *
- * @version 2.0
- * @since 2.0
  */
-@SuppressWarnings("nls")
 public abstract class MapAsContribution<T extends JpaStructureNode>
 	extends CompoundContributionItem
 	implements IWorkbenchContribution
 {
-	/**
-	 * Keeps track of the <code>IServiceLocator</code> which is used to retrieve
-	 * various services required for invoking the <code>PersistentAttributeMapAsHandler</code>.
-	 */
 	private IServiceLocator serviceLocator;
-	
-	
-	/**
-	 * Creates a new <code>PersistentAttributeMapAsContribution</code>.
-	 */
+
+
 	public MapAsContribution() {
 		super();
 	}
-	
-	
-	public void initialize(IServiceLocator serviceLocator) {
-		this.serviceLocator = serviceLocator;
+
+	public void initialize(IServiceLocator locator) {
+		this.serviceLocator = locator;
 	}
-		
+
 	@Override
 	protected IContributionItem[] getContributionItems() {
-		// Retrieve the selection from the handler service
-		// which should be an IStructuredSelection of JpaStructureNodes
-		IHandlerService handlerService = 
-			(IHandlerService) this.serviceLocator.getService(IHandlerService.class);
-		IStructuredSelection currentSelection = 
-			(IStructuredSelection) handlerService.getCurrentState().getVariable(ISources.ACTIVE_CURRENT_SELECTION_NAME);
-		
-		// Assume that all nodes are in the same project (which is very safe)
-		// and retrieve the mapping UI providers just from the first item
-		T node = (T) currentSelection.getFirstElement();
-		
-		return 
-			ArrayTools.array(
-				new TransformationIterable<MappingUiDefinition<T, ?>, IContributionItem>(this.getMappingUiDefinitions(node)) {
-					@Override
-					protected IContributionItem transform(MappingUiDefinition<T, ?> next) {
-						return createContributionItem(next);
-					}
-				},
-				EMPTY_CONTRIBUTION_ITEM_ARRAY);
-	}
-	protected static final IContributionItem[] EMPTY_CONTRIBUTION_ITEM_ARRAY = new IContributionItem[0];
-	
-
-	protected Comparator<MappingUiDefinition<T, ?>> getDefinitionsComparator() {
-		return new Comparator<MappingUiDefinition<T, ?>>() {
-			public int compare(MappingUiDefinition<T, ?> item1, MappingUiDefinition<T, ?> item2) {
-				String displayString1 = item1.getLabel();
-				String displayString2 = item2.getLabel();
-				return Collator.getInstance().compare(displayString1, displayString2);
-			}
-		};
+		return ArrayTools.array(this.getContributionItems_(), IContributionItem.class);
+	}
+
+	protected Iterable<IContributionItem> getContributionItems_() {
+		return new TransformationIterable<MappingUiDefinition<T, ?>, IContributionItem>(
+				this.getMappingUiDefinitions(),
+				new MappingUiDefinitionTransformer()
+			);
 	}
 
 	/**
-	 * Retrieves the registered {@link MappingUiDefinition}s from the given node, 
-	 * using its {@link JpaPlatformUi}.
-	 *
-	 * @param node A test node to determine the {@link JpaPlatformUi} and type 
-	 * of providers to return
-	 * @return The list of registered {@link MappingUiDefinition}s
+	 * Assume all the selected elements are in the same project (which is a
+	 * safe assumption) and return the mapping UI definitions for just the
+	 * first item.
 	 */
-	protected <U extends T> Iterable<? extends MappingUiDefinition<T, ?>> getMappingUiDefinitions(final T node) {
+	protected Iterable<? extends MappingUiDefinition<T, ?>> getMappingUiDefinitions() {
+		return this.getMappingUiDefinitions(this.getFirstSelectedElement());
+	}
+
+	@SuppressWarnings("unchecked")
+	protected T getFirstSelectedElement() {
+		return (T) this.getSelection().getFirstElement();
+	}
+
+	protected IStructuredSelection getSelection() {
+		return (IStructuredSelection) this.getHandlerService().getCurrentState().getVariable(ISources.ACTIVE_CURRENT_SELECTION_NAME);
+	}
+
+	protected IHandlerService getHandlerService() {
+		return (IHandlerService) this.serviceLocator.getService(IHandlerService.class);
+	}
+
+	/**
+	 * Return the {@link MappingUiDefinition}s for the specified node
+	 * registered with its {@link JpaPlatformUi}.
+	 */
+	protected Iterable<? extends MappingUiDefinition<T, ?>> getMappingUiDefinitions(final T node) {
 		JpaPlatformUi jpaPlatformUi = (JpaPlatformUi) node.getJpaPlatform().getAdapter(JpaPlatformUi.class);
-		
-		Iterable<? extends MappingUiDefinition<T, ?>> sortedMappingUiDefinitions = 
-				IterableTools.sort(
-					new FilteringIterable<MappingUiDefinition<T, ?>>(
-							getMappingUiDefinitions(jpaPlatformUi, node.getResourceType())) {
-						 @Override
-						protected boolean accept(MappingUiDefinition<T, ?> o) {
-							return o.isEnabledFor(node);
-						}
-					},
-					getDefinitionsComparator());
-		
-		DefaultMappingUiDefinition<T, ?> defaultDefinition = getDefaultMappingUiDefinition(jpaPlatformUi, node);
-		return (defaultDefinition == null) ?
-				sortedMappingUiDefinitions :
-				new CompositeIterable<MappingUiDefinition<T, ?>>(defaultDefinition, sortedMappingUiDefinitions);
+		Iterable<? extends MappingUiDefinition<T, ?>> defs = this.getSortedEnabledMappingUiDefinitions(jpaPlatformUi, node);
+		DefaultMappingUiDefinition<T, ?> defaultDef = this.getDefaultMappingUiDefinition(jpaPlatformUi, node);
+		return (defaultDef == null) ? defs : new CompositeIterable<MappingUiDefinition<T, ?>>(defaultDef, defs);
+	}
+
+	protected Iterable<? extends MappingUiDefinition<T, ?>> getSortedEnabledMappingUiDefinitions(JpaPlatformUi jpaPlatformUi, T node) {
+		return IterableTools.sort(this.getEnabledMappingUiDefinitions(jpaPlatformUi, node), this.getDefinitionsComparator());
+	}
+
+	protected Iterable<? extends MappingUiDefinition<T, ?>> getEnabledMappingUiDefinitions(JpaPlatformUi jpaPlatformUi, T node) {
+		return new FilteringIterable<MappingUiDefinition<T, ?>>(
+				this.getMappingUiDefinitions(jpaPlatformUi, node.getResourceType()),
+				this.buildEnabledDefinitionFilter(node)
+			);
+	}
+
+	protected Filter<MappingUiDefinition<T, ?>> buildEnabledDefinitionFilter(T node) {
+		return new EnabledDefinitionFilter(node);
+	}
+
+	protected class EnabledDefinitionFilter
+		extends FilterAdapter<MappingUiDefinition<T, ?>>
+	{
+		protected final T node;
+		protected EnabledDefinitionFilter(T node) {
+			super();
+			this.node = node;
+		}
+		@Override
+		public boolean accept(MappingUiDefinition<T, ?> def) {
+			return def.isEnabledFor(this.node);
+		}
 	}
 
 	/**
-	* Retrieves the registered {@link MappingUiDefinition}s from the given 
-	* {@link JpaPlatformUi} and {@link JpaStructureNode} (to determine type of 
-	* mapping providers to retrieve).
-	*
-	* @param jpaPlatformUi The active {@link JpaPlatformUi} from where the
-	* provider can be retrieved
-	* @param node A test node to determine type of providers to return
-	* @return The list of registered {@link MappingUiDefinition}s
-	*/
+	 * Return the mapping UI definitions registered with the specified JPA
+	 * platform UI for the specified resource type.
+	 */
 	protected abstract Iterable<? extends MappingUiDefinition<T, ?>> getMappingUiDefinitions(JpaPlatformUi platformUi, JptResourceType resourceType);
-	
+
+	protected Comparator<MappingUiDefinition<?, ?>> getDefinitionsComparator() {
+		return MAPPING_UI_DEFINITION_COMPARATOR;
+	}
+	protected static final Comparator<MappingUiDefinition<?, ?>> MAPPING_UI_DEFINITION_COMPARATOR = new MappingUiDefinitionComparator();
+	protected static class MappingUiDefinitionComparator
+		extends ComparatorAdapter<MappingUiDefinition<?, ?>>
+	{
+		@Override
+		public int compare(MappingUiDefinition<?, ?> def1, MappingUiDefinition<?, ?> def2) {
+			return Collator.getInstance().compare(def1.getLabel(), def2.getLabel());
+		}
+	}
+
 	/**
-	* Creates the default provider responsible for clearing the mapping type.
-	* If not default provider, then return null
-	*
-	* @return A provider that acts as a default mapping provider
-	*/
+	 * Return the default mapping definition for the specified JPA platform UI
+	 * and node.
+	 */
 	protected abstract DefaultMappingUiDefinition<T, ?> getDefaultMappingUiDefinition(JpaPlatformUi platformUi, T node);
-			
-	protected IContributionItem createContributionItem(MappingUiDefinition<T, ?> mappingUiProvider) {
-		return new CommandContributionItem(createParameter(mappingUiProvider));
+
+	protected class MappingUiDefinitionTransformer
+		extends TransformerAdapter<MappingUiDefinition<T, ?>, IContributionItem>
+	{
+		@Override
+		public IContributionItem transform(MappingUiDefinition<T, ?> def) {
+			return MapAsContribution.this.buildContributionItem(def);
+		}
 	}
-	
-	protected CommandContributionItemParameter createParameter(MappingUiDefinition<T, ?> mappingUiDefinition) {
+
+	protected IContributionItem buildContributionItem(MappingUiDefinition<T, ?> mappingUiProvider) {
+		return new CommandContributionItem(this.buildContributionItemParameter(mappingUiProvider));
+	}
+
+	protected CommandContributionItemParameter buildContributionItemParameter(MappingUiDefinition<T, ?> mappingUiDefinition) {
 		CommandContributionItemParameter parameter =
 			new CommandContributionItemParameter(
-					this.serviceLocator, 
-					createCommandContributionItemId(mappingUiDefinition),
-					getCommandId(),
-					CommandContributionItem.STYLE_CHECK);
+				this.serviceLocator,
+				this.buildCommandContributionItemParameterID(mappingUiDefinition),
+				this.getCommandID(),
+				CommandContributionItem.STYLE_CHECK
+			);
 		parameter.label = mappingUiDefinition.getLabel();
-		Map<String, String> parameters = new HashMap<String, String>();
-		parameters.put(getCommandParameterId(), mappingUiDefinition.getKey());
+		Map<String, String> parameters = new HashMap<String, String>(1);
+		parameters.put(this.getCommandParameterID(), mappingUiDefinition.getKey());
 		parameter.parameters = parameters;
-		parameter.icon = new ImageImageDescriptor(mappingUiDefinition.getImage());
+		parameter.icon = mappingUiDefinition.getImageDescriptor();
 		parameter.visibleEnabled = true;
 		return parameter;
 	}
-	
+
 	/**
-	 * Retrieves the unique identifier of the command that will be invoked for
-	 * changing the mapping type of the selected nodes.
-	 *
-	 * @return The unique identifier of the "map as" command
+	 * Return a command ID for a {@link CommandContributionItemParameter}
+	 * in the form of
+	 * <code>"&lt;<em>command ID</em>&gt;.&lt;<em>mapping key</em>&gt;"</code>
+	 * (e.g. <code>"org.eclipse.jpt.jpa.core.ui.persistentTypeMapAs.entity"</code>)
 	 */
-	protected abstract String getCommandId();
-	
+	protected String buildCommandContributionItemParameterID(MappingUiDefinition<T, ?> mappingUiDefinition) {
+		return this.getCommandID() + '.' + mappingUiDefinition.getKey();
+	}
+
 	/**
-	 * Retrieves the unique identifier of the mapping key command parameter that 
-	 * will be used for the new mapping type of the selected nodes.
-	 *
-	 * @return The unique identifier of the "map as" command parameter
+	 * Return the unique identifier of the command that will be invoked for
+	 * changing the mapping type of the selected nodes.
 	 */
-	protected abstract String getCommandParameterId();
-	
+	protected abstract String getCommandID();
+
 	/**
-	 * Returns an id for a {@link CommandContributionItem} in the form of 
-	 * "<commandId>.<mappingKey>"  
-	 * (for example "org.eclipse.jpt.jpa.core.ui.persistentTypeMapAs.entity")
+	 * Return the unique identifier of the mapping key command parameter that
+	 * will be used for the new mapping type of the selected nodes.
 	 */
-	protected String createCommandContributionItemId(MappingUiDefinition<T, ?> mappingUiDefinition) {
-		return getCommandId() + "." + mappingUiDefinition.getKey();
-	}
+	protected abstract String getCommandParameterID();
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/menus/PersistentAttributeMapAsContribution.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/menus/PersistentAttributeMapAsContribution.java
index cd5f4876a9..e4be04e1cc 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/menus/PersistentAttributeMapAsContribution.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/menus/PersistentAttributeMapAsContribution.java
@@ -19,39 +19,30 @@ import org.eclipse.jpt.jpa.ui.internal.commands.PersistentAttributeMapAsHandler;
 import org.eclipse.ui.menus.CommandContributionItemParameter;
 
 /**
- * This menu contribution is responsible to populate the Map As menu with the
- * registered attribute mapping types defined in the <code>JptPlatformUi</code>
- * for <code>PersistentAttribute</code> objects.
- *
- * @see PersistentAttributeMapAsHandler
- * @see PersistentAttribute
- *
- * @version 2.2
- * @since 2.0
+ * This menu contribution is responsible for populating the "Map As" menu with
+ * the registered mapping types defined in the {@link JpaPlatformUi} for
+ * {@link PersistentAttribute}s.
  */
 public class PersistentAttributeMapAsContribution
 	extends MapAsContribution<ReadOnlyPersistentAttribute>
 {
-	/**
-	 * Creates a new <code>PersistentAttributeMapAsContribution</code>.
-	 */
 	public PersistentAttributeMapAsContribution() {
 		super();
 	}
 
 	@Override
-	protected String getCommandId() {
+	protected String getCommandID() {
 		return PersistentAttributeMapAsHandler.COMMAND_ID;
 	}
 	
 	@Override
-	protected String getCommandParameterId() {
+	protected String getCommandParameterID() {
 		return PersistentAttributeMapAsHandler.SPECIFIED_MAPPING_COMMAND_PARAMETER_ID;
 	}
 	
 	@Override
-	protected CommandContributionItemParameter createParameter(MappingUiDefinition<ReadOnlyPersistentAttribute, ?> mappingUiProvider) {
-		CommandContributionItemParameter parameter = super.createParameter(mappingUiProvider);
+	protected CommandContributionItemParameter buildContributionItemParameter(MappingUiDefinition<ReadOnlyPersistentAttribute, ?> mappingUiProvider) {
+		CommandContributionItemParameter parameter = super.buildContributionItemParameter(mappingUiProvider);
 		String defaultKey = null;
 		if (mappingUiProvider instanceof DefaultMappingUiDefinition<?, ?>) {
 			defaultKey = ((DefaultMappingUiDefinition<? extends PersistentAttribute, ?>) mappingUiProvider).getDefaultKey();
@@ -61,23 +52,16 @@ public class PersistentAttributeMapAsContribution
 	}
 	
 	@Override
-	protected Iterable<? extends MappingUiDefinition<ReadOnlyPersistentAttribute, ?>> getMappingUiDefinitions(JpaPlatformUi jpaPlatformUi, JptResourceType resourceType) {
-		return jpaPlatformUi.getAttributeMappingUiDefinitions(resourceType);
+	protected Iterable<? extends MappingUiDefinition<ReadOnlyPersistentAttribute, ?>> getMappingUiDefinitions(JpaPlatformUi jpaPlatformUI, JptResourceType resourceType) {
+		return jpaPlatformUI.getAttributeMappingUiDefinitions(resourceType);
 	}
 	
 	@Override
-	protected DefaultMappingUiDefinition<ReadOnlyPersistentAttribute, ?> getDefaultMappingUiDefinition(
-			JpaPlatformUi jpaPlatformUi, ReadOnlyPersistentAttribute node) {
-		
-		return getDefaultMappingUiDefinition(
-				jpaPlatformUi, 
-				((PersistentAttribute) node).getDefaultMappingKey(), 
-				node.getResourceType());
+	protected DefaultMappingUiDefinition<ReadOnlyPersistentAttribute, ?> getDefaultMappingUiDefinition(JpaPlatformUi jpaPlatformUI, ReadOnlyPersistentAttribute node) {
+		return getDefaultMappingUiDefinition(jpaPlatformUI, ((PersistentAttribute) node).getDefaultMappingKey(), node.getResourceType());
 	}
 	
-	protected DefaultMappingUiDefinition<ReadOnlyPersistentAttribute, ?> getDefaultMappingUiDefinition(
-			JpaPlatformUi jpaPlatformUi, String defaultMappingKey, JptResourceType resourceType) {
-		
-		return jpaPlatformUi.getDefaultAttributeMappingUiDefinition(resourceType, defaultMappingKey);
+	protected DefaultMappingUiDefinition<ReadOnlyPersistentAttribute, ?> getDefaultMappingUiDefinition(JpaPlatformUi jpaPlatformUI, String defaultMappingKey, JptResourceType resourceType) {
+		return jpaPlatformUI.getDefaultAttributeMappingUiDefinition(resourceType, defaultMappingKey);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/menus/PersistentTypeMapAsContribution.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/menus/PersistentTypeMapAsContribution.java
index 1d343b374b..db8e79e325 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/menus/PersistentTypeMapAsContribution.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/menus/PersistentTypeMapAsContribution.java
@@ -10,7 +10,6 @@
 package org.eclipse.jpt.jpa.ui.internal.menus;
 
 import org.eclipse.jpt.common.core.JptResourceType;
-import org.eclipse.jpt.jpa.core.JpaPlatform;
 import org.eclipse.jpt.jpa.core.context.PersistentType;
 import org.eclipse.jpt.jpa.ui.JpaPlatformUi;
 import org.eclipse.jpt.jpa.ui.details.DefaultMappingUiDefinition;
@@ -18,42 +17,34 @@ import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition;
 import org.eclipse.jpt.jpa.ui.internal.commands.PersistentTypeMapAsHandler;
 
 /**
- * This menu contribution is responsible to populate the Map As menu with the
- * registered mapping types defined in the <code>JptPlatformUi</code> for
- * <code>PersistentType</code> objects.
- *
- * @see JpaPlatform
- * @see JpaPlatformUi
- * @see PersistentType
+ * This menu contribution is responsible for populating the "Map As" menu with
+ * the registered mapping types defined in the {@link JpaPlatformUi} for
+ * {@link PersistentType}s.
  */
 public class PersistentTypeMapAsContribution
 	extends MapAsContribution<PersistentType>
 {
-	/**
-	 * Creates a new <code>PersistentTypeMapAsContribution</code>.
-	 */
 	public PersistentTypeMapAsContribution() {
 		super();
 	}
 	
-	
 	@Override
-	protected String getCommandId() {
+	protected String getCommandID() {
 		return PersistentTypeMapAsHandler.COMMAND_ID;
 	}
 	
 	@Override
-	protected String getCommandParameterId() {
+	protected String getCommandParameterID() {
 		return PersistentTypeMapAsHandler.COMMAND_PARAMETER_ID;
 	}
 	
 	@Override
-	protected Iterable<? extends MappingUiDefinition<PersistentType, ?>> getMappingUiDefinitions(JpaPlatformUi jpaPlatformUi, JptResourceType resourceType) {
-		return jpaPlatformUi.getTypeMappingUiDefinitions(resourceType);
+	protected Iterable<? extends MappingUiDefinition<PersistentType, ?>> getMappingUiDefinitions(JpaPlatformUi jpaPlatformUI, JptResourceType resourceType) {
+		return jpaPlatformUI.getTypeMappingUiDefinitions(resourceType);
 	}
 	
 	@Override
-	protected DefaultMappingUiDefinition<PersistentType, ?> getDefaultMappingUiDefinition(JpaPlatformUi jpaPlatformUi, PersistentType node) {
-		return jpaPlatformUi.getDefaultTypeMappingUiDefinition(node.getResourceType());
+	protected DefaultMappingUiDefinition<PersistentType, ?> getDefaultMappingUiDefinition(JpaPlatformUi jpaPlatformUI, PersistentType node) {
+		return jpaPlatformUI.getDefaultTypeMappingUiDefinition(node.getResourceType());
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/navigator/JpaNavigatorContentProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/navigator/JpaNavigatorContentProvider.java
index 3c6cf5ef0b..70af4b6dfe 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/navigator/JpaNavigatorContentProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/navigator/JpaNavigatorContentProvider.java
@@ -10,10 +10,14 @@
 package org.eclipse.jpt.jpa.ui.internal.navigator;
 
 import org.eclipse.core.resources.IProject;
+import org.eclipse.jface.resource.ResourceManager;
+import org.eclipse.jpt.common.core.internal.utility.PlatformTools;
 import org.eclipse.jpt.common.ui.internal.jface.NavigatorContentProvider;
 import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProviderFactory;
 import org.eclipse.jpt.common.ui.jface.ItemTreeContentProviderFactory;
 import org.eclipse.jpt.jpa.ui.JpaRootContextNodeModel;
+import org.eclipse.jpt.jpa.ui.JpaWorkbench;
+import org.eclipse.ui.PlatformUI;
 
 /**
  * This provider is invoked for:<ul>
@@ -41,6 +45,15 @@ public class JpaNavigatorContentProvider
 	}
 
 	@Override
+	protected ResourceManager buildResourceManager() {
+		return this.getJpaWorkbench().buildLocalResourceManager();
+	}
+
+	private JpaWorkbench getJpaWorkbench() {
+		return PlatformTools.getAdapter(PlatformUI.getWorkbench(), JpaWorkbench.class);
+	}
+
+	@Override
 	protected boolean hasChildren_(Object element) {
 		return this.getRootContextNodeModel(element) != null;
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/navigator/RootContextNodeModelItemLabelProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/navigator/RootContextNodeModelItemLabelProvider.java
index 037fa6f07f..e566176918 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/navigator/RootContextNodeModelItemLabelProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/navigator/RootContextNodeModelItemLabelProvider.java
@@ -9,39 +9,39 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.navigator;
 
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jpt.common.ui.JptCommonUiImages;
 import org.eclipse.jpt.common.ui.internal.jface.AbstractItemExtendedLabelProvider;
-import org.eclipse.jpt.common.ui.jface.ItemLabelProvider;
+import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider;
 import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
 import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.common.utility.transformer.Transformer;
 import org.eclipse.jpt.jpa.core.context.JpaRootContextNode;
 import org.eclipse.jpt.jpa.ui.JpaRootContextNodeModel;
-import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
-import org.eclipse.jpt.jpa.ui.internal.plugin.JptJpaUiPlugin;
-import org.eclipse.swt.graphics.Image;
 
 public class RootContextNodeModelItemLabelProvider
 	extends AbstractItemExtendedLabelProvider<JpaRootContextNodeModel>
 {
-	public RootContextNodeModelItemLabelProvider(JpaRootContextNodeModel rootContextNodeModel, ItemLabelProvider.Manager manager) {
+	public RootContextNodeModelItemLabelProvider(JpaRootContextNodeModel rootContextNodeModel, ItemExtendedLabelProvider.Manager manager) {
 		super(rootContextNodeModel, manager);
 	}
 	
 	@Override
-	protected PropertyValueModel<Image> buildImageModel() {
-		return new TransformationPropertyValueModel<JpaRootContextNode, Image>(this.item, IMAGE_TRANSFORMER);
+	protected PropertyValueModel<ImageDescriptor> buildImageDescriptorModel() {
+		return new TransformationPropertyValueModel<JpaRootContextNode, ImageDescriptor>(this.item, IMAGE_DESCRIPTOR_TRANSFORMER);
 	}
 
-	protected static final Transformer<JpaRootContextNode, Image> IMAGE_TRANSFORMER = new ImageTransformer();
+	protected static final Transformer<JpaRootContextNode, ImageDescriptor> IMAGE_DESCRIPTOR_TRANSFORMER = new ImageDescriptorTransformer();
 
-	protected static class ImageTransformer
-		extends TransformerAdapter<JpaRootContextNode, Image>
+	protected static class ImageDescriptorTransformer
+		extends TransformerAdapter<JpaRootContextNode, ImageDescriptor>
 	{
 		@Override
-		public Image transform(JpaRootContextNode root) {
-			return JptJpaUiPlugin.instance().getImage(JptUiIcons.JPA_CONTENT, (root == null));
+		public ImageDescriptor transform(JpaRootContextNode root) {
+			return JptCommonUiImages.gray(JptJpaUiImages.JPA_CONTENT, (root == null));
 		}
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/GenericPersistenceUnitJarFilesComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/GenericPersistenceUnitJarFilesComposite.java
index a678ff97f2..10aaed19a6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/GenericPersistenceUnitJarFilesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/GenericPersistenceUnitJarFilesComposite.java
@@ -1,13 +1,12 @@
 /*******************************************************************************
- *  Copyright (c) 2009, 2012  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
+ * Copyright (c) 2009, 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ *
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.persistence;
 
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
@@ -18,9 +17,8 @@ public class GenericPersistenceUnitJarFilesComposite
 	extends PersistenceUnitJarFilesComposite
 {
 	public GenericPersistenceUnitJarFilesComposite(
-			Pane<? extends PersistenceUnit> parentPane,
-			Composite parent) {
-
-		super(parentPane, parent);
+			Pane<? extends PersistenceUnit> parent,
+			Composite parentComposite) {
+		super(parent, parentComposite);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/GenericPersistenceUnitMappingFilesComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/GenericPersistenceUnitMappingFilesComposite.java
index 454f5d7338..3a8ad51b0e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/GenericPersistenceUnitMappingFilesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/GenericPersistenceUnitMappingFilesComposite.java
@@ -13,36 +13,13 @@ import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
 import org.eclipse.swt.widgets.Composite;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | AddRemoveListPane                                                     | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see PersistenceUnit
- * @see PersistenceUnitGeneralEditorPageDefinition - The parent container
- * @see AddRemoveListPane
- *
- * @version 2.0
- * @since 2.0
- */
-public class GenericPersistenceUnitMappingFilesComposite extends PersistenceUnitMappingFilesComposite
+public class GenericPersistenceUnitMappingFilesComposite
+	extends PersistenceUnitMappingFilesComposite
 {
-	/**
-	 * Creates a new <code>PersistenceUnitMappingFilesComposite</code>.
-	 *
-	 * @param parentPane The parent pane of this one
-	 * @param parent The parent container
-	 */
-	public GenericPersistenceUnitMappingFilesComposite(Pane<? extends PersistenceUnit> parentPane,
-	                                            Composite parent) {
-
-		super(parentPane, parent);
+	public GenericPersistenceUnitMappingFilesComposite(
+			Pane<? extends PersistenceUnit> parent,
+			Composite parentComposite) {
+		super(parent, parentComposite);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitClassesComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitClassesComposite.java
index fc1ff1bd83..3ab0f8f82d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitClassesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitClassesComposite.java
@@ -17,13 +17,14 @@ import org.eclipse.jdt.core.search.IJavaSearchScope;
 import org.eclipse.jdt.core.search.SearchEngine;
 import org.eclipse.jdt.ui.IJavaElementSearchConstants;
 import org.eclipse.jdt.ui.JavaUI;
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.window.Window;
+import org.eclipse.jpt.common.ui.JptCommonUiImages;
 import org.eclipse.jpt.common.ui.internal.JptCommonUiMessages;
+import org.eclipse.jpt.common.ui.internal.jface.ResourceManagerLabelProvider;
 import org.eclipse.jpt.common.ui.internal.widgets.AddRemoveListPane;
 import org.eclipse.jpt.common.ui.internal.widgets.AddRemovePane;
-import org.eclipse.jpt.common.ui.internal.widgets.AddRemovePane.Adapter;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.internal.model.value.CollectionPropertyValueModelAdapter;
 import org.eclipse.jpt.common.utility.internal.model.value.ItemPropertyListValueModelAdapter;
@@ -31,12 +32,14 @@ import org.eclipse.jpt.common.utility.internal.model.value.ListAspectAdapter;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.internal.model.value.SimpleCollectionValueModel;
 import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
+import org.eclipse.jpt.common.utility.internal.transformer.AbstractTransformer;
 import org.eclipse.jpt.common.utility.iterable.ListIterable;
 import org.eclipse.jpt.common.utility.model.value.CollectionValueModel;
 import org.eclipse.jpt.common.utility.model.value.ListValueModel;
 import org.eclipse.jpt.common.utility.model.value.ModifiableCollectionValueModel;
 import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
+import org.eclipse.jpt.common.utility.transformer.Transformer;
 import org.eclipse.jpt.jpa.core.context.PersistentType;
 import org.eclipse.jpt.jpa.core.context.TypeMapping;
 import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType;
@@ -45,53 +48,22 @@ import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
 import org.eclipse.jpt.jpa.ui.JpaPlatformUi;
 import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition;
 import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
-import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
 import org.eclipse.jpt.jpa.ui.internal.plugin.JptJpaUiPlugin;
 import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.dialogs.SelectionDialog;
 import org.eclipse.ui.progress.IProgressService;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * |                                                                           |
- * | Description                                                               |
- * |                                                                           |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | AddRemoveListPane                                                     | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * |                                                                           |
- * | x Exclude Unlisted Mapped Classes                                         |
- * |                                                                           |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see PersistenceUnit
- * @see PersistenceUnitGeneralEditorPageDefinition - The parent container
- * @see AddRemoveListPane
- *
- * @version 2.3
- * @since 2.0
- */
 @SuppressWarnings("nls")
-public class PersistenceUnitClassesComposite extends Pane<PersistenceUnit>
+public class PersistenceUnitClassesComposite
+	extends Pane<PersistenceUnit>
 {
-	/**
-	 * Creates a new <code>PersistenceUnitMappedClassesComposite</code>.
-	 *
-	 * @param parentPane The parent pane of this one
-	 * @param parent The parent container
-	 */
-	public PersistenceUnitClassesComposite(Pane<? extends PersistenceUnit> parentPane,
-	                                             Composite parent) {
-
-		super(parentPane, parent);
+	public PersistenceUnitClassesComposite(
+			Pane<? extends PersistenceUnit> parent,
+			Composite parentComposite) {
+		super(parent, parentComposite);
 	}
 
 	@Override
@@ -100,10 +72,10 @@ public class PersistenceUnitClassesComposite extends Pane<PersistenceUnit>
 		new AddRemoveListPane<PersistenceUnit, ClassRef>(
 			this,
 			container,
-			this.buildAdapter(),
+			this.buildAddRemovePaneAdapter(),
 			this.buildItemListHolder(),
 			this.buildSelectedItemsModel(),
-			this.buildLabelProvider(),
+			this.buildClassRefLabelProvider(),
 			JpaHelpContextIds.PERSISTENCE_XML_GENERAL
 		);
 
@@ -117,7 +89,7 @@ public class PersistenceUnitClassesComposite extends Pane<PersistenceUnit>
 	}
 
 
-	private ClassRef addMappedClass() {
+	protected ClassRef addMappedClass() {
 
 		IType type = chooseType();
 
@@ -140,7 +112,7 @@ public class PersistenceUnitClassesComposite extends Pane<PersistenceUnit>
 		return false;
 	}
 
-	private Adapter<ClassRef> buildAdapter() {
+	private AddRemovePane.Adapter<ClassRef> buildAddRemovePaneAdapter() {
 		return new AddRemovePane.AbstractAdapter<ClassRef>() {
 			public ClassRef addNewItem() {
 				return addMappedClass();
@@ -201,9 +173,9 @@ public class PersistenceUnitClassesComposite extends Pane<PersistenceUnit>
 	private PropertyValueModel<String> buildExcludeUnlistedMappedClassesStringHolder() {
 		return new TransformationPropertyValueModel<Boolean, String>(buildDefaultExcludeUnlistedMappedClassesHolder()) {
 			@Override
-			protected String transform(Boolean value) {
-				if (value != null) {
-					String defaultStringValue = value.booleanValue() ? JptCommonUiMessages.Boolean_True : JptCommonUiMessages.Boolean_False;
+			protected String transform(Boolean v) {
+				if (v != null) {
+					String defaultStringValue = v.booleanValue() ? JptCommonUiMessages.Boolean_True : JptCommonUiMessages.Boolean_False;
 					return NLS.bind(JptUiPersistenceMessages.PersistenceUnitClassesComposite_excludeUnlistedMappedClassesWithDefault, defaultStringValue);
 				}
 				return JptUiPersistenceMessages.PersistenceUnitClassesComposite_excludeUnlistedMappedClasses;
@@ -226,42 +198,48 @@ public class PersistenceUnitClassesComposite extends Pane<PersistenceUnit>
 			}
 		};
 	}
-	private ILabelProvider buildLabelProvider() {
-		return new LabelProvider() {
-			@Override
-			public Image getImage(Object element) {
-				ClassRef classRef = (ClassRef) element;
-				JavaPersistentType persistentType = classRef.getJavaPersistentType();
-				if (persistentType != null) {
-					return this.getImage(persistentType);
-				}
-				return JptJpaUiPlugin.instance().getImage(JptUiIcons.WARNING);
-			}
 
-			private Image getImage(JavaPersistentType persistentType) {
-				return this.getTypeMappingUiDefinition(persistentType).getImage();
-			}
+	private ILabelProvider buildClassRefLabelProvider() {
+		return new ResourceManagerLabelProvider<ClassRef>(
+				CLASS_REF_LABEL_IMAGE_DESCRIPTOR_TRANSFORMER,
+				CLASS_REF_LABEL_TEXT_TRANSFORMER,
+				this.getResourceManager()
+			);
+	}
 
-			private MappingUiDefinition<PersistentType, ? extends TypeMapping> getTypeMappingUiDefinition(JavaPersistentType persistentType) {
-				return this.getJpaPlatformUi(persistentType).getTypeMappingUiDefinition(persistentType.getResourceType(), persistentType.getMappingKey());
-			}
+	private static final Transformer<ClassRef, ImageDescriptor> CLASS_REF_LABEL_IMAGE_DESCRIPTOR_TRANSFORMER = new ClassRefLabelImageDescriptorTransformer();
+	/* CU private */ static class ClassRefLabelImageDescriptorTransformer
+		extends AbstractTransformer<ClassRef, ImageDescriptor>
+	{
+		@Override
+		protected ImageDescriptor transform_(ClassRef classRef) {
+			return this.getImageDescriptor(classRef.getJavaPersistentType());
+		}
 
-			private JpaPlatformUi getJpaPlatformUi(JavaPersistentType persistentType) {
-				return (JpaPlatformUi) persistentType.getJpaPlatform().getAdapter(JpaPlatformUi.class);
-			}
+		private ImageDescriptor getImageDescriptor(JavaPersistentType persistentType) {
+			return (persistentType != null) ?
+					this.getTypeMappingUiDefinition(persistentType).getImageDescriptor() :
+					JptCommonUiImages.WARNING;
+		}
 
-			@Override
-			public String getText(Object element) {
-				ClassRef classRef = (ClassRef) element;
-				String name = classRef.getClassName();
+		private MappingUiDefinition<PersistentType, ? extends TypeMapping> getTypeMappingUiDefinition(JavaPersistentType persistentType) {
+			return this.getJpaPlatformUi(persistentType).getTypeMappingUiDefinition(persistentType.getResourceType(), persistentType.getMappingKey());
+		}
 
-				if (name == null) {
-					name = JptUiPersistenceMessages.PersistenceUnitClassesComposite_mappedClassesNoName;
-				}
+		private JpaPlatformUi getJpaPlatformUi(JavaPersistentType persistentType) {
+			return (JpaPlatformUi) persistentType.getJpaPlatform().getAdapter(JpaPlatformUi.class);
+		}
+	}
 
-				return name;
-			}
-		};
+	private static final Transformer<ClassRef, String> CLASS_REF_LABEL_TEXT_TRANSFORMER = new ClassRefLabelTextTransformer();
+	/* CU private */ static class ClassRefLabelTextTransformer
+		extends AbstractTransformer<ClassRef, String>
+	{
+		@Override
+		protected String transform_(ClassRef classRef) {
+			String name = classRef.getClassName();
+			return (name != null) ? name : JptUiPersistenceMessages.PersistenceUnitClassesComposite_mappedClassesNoName;
+		}
 	}
 
 	private ListValueModel<ClassRef> buildItemListHolder() {
@@ -276,12 +254,12 @@ public class PersistenceUnitClassesComposite extends Pane<PersistenceUnit>
 		return new ListAspectAdapter<PersistenceUnit, ClassRef>(getSubjectHolder(), PersistenceUnit.SPECIFIED_CLASS_REFS_LIST) {
 			@Override
 			protected ListIterable<ClassRef> getListIterable() {
-				return subject.getSpecifiedClassRefs();
+				return this.subject.getSpecifiedClassRefs();
 			}
 
 			@Override
 			protected int size_() {
-				return subject.getSpecifiedClassRefsSize();
+				return this.subject.getSpecifiedClassRefsSize();
 			}
 		};
 	}
@@ -328,7 +306,7 @@ public class PersistenceUnitClassesComposite extends Pane<PersistenceUnit>
 		return null;
 	}
 
-	private IType findType(ClassRef classRef) {
+	protected IType findType(ClassRef classRef) {
 		String className = classRef.getClassName();
 
 		if (className != null) {
@@ -343,7 +321,7 @@ public class PersistenceUnitClassesComposite extends Pane<PersistenceUnit>
 		return null;
 	}
 
-	private void openMappedClass(ClassRef classRef) {
+	protected void openMappedClass(ClassRef classRef) {
 
 		IType type = findType(classRef);
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitConnectionEditorPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitConnectionEditorPage.java
index 5d1867fd35..a1fc9511cf 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitConnectionEditorPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitConnectionEditorPage.java
@@ -10,6 +10,7 @@
 package org.eclipse.jpt.jpa.ui.internal.persistence;
 
 import java.util.Collection;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
@@ -28,41 +29,15 @@ import org.eclipse.swt.widgets.Group;
 import org.eclipse.ui.forms.widgets.ExpandableComposite;
 import org.eclipse.ui.forms.widgets.Section;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * |                                                                           |
- * | - General --------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | PersistenceUnitConnectionGeneralComposite                             | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * |                                                                           |
- * | - Database -------------------------------------------------------------- |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | PersistenceUnitConnectionDatabaseComposite                            | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see PersistenceUnit
- *
- * @version 3.3
- * @since 2.0
- */
-
 public class PersistenceUnitConnectionEditorPage
-	extends Pane<PersistenceUnit> {
-
+	extends Pane<PersistenceUnit>
+{
 	public PersistenceUnitConnectionEditorPage(
-			PropertyValueModel<PersistenceUnit> subjectHolder,
-            Composite parent,
-            WidgetFactory widgetFactory) {
-
-		super(subjectHolder, parent, widgetFactory);
+			PropertyValueModel<PersistenceUnit> persistenceUnitModel,
+            Composite parentComposite,
+            WidgetFactory widgetFactory,
+            ResourceManager resourceManager) {
+		super(persistenceUnitModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitConnectionEditorPageDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitConnectionEditorPageDefinition.java
index a549e69b92..535f858966 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitConnectionEditorPageDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitConnectionEditorPageDefinition.java
@@ -10,9 +10,9 @@
 package org.eclipse.jpt.jpa.ui.internal.persistence;
 
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.jpa.core.JpaStructureNode;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
 import org.eclipse.jpt.jpa.ui.editors.JpaEditorPageDefinition;
 import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
@@ -47,12 +47,12 @@ public class PersistenceUnitConnectionEditorPageDefinition
 		super();
 	}
 
-	public String getPageText() {
-		return JptUiPersistenceMessages.PersistenceUnitConnectionComposite_connection;
+	public ImageDescriptor getTitleImageDescriptor() {
+		return null;
 	}
 
-	public ImageDescriptor getPageImageDescriptor() {
-		return null;
+	public String getTitleText() {
+		return JptUiPersistenceMessages.PersistenceUnitConnectionComposite_connection;
 	}
 
 	public String getHelpID() {
@@ -60,7 +60,7 @@ public class PersistenceUnitConnectionEditorPageDefinition
 	}
 
 	@Override
-	public void buildEditorPageContent(Composite parent, WidgetFactory widgetFactory, PropertyValueModel<JpaStructureNode> jpaRootStructureNodeModel) {
-		new PersistenceUnitConnectionEditorPage(this.buildPersistenceUnitModel(jpaRootStructureNodeModel), parent, widgetFactory);
+	protected void buildEditorPageContent(Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager, PropertyValueModel<PersistenceUnit> persistenceUnitModel) {
+		new PersistenceUnitConnectionEditorPage(persistenceUnitModel, parentComposite, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitGeneralEditorPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitGeneralEditorPage.java
index f7b88a188c..ec7fa636e8 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitGeneralEditorPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitGeneralEditorPage.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.persistence;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -21,69 +22,15 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.forms.widgets.ExpandableComposite;
 import org.eclipse.ui.forms.widgets.Section;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * |                                                                           |
- * | - General --------------------------------------------------------------- |
- * |                         ------------------------------------------------- |
- * |   Name:                 | I                                             | |
- * |                         ------------------------------------------------- |
- * |                         ------------------------------------------------- |
- * |   Persistence Provider: |                                             |v| |
- * |                         ------------------------------------------------- |
- * |                                                                           |
- * |                                                                           |
- * | - Mapped Classes -------------------------------------------------------- |
- * |                                                                           |
- * |   Description                                                             |
- * |                                                                           |
- * |   ----------------------------------------------------------------------- |
- * |   |                                                                     | |
- * |   | PersistenceUnitMappedClassesComposite                               | |
- * |   |                                                                     | |
- * |   ----------------------------------------------------------------------- |
- * |                                                                           |
- * |                                                                           |
- * | - XML Mapping Files ----------------------------------------------------- |
- * |                                                                           |
- * |   Description                                                             |
- * |                                                                           |
- * |   ----------------------------------------------------------------------- |
- * |   |                                                                     | |
- * |   | PersistenceUnitMappingFilesComposite                                | |
- * |   |                                                                     | |
- * |   ----------------------------------------------------------------------- |
- * |                                                                           |
- * |                                                                           |
- * | - JAR Files ------------------------------------------------------------- |
- * |                                                                           |
- * |   Description                                                             |
- * |                                                                           |
- * |   ----------------------------------------------------------------------- |
- * |   |                                                                     | |
- * |   | PersistenceUnitJarFilesComposite                                    | |
- * |   |                                                                     | |
- * |   ----------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see PersistenceUnit
- * @see PersistenceUnitMappedClassesComposite
- * @see PersistenceUnitMappingFilesComposite
- * @see PersistenceUnitJarFilesComposite
- *
- * @version 3.3
- * @since 2.0
- */
-public class PersistenceUnitGeneralEditorPage extends Pane<PersistenceUnit> {
-	
+public class PersistenceUnitGeneralEditorPage
+	extends Pane<PersistenceUnit>
+{
 	public PersistenceUnitGeneralEditorPage(
 			PropertyValueModel<PersistenceUnit> subjectHolder,
             Composite parent,
-            WidgetFactory widgetFactory) {
-
-		super(subjectHolder, parent, widgetFactory);
+            WidgetFactory widgetFactory,
+            ResourceManager resourceManager) {
+		super(subjectHolder, parent, widgetFactory, resourceManager);
 	}
 
 	@Override
@@ -131,19 +78,19 @@ public class PersistenceUnitGeneralEditorPage extends Pane<PersistenceUnit> {
 		jarFilesSection.setClient(jarFilesComposite);
 	}
 
-	protected Control buildGeneralComposite(Composite parent) {
-		return new PersistenceUnitGeneralComposite(this, parent).getControl();
+	protected Control buildGeneralComposite(Composite parentComposite) {
+		return new PersistenceUnitGeneralComposite(this, parentComposite).getControl();
 	}
 
-	protected Control buildClassesComposite(Composite parent) {
-		return new PersistenceUnitClassesComposite(this, parent).getControl();
+	protected Control buildClassesComposite(Composite parentComposite) {
+		return new PersistenceUnitClassesComposite(this, parentComposite).getControl();
 	}
 
-	protected Control buildMappingFilesComposite(Composite parent) {
-		return new GenericPersistenceUnitMappingFilesComposite(this, parent).getControl();
+	protected Control buildMappingFilesComposite(Composite parentComposite) {
+		return new GenericPersistenceUnitMappingFilesComposite(this, parentComposite).getControl();
 	}
 
-	protected Control buildJarFilesComposite(Composite parent) {
-		return new GenericPersistenceUnitJarFilesComposite(this, parent).getControl();
+	protected Control buildJarFilesComposite(Composite parentComposite) {
+		return new GenericPersistenceUnitJarFilesComposite(this, parentComposite).getControl();
 	}
-}
-\ No newline at end of file
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitGeneralEditorPageDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitGeneralEditorPageDefinition.java
index 8732e04807..ac781a49b6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitGeneralEditorPageDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitGeneralEditorPageDefinition.java
@@ -10,9 +10,10 @@
 package org.eclipse.jpt.jpa.ui.internal.persistence;
 
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.jpa.core.JpaStructureNode;
+import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
 import org.eclipse.jpt.jpa.ui.editors.JpaEditorPageDefinition;
 import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
 import org.eclipse.jpt.jpa.ui.internal.jpa2.persistence.PersistenceUnitEditorPageDefinition;
@@ -44,12 +45,12 @@ public class PersistenceUnitGeneralEditorPageDefinition
 		super();
 	}
 
-	public String getPageText() {
-		return JptUiPersistenceMessages.PersistenceUnitGeneralComposite_general;
+	public ImageDescriptor getTitleImageDescriptor() {
+		return null;
 	}
 
-	public ImageDescriptor getPageImageDescriptor() {
-		return null;
+	public String getTitleText() {
+		return JptUiPersistenceMessages.PersistenceUnitGeneralComposite_general;
 	}
 
 	public String getHelpID() {
@@ -57,7 +58,7 @@ public class PersistenceUnitGeneralEditorPageDefinition
 	}
 
 	@Override
-	public void buildEditorPageContent(Composite parent, WidgetFactory widgetFactory, PropertyValueModel<JpaStructureNode> jpaRootStructureNodeModel) {
-		new PersistenceUnitGeneralEditorPage(this.buildPersistenceUnitModel(jpaRootStructureNodeModel), parent, widgetFactory);
+	protected void buildEditorPageContent(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager, PropertyValueModel<PersistenceUnit> persistenceUnitModel) {
+		new PersistenceUnitGeneralEditorPage(persistenceUnitModel, parent, widgetFactory, resourceManager);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitJarFilesComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitJarFilesComposite.java
index 6ec196a69d..3b11f03993 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitJarFilesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitJarFilesComposite.java
@@ -10,65 +10,38 @@
 package org.eclipse.jpt.jpa.ui.internal.persistence;
 
 import org.eclipse.core.resources.IProject;
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.window.Window;
+import org.eclipse.jpt.common.ui.internal.jface.ResourceManagerLabelProvider;
 import org.eclipse.jpt.common.ui.internal.widgets.AddRemoveListPane;
 import org.eclipse.jpt.common.ui.internal.widgets.AddRemovePane.Adapter;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.internal.model.value.ItemPropertyListValueModelAdapter;
 import org.eclipse.jpt.common.utility.internal.model.value.ListAspectAdapter;
 import org.eclipse.jpt.common.utility.internal.model.value.SimpleCollectionValueModel;
+import org.eclipse.jpt.common.utility.internal.transformer.AbstractTransformer;
+import org.eclipse.jpt.common.utility.internal.transformer.StaticTransformer;
 import org.eclipse.jpt.common.utility.iterable.ListIterable;
 import org.eclipse.jpt.common.utility.model.value.CollectionValueModel;
 import org.eclipse.jpt.common.utility.model.value.ListValueModel;
 import org.eclipse.jpt.common.utility.model.value.ModifiableCollectionValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
+import org.eclipse.jpt.common.utility.transformer.Transformer;
 import org.eclipse.jpt.jpa.core.context.persistence.JarFileRef;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
-import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
-import org.eclipse.jpt.jpa.ui.internal.plugin.JptJpaUiPlugin;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * |                                                                           |
- * | Description                                                               |
- * |                                                                           |
- * | ------------------------------------------------------------------------- |
- * | |                                                                       | |
- * | | AddRemoveListPane                                                     | |
- * | |                                                                       | |
- * | ------------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see PersistenceUnit
- * @see PersistenceUnitGeneralEditorPageDefinition - The parent container
- * @see AddRemoveListPane
- *
- * @version 2.0
- * @since 2.0
- */
 public abstract class PersistenceUnitJarFilesComposite 
 	extends Pane<PersistenceUnit>
 {
-
-	/**
-	 * Creates a new <code>PersistenceUnitJPAMappingDescriptorsComposite</code>.
-	 *
-	 * @param parentPane The parent pane of this one
-	 * @param parent The parent container
-	 */
 	public PersistenceUnitJarFilesComposite(
-			Pane<? extends PersistenceUnit> parentPane,
-			Composite parent) {
-
-		super(parentPane, parent);
+			Pane<? extends PersistenceUnit> parent,
+			Composite parentComposite) {
+		super(parent, parentComposite);
 	}
 
 	@Override
@@ -84,7 +57,7 @@ public abstract class PersistenceUnitJarFilesComposite
 			this.buildAdapter(),
 			this.buildItemListHolder(),
 			this.buildSelectedJarFileRefsModel(),
-			this.buildLabelProvider(),
+			this.buildJarFileRefLabelProvider(),
 			JpaHelpContextIds.PERSISTENCE_XML_GENERAL);
 	}
 
@@ -132,28 +105,29 @@ public abstract class PersistenceUnitJarFilesComposite
 		return new SimpleCollectionValueModel<JarFileRef>();
 	}
 	
-	private ILabelProvider buildLabelProvider() {
-		return new LabelProvider() {
-			@Override
-			public Image getImage(Object element) {
-				return JptJpaUiPlugin.instance().getImage(JptUiIcons.JAR_FILE_REF);
-			}
-			
-			@Override
-			public String getText(Object element) {
-				JarFileRef jarFileRef = (JarFileRef) element;
-				String name = jarFileRef.getFileName();
-				
-				if (name == null) {
-					name = JptUiPersistenceMessages.PersistenceUnitJarFilesComposite_noFileName;
-				}
-				
-				return name;
-			}
-		};
+	private ILabelProvider buildJarFileRefLabelProvider() {
+		return new ResourceManagerLabelProvider<JarFileRef>(
+				JAR_FILE_REF_LABEL_IMAGE_DESCRIPTOR_TRANSFORMER,
+				JAR_FILE_REF_LABEL_TEXT_TRANSFORMER,
+				this.getResourceManager()
+			);
+	}
+
+	private static final Transformer<JarFileRef, ImageDescriptor> JAR_FILE_REF_LABEL_IMAGE_DESCRIPTOR_TRANSFORMER =
+			new StaticTransformer<JarFileRef, ImageDescriptor>(JptJpaUiImages.JAR_FILE_REF);
+
+	private static final Transformer<JarFileRef, String> JAR_FILE_REF_LABEL_TEXT_TRANSFORMER = new JarFileRefLabelTextTransformer();
+	/* CU private */ static class JarFileRefLabelTextTransformer
+		extends AbstractTransformer<JarFileRef, String>
+	{
+		@Override
+		protected String transform_(JarFileRef jarFileRef) {
+			String name = jarFileRef.getFileName();
+			return (name != null) ? name : JptUiPersistenceMessages.PersistenceUnitJarFilesComposite_noFileName;
+		}
 	}
 	
-	private JarFileRef addJarFileRef() {
+	JarFileRef addJarFileRef() {
 		IProject project = getSubject().getJpaProject().getProject();
 
 		ElementTreeSelectionDialog dialog = new ArchiveFileSelectionDialog(
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitMappingFilesComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitMappingFilesComposite.java
index 1e473767be..bf52ad27ec 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitMappingFilesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitMappingFilesComposite.java
@@ -14,29 +14,32 @@ import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.window.Window;
 import org.eclipse.jpt.common.core.resource.ProjectResourceLocator;
+import org.eclipse.jpt.common.ui.internal.jface.ResourceManagerLabelProvider;
 import org.eclipse.jpt.common.ui.internal.widgets.AddRemoveListPane;
 import org.eclipse.jpt.common.ui.internal.widgets.AddRemovePane.Adapter;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.internal.model.value.ItemPropertyListValueModelAdapter;
 import org.eclipse.jpt.common.utility.internal.model.value.ListAspectAdapter;
 import org.eclipse.jpt.common.utility.internal.model.value.SimpleCollectionValueModel;
+import org.eclipse.jpt.common.utility.internal.transformer.AbstractTransformer;
+import org.eclipse.jpt.common.utility.internal.transformer.StaticTransformer;
 import org.eclipse.jpt.common.utility.iterable.ListIterable;
 import org.eclipse.jpt.common.utility.model.value.CollectionValueModel;
 import org.eclipse.jpt.common.utility.model.value.ListValueModel;
 import org.eclipse.jpt.common.utility.model.value.ModifiableCollectionValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
+import org.eclipse.jpt.common.utility.transformer.Transformer;
 import org.eclipse.jpt.jpa.core.context.persistence.MappingFileRef;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
 import org.eclipse.jpt.jpa.core.resource.ResourceMappingFile;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
-import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
 import org.eclipse.jpt.jpa.ui.internal.jface.XmlMappingFileViewerFilter;
 import org.eclipse.jpt.jpa.ui.internal.plugin.JptJpaUiPlugin;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
 import org.eclipse.ui.dialogs.ISelectionStatusValidator;
@@ -45,13 +48,12 @@ import org.eclipse.ui.model.WorkbenchLabelProvider;
 import org.eclipse.ui.views.navigator.ResourceComparator;
 
 public abstract class PersistenceUnitMappingFilesComposite
-		extends Pane<PersistenceUnit> {
-
-
+	extends Pane<PersistenceUnit>
+{
 	public PersistenceUnitMappingFilesComposite(
-			Pane<? extends PersistenceUnit> parentPane, Composite parent) {
-
-		super(parentPane, parent);
+			Pane<? extends PersistenceUnit> parent,
+			Composite parentComposite) {
+		super(parent, parentComposite);
 	}
 
 	protected void addMappingFilesList(Composite container) {
@@ -62,7 +64,7 @@ public abstract class PersistenceUnitMappingFilesComposite
 				buildAdapter(),
 				buildItemListHolder(),
 				buildSelectedMappingFileRefsModel(),
-				buildLabelProvider(),
+				buildMappingFileRefLabelProvider(),
 				JpaHelpContextIds.PERSISTENCE_XML_GENERAL);
 	}
 	
@@ -70,10 +72,8 @@ public abstract class PersistenceUnitMappingFilesComposite
 	 * Prompts a dialog showing a tree structure of the source paths where the
 	 * only files shown are JPA mapping descriptors file. The XML file has to be
 	 * an XML file with the root tag: {@code <entity-mappings>}.
-	 *
-	 * @param listSelectionModel The selection model used to select the new files
 	 */
-	private MappingFileRef addJPAMappingDescriptor() {
+	MappingFileRef addJPAMappingDescriptor() {
 		
 		ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(
 				getShell(),
@@ -130,27 +130,28 @@ public abstract class PersistenceUnitMappingFilesComposite
 				MappingFileRef.FILE_NAME_PROPERTY);
 	}
 	
-	private ILabelProvider buildLabelProvider() {
-		return new LabelProvider() {
-			@Override
-			public Image getImage(Object element) {
-				return JptJpaUiPlugin.instance().getImage(JptUiIcons.MAPPING_FILE_REF);
-			}
-			
-			@Override
-			public String getText(Object element) {
-				MappingFileRef mappingFileRef = (MappingFileRef) element;
-				String name = mappingFileRef.getFileName();
-				
-				if (name == null) {
-					name = JptUiPersistenceMessages.PersistenceUnitMappingFilesComposite_ormNoName;
-				}
-				
-				return name;
-			}
-		};
+	private ILabelProvider buildMappingFileRefLabelProvider() {
+		return new ResourceManagerLabelProvider<MappingFileRef>(
+				MAPPING_FILE_REF_LABEL_IMAGE_DESCRIPTOR_TRANSFORMER,
+				MAPPING_FILE_REF_LABEL_TEXT_TRANSFORMER,
+				this.getResourceManager()
+			);
 	}
-	
+
+	private static final Transformer<MappingFileRef, ImageDescriptor> MAPPING_FILE_REF_LABEL_IMAGE_DESCRIPTOR_TRANSFORMER =
+			new StaticTransformer<MappingFileRef, ImageDescriptor>(JptJpaUiImages.MAPPING_FILE_REF);
+
+	private static final Transformer<MappingFileRef, String> MAPPING_FILE_REF_LABEL_TEXT_TRANSFORMER = new MappingFileRefLabelTextTransformer();
+	/* CU private */ static class MappingFileRefLabelTextTransformer
+		extends AbstractTransformer<MappingFileRef, String>
+	{
+		@Override
+		protected String transform_(MappingFileRef mappingFileRef) {
+			String name = mappingFileRef.getFileName();
+			return (name != null) ? name : JptUiPersistenceMessages.PersistenceUnitMappingFilesComposite_ormNoName;
+		}
+	}
+
 	private ListValueModel<MappingFileRef> buildListHolder() {
 		return new ListAspectAdapter<PersistenceUnit, MappingFileRef>(
 				getSubjectHolder(), PersistenceUnit.SPECIFIED_MAPPING_FILE_REFS_LIST) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitPropertiesEditorPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitPropertiesEditorPage.java
index 5dc0b08b8e..14b91a7893 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitPropertiesEditorPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitPropertiesEditorPage.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.persistence;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jface.viewers.CellEditor;
 import org.eclipse.jface.viewers.IBaseLabelProvider;
 import org.eclipse.jface.viewers.ICellModifier;
@@ -42,38 +43,19 @@ import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.TableItem;
 
-/**
- * Here the layout of this pane:
- * <pre>
- * -----------------------------------------------------------------------------
- * | - Properties ------------------------------------------------------------ |
- * |                                                                           |
- * |   Description                                                             |
- * |                                                                           |
- * |   ----------------------------------------------------------------------- |
- * |   |                                                                     | |
- * |   | AddRemoveTablePane                                                  | |
- * |   |                                                                     | |
- * |   ----------------------------------------------------------------------- |
- * -----------------------------------------------------------------------------</pre>
- *
- * @see PersistenceUnit
- *
- * @version 3.3
- * @since 2.0
- */
 public class PersistenceUnitPropertiesEditorPage
 	extends Pane<PersistenceUnit> 
 {
 	private ModifiableCollectionValueModel<PersistenceUnit.Property> selectedPropertiesModel;
 	private TablePane tablePane;
 
-	public PersistenceUnitPropertiesEditorPage(
-			PropertyValueModel<PersistenceUnit> subjectModel,
-            Composite parent,
-            WidgetFactory widgetFactory) {
 
-		super(subjectModel, parent, widgetFactory);
+	public PersistenceUnitPropertiesEditorPage(
+			PropertyValueModel<PersistenceUnit> persistenceUnitModel,
+            Composite parentComposite,
+            WidgetFactory widgetFactory,
+            ResourceManager resourceManager) {
+		super(persistenceUnitModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitPropertiesEditorPageDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitPropertiesEditorPageDefinition.java
index 3b9220e812..72ec318310 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitPropertiesEditorPageDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitPropertiesEditorPageDefinition.java
@@ -10,18 +10,15 @@
 package org.eclipse.jpt.jpa.ui.internal.persistence;
 
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.jpa.core.JpaStructureNode;
+import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
 import org.eclipse.jpt.jpa.ui.editors.JpaEditorPageDefinition;
 import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
 import org.eclipse.jpt.jpa.ui.internal.jpa2.persistence.PersistenceUnitEditorPageDefinition;
 import org.eclipse.swt.widgets.Composite;
 
-/**
- * @version 3.3
- * @since 2.0
- */
 public class PersistenceUnitPropertiesEditorPageDefinition
 	extends PersistenceUnitEditorPageDefinition
 {
@@ -44,12 +41,12 @@ public class PersistenceUnitPropertiesEditorPageDefinition
 		super();
 	}
 
-	public String getPageText() {
-		return JptUiPersistenceMessages.PersistenceUnitPropertiesComposite_properties;
+	public ImageDescriptor getTitleImageDescriptor() {
+		return null;
 	}
 
-	public ImageDescriptor getPageImageDescriptor() {
-		return null;
+	public String getTitleText() {
+		return JptUiPersistenceMessages.PersistenceUnitPropertiesComposite_properties;
 	}
 
 	public String getHelpID() {
@@ -57,7 +54,7 @@ public class PersistenceUnitPropertiesEditorPageDefinition
 	}
 
 	@Override
-	public void buildEditorPageContent(Composite parent, WidgetFactory widgetFactory, PropertyValueModel<JpaStructureNode> jpaRootStructureNodeModel) {
-		new PersistenceUnitPropertiesEditorPage(this.buildPersistenceUnitModel(jpaRootStructureNodeModel), parent, widgetFactory);
+	protected void buildEditorPageContent(Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager, PropertyValueModel<PersistenceUnit> persistenceUnitModel) {
+		new PersistenceUnitPropertiesEditorPage(persistenceUnitModel, parentComposite, widgetFactory, resourceManager);
 	}
-}
-\ No newline at end of file
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/base/AbstractJpaPlatformUi.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/base/AbstractJpaPlatformUi.java
index 41c1c8665c..134259957b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/base/AbstractJpaPlatformUi.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/base/AbstractJpaPlatformUi.java
@@ -10,6 +10,7 @@
 package org.eclipse.jpt.jpa.ui.internal.platform.base;
 
 import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.IWizard;
 import org.eclipse.jface.wizard.WizardDialog;
@@ -87,11 +88,9 @@ public abstract class AbstractJpaPlatformUi
 
 	// ********** details providers **********
 
-	public JpaDetailsPageManager<? extends JpaStructureNode> buildJpaDetailsPageManager(
-			Composite parent, JpaStructureNode structureNode, WidgetFactory widgetFactory) {
-
-		JpaDetailsProvider jpaDetailsProvider = this.getDetailsProvider(structureNode);
-		return jpaDetailsProvider == null ? null : jpaDetailsProvider.buildDetailsPageManager(parent, widgetFactory);
+	public JpaDetailsPageManager<? extends JpaStructureNode> buildJpaDetailsPageManager(Composite parent, JpaStructureNode structureNode, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		JpaDetailsProvider provider = this.getDetailsProvider(structureNode);
+		return (provider == null) ? null : provider.buildDetailsPageManager(parent, widgetFactory, resourceManager);
 	}
 
 	protected JpaDetailsProvider getDetailsProvider(JpaStructureNode structureNode) {
@@ -100,7 +99,7 @@ public abstract class AbstractJpaPlatformUi
 				return provider;
 			}
 		}
-		return null;//return null, some structure nodes do not have a details page
+		return null; // some JPA structure nodes do not have a details page
 	}
 
 	protected Iterable<JpaDetailsProvider> getDetailsProviders() {
@@ -110,14 +109,8 @@ public abstract class AbstractJpaPlatformUi
 
 	// ********** type mappings **********
 
-	public JpaComposite buildTypeMappingComposite(
-			JptResourceType resourceType,
-			String mappingKey,
-			Composite parent,
-			PropertyValueModel<TypeMapping> mappingHolder,
-			WidgetFactory widgetFactory
-	) {
-		return this.getMappingResourceUiDefinition(resourceType).buildTypeMappingComposite(mappingKey, mappingHolder, parent, widgetFactory);
+	public JpaComposite buildTypeMappingComposite(JptResourceType resourceType, String mappingKey, Composite parentComposite, PropertyValueModel<TypeMapping> mappingModel, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return this.getMappingResourceUiDefinition(resourceType).buildTypeMappingComposite(mappingKey, mappingModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	public Iterable<MappingUiDefinition<PersistentType, ? extends TypeMapping>> getTypeMappingUiDefinitions(JptResourceType resourceType) {
@@ -135,15 +128,8 @@ public abstract class AbstractJpaPlatformUi
 
 	// ********** attribute mappings **********
 
-	public JpaComposite buildAttributeMappingComposite(
-			JptResourceType resourceType,
-			String mappingKey,
-			Composite parent,
-			PropertyValueModel<AttributeMapping> mappingHolder,
-			PropertyValueModel<Boolean> enabledModel,
-			WidgetFactory widgetFactory
-	) {
-		return this.getMappingResourceUiDefinition(resourceType).buildAttributeMappingComposite(mappingKey, mappingHolder, enabledModel, parent, widgetFactory);
+	public JpaComposite buildAttributeMappingComposite(JptResourceType resourceType, String mappingKey, Composite parentComposite, PropertyValueModel<AttributeMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, WidgetFactory widgetFactory, ResourceManager resourceManager) {
+		return this.getMappingResourceUiDefinition(resourceType).buildAttributeMappingComposite(mappingKey, mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
 	}
 
 	public Iterable<MappingUiDefinition<ReadOnlyPersistentAttribute, ? extends AttributeMapping>> getAttributeMappingUiDefinitions(JptResourceType resourceType) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/ClassRefItemLabelProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/ClassRefItemLabelProvider.java
index f7360811ec..c784a5baa8 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/ClassRefItemLabelProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/ClassRefItemLabelProvider.java
@@ -9,32 +9,24 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.platform.generic;
 
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jpt.common.ui.internal.jface.AbstractItemExtendedLabelProvider;
-import org.eclipse.jpt.common.ui.jface.ItemLabelProvider;
+import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.persistence.ClassRef;
-import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
-import org.eclipse.jpt.jpa.ui.internal.plugin.JptJpaUiPlugin;
-import org.eclipse.swt.graphics.Image;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 
 public class ClassRefItemLabelProvider
 	extends AbstractItemExtendedLabelProvider<ClassRef>
 {
-	protected final Image image;
-
-	public ClassRefItemLabelProvider(ClassRef classRef, ItemLabelProvider.Manager manager) {
+	public ClassRefItemLabelProvider(ClassRef classRef, ItemExtendedLabelProvider.Manager manager) {
 		super(classRef, manager);
-		this.image = this.buildImage();
 	}
 
 	@Override
-	public Image getImage() {
-		return this.image;
-	}
-
-	protected Image buildImage() {
-		return JptJpaUiPlugin.instance().getImage(JptUiIcons.CLASS_REF, this.item.isVirtual());
+	protected ImageDescriptor getImageDescriptor() {
+		return JptJpaUiImages.CLASS_REF;
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/GenericNavigatorItemLabelProviderFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/GenericNavigatorItemLabelProviderFactory.java
index 56b836bd63..f4f452abb3 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/GenericNavigatorItemLabelProviderFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/GenericNavigatorItemLabelProviderFactory.java
@@ -10,6 +10,7 @@
 package org.eclipse.jpt.jpa.ui.internal.platform.generic;
 
 import org.eclipse.core.resources.IResource;
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jpt.common.ui.internal.jface.StaticItemExtendedLabelProvider;
 import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider;
 import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProviderFactory;
@@ -20,8 +21,7 @@ import org.eclipse.jpt.jpa.core.context.java.JarFile;
 import org.eclipse.jpt.jpa.core.context.orm.OrmXml;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceXml;
-import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
-import org.eclipse.jpt.jpa.ui.internal.plugin.JptJpaUiPlugin;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 
 /**
  * This factory builds item label providers for the JPA content in the
@@ -67,16 +67,16 @@ public class GenericNavigatorItemLabelProviderFactory
 		return null;
 	}
 
-	protected ItemExtendedLabelProvider buildPersistenceXmlProvider(PersistenceXml item, @SuppressWarnings("unused") ItemExtendedLabelProvider.Manager manager) {
-		return this.buildResourceItemLabelProvider(item);
+	protected ItemExtendedLabelProvider buildPersistenceXmlProvider(PersistenceXml item, ItemExtendedLabelProvider.Manager manager) {
+		return this.buildResourceItemLabelProvider(item, manager);
 	}
 
 	protected ItemExtendedLabelProvider buildPersistenceUnitProvider(PersistenceUnit item, ItemExtendedLabelProvider.Manager manager) {
 		return new PersistenceUnitItemLabelProvider(item, manager);
 	}
 
-	protected ItemExtendedLabelProvider buildOrmXmlProvider(OrmXml item, @SuppressWarnings("unused") ItemExtendedLabelProvider.Manager manager) {
-		return this.buildResourceItemLabelProvider(item);
+	protected ItemExtendedLabelProvider buildOrmXmlProvider(OrmXml item, ItemExtendedLabelProvider.Manager manager) {
+		return this.buildResourceItemLabelProvider(item, manager);
 	}
 
 	protected ItemExtendedLabelProvider buildPersistentTypeProvider(PersistentType item, ItemExtendedLabelProvider.Manager manager) {
@@ -87,27 +87,28 @@ public class GenericNavigatorItemLabelProviderFactory
 		return new PersistentAttributeItemLabelProvider(item, manager);
 	}
 
-	protected ItemExtendedLabelProvider buildJarFileProvider(JarFile item, @SuppressWarnings("unused") ItemExtendedLabelProvider.Manager manager) {
-		return this.buildResourceItemLabelProvider(item, JptUiIcons.JAR_FILE);
+	protected ItemExtendedLabelProvider buildJarFileProvider(JarFile item, ItemExtendedLabelProvider.Manager manager) {
+		return this.buildResourceItemLabelProvider(item, JptJpaUiImages.JAR_FILE, manager);
 	}
 
-	protected ItemExtendedLabelProvider buildResourceItemLabelProvider(JpaNode node) {
-		return this.buildResourceItemLabelProvider(node.getResource());
+	protected ItemExtendedLabelProvider buildResourceItemLabelProvider(JpaNode node, ItemExtendedLabelProvider.Manager manager) {
+		return this.buildResourceItemLabelProvider(node.getResource(), manager);
 	}
 
-	protected ItemExtendedLabelProvider buildResourceItemLabelProvider(JpaNode node, String imageKey) {
-		return this.buildResourceItemLabelProvider(node.getResource(), imageKey);
+	protected ItemExtendedLabelProvider buildResourceItemLabelProvider(JpaNode node, ImageDescriptor imageDescriptor, ItemExtendedLabelProvider.Manager manager) {
+		return this.buildResourceItemLabelProvider(node.getResource(), imageDescriptor, manager);
 	}
 
-	protected ItemExtendedLabelProvider buildResourceItemLabelProvider(IResource resource) {
-		return this.buildResourceItemLabelProvider(resource, JptUiIcons.JPA_FILE);
+	protected ItemExtendedLabelProvider buildResourceItemLabelProvider(IResource resource, ItemExtendedLabelProvider.Manager manager) {
+		return this.buildResourceItemLabelProvider(resource, JptJpaUiImages.JPA_FILE, manager);
 	}
 
-	protected ItemExtendedLabelProvider buildResourceItemLabelProvider(IResource resource, String imageKey) {
+	protected ItemExtendedLabelProvider buildResourceItemLabelProvider(IResource resource, ImageDescriptor imageDescriptor, ItemExtendedLabelProvider.Manager manager) {
 		return new StaticItemExtendedLabelProvider(
-					JptJpaUiPlugin.instance().getImage(imageKey),
+					imageDescriptor,
 					resource.getName(),
-					this.buildResourceDescription(resource)
+					this.buildResourceDescription(resource),
+					manager
 				);
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/JarFileRefItemLabelProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/JarFileRefItemLabelProvider.java
index 96c3b0395c..2e25876c6b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/JarFileRefItemLabelProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/JarFileRefItemLabelProvider.java
@@ -9,32 +9,24 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.platform.generic;
 
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jpt.common.ui.internal.jface.AbstractItemExtendedLabelProvider;
-import org.eclipse.jpt.common.ui.jface.ItemLabelProvider;
+import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.persistence.JarFileRef;
-import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
-import org.eclipse.jpt.jpa.ui.internal.plugin.JptJpaUiPlugin;
-import org.eclipse.swt.graphics.Image;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 
 public class JarFileRefItemLabelProvider
 	extends AbstractItemExtendedLabelProvider<JarFileRef>
 {
-	protected final Image image;
-
-	public JarFileRefItemLabelProvider(JarFileRef jarFileRef, ItemLabelProvider.Manager manager) {
+	public JarFileRefItemLabelProvider(JarFileRef jarFileRef, ItemExtendedLabelProvider.Manager manager) {
 		super(jarFileRef, manager);
-		this.image = this.buildImage();
 	}
 
 	@Override
-	public Image getImage() {
-		return this.image;
-	}
-
-	protected Image buildImage() {
-		return JptJpaUiPlugin.instance().getImage(JptUiIcons.JAR_FILE_REF);
+	protected ImageDescriptor getImageDescriptor() {
+		return JptJpaUiImages.JAR_FILE_REF;
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/MappingFileRefItemLabelProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/MappingFileRefItemLabelProvider.java
index 7c24dd160c..a374663110 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/MappingFileRefItemLabelProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/MappingFileRefItemLabelProvider.java
@@ -9,32 +9,25 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.platform.generic;
 
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jpt.common.ui.JptCommonUiImages;
 import org.eclipse.jpt.common.ui.internal.jface.AbstractItemExtendedLabelProvider;
-import org.eclipse.jpt.common.ui.jface.ItemLabelProvider;
+import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.persistence.MappingFileRef;
-import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
-import org.eclipse.jpt.jpa.ui.internal.plugin.JptJpaUiPlugin;
-import org.eclipse.swt.graphics.Image;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 
 public class MappingFileRefItemLabelProvider
 	extends AbstractItemExtendedLabelProvider<MappingFileRef>
 {
-	protected final Image image;
-
-	public MappingFileRefItemLabelProvider(MappingFileRef mappingFileRef, ItemLabelProvider.Manager manager) {
+	public MappingFileRefItemLabelProvider(MappingFileRef mappingFileRef, ItemExtendedLabelProvider.Manager manager) {
 		super(mappingFileRef, manager);
-		this.image = this.buildImage();
-	}
-	
-	@Override
-	public Image getImage() {
-		return this.image;
 	}
 
-	protected Image buildImage() {
-		return JptJpaUiPlugin.instance().getImage(JptUiIcons.MAPPING_FILE_REF, this.item.isDefault());
+	@Override
+	protected ImageDescriptor getImageDescriptor() {
+		return JptCommonUiImages.gray(JptJpaUiImages.MAPPING_FILE_REF, this.item.isDefault());
 	}
 	
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/PersistenceUnitItemLabelProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/PersistenceUnitItemLabelProvider.java
index 8a8c1ed242..1dc94d46e3 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/PersistenceUnitItemLabelProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/PersistenceUnitItemLabelProvider.java
@@ -10,35 +10,27 @@
 package org.eclipse.jpt.jpa.ui.internal.platform.generic;
 
 import org.eclipse.core.resources.IResource;
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jpt.common.ui.internal.jface.AbstractItemExtendedLabelProvider;
-import org.eclipse.jpt.common.ui.jface.ItemLabelProvider;
+import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider;
 import org.eclipse.jpt.common.utility.internal.ArrayTools;
 import org.eclipse.jpt.common.utility.internal.model.value.CompositePropertyValueModel;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.JpaContextNode;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
-import org.eclipse.jpt.jpa.ui.internal.plugin.JptJpaUiPlugin;
-import org.eclipse.swt.graphics.Image;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 
 public class PersistenceUnitItemLabelProvider
 	extends AbstractItemExtendedLabelProvider<PersistenceUnit>
 {
-	protected final Image image;
-
-	public PersistenceUnitItemLabelProvider(PersistenceUnit persistenceUnit, ItemLabelProvider.Manager manager) {
+	public PersistenceUnitItemLabelProvider(PersistenceUnit persistenceUnit, ItemExtendedLabelProvider.Manager manager) {
 		super(persistenceUnit, manager);
-		this.image = this.buildImage();
 	}
 
 	@Override
-	public Image getImage() {
-		return this.image;
-	}
-
-	protected Image buildImage() {
-		return JptJpaUiPlugin.instance().getImage(JptUiIcons.PERSISTENCE_UNIT);
+	protected ImageDescriptor getImageDescriptor() {
+		return JptJpaUiImages.PERSISTENCE_UNIT;
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/PersistentAttributeItemLabelProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/PersistentAttributeItemLabelProvider.java
index f215d55dfc..872f08da8f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/PersistentAttributeItemLabelProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/PersistentAttributeItemLabelProvider.java
@@ -9,8 +9,10 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.platform.generic;
 
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jpt.common.ui.JptCommonUiImages;
 import org.eclipse.jpt.common.ui.internal.jface.AbstractItemExtendedLabelProvider;
-import org.eclipse.jpt.common.ui.jface.ItemLabelProvider;
+import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
 import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter;
@@ -20,12 +22,11 @@ import org.eclipse.jpt.jpa.core.context.AttributeMapping;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute;
 import org.eclipse.jpt.jpa.ui.JpaPlatformUi;
 import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition;
-import org.eclipse.swt.graphics.Image;
 
 public class PersistentAttributeItemLabelProvider
 	extends AbstractItemExtendedLabelProvider<ReadOnlyPersistentAttribute>
 {
-	public PersistentAttributeItemLabelProvider(ReadOnlyPersistentAttribute persistentAttribute, ItemLabelProvider.Manager manager) {
+	public PersistentAttributeItemLabelProvider(ReadOnlyPersistentAttribute persistentAttribute, ItemExtendedLabelProvider.Manager manager) {
 		super(persistentAttribute, manager);
 	}
 
@@ -33,8 +34,8 @@ public class PersistentAttributeItemLabelProvider
 	// ********** image **********
 
 	@Override
-	protected PropertyValueModel<Image> buildImageModel() {
-		return new TransformationPropertyValueModel<AttributeMapping, Image>(this.buildMappingModel(), IMAGE_TRANSFORMER);
+	protected PropertyValueModel<ImageDescriptor> buildImageDescriptorModel() {
+		return new TransformationPropertyValueModel<AttributeMapping, ImageDescriptor>(this.buildMappingModel(), IMAGE_DESCRIPTOR_TRANSFORMER);
 	}
 
 	protected PropertyValueModel<AttributeMapping> buildMappingModel() {
@@ -53,20 +54,18 @@ public class PersistentAttributeItemLabelProvider
 		}
 	}
 
-	protected static final Transformer<AttributeMapping, Image> IMAGE_TRANSFORMER = new ImageTransformer();
+	protected static final Transformer<AttributeMapping, ImageDescriptor> IMAGE_DESCRIPTOR_TRANSFORMER = new ImageDescriptorTransformer();
 
 	/**
-	 * Transform an attribute mapping into the appropriate image.
+	 * Transform an attribute mapping into the appropriate image descriptor.
 	 */
-	protected static class ImageTransformer
-		extends TransformerAdapter<AttributeMapping, Image>
+	protected static class ImageDescriptorTransformer
+		extends TransformerAdapter<AttributeMapping, ImageDescriptor>
 	{
 		@Override
-		public Image transform(AttributeMapping attributeMapping) {
+		public ImageDescriptor transform(AttributeMapping attributeMapping) {
 			MappingUiDefinition<? extends ReadOnlyPersistentAttribute, ?> definition = this.getAttributeMappingUiDefinition(attributeMapping);
-			return attributeMapping.getPersistentAttribute().isVirtual() ?
-					definition.getGhostImage() :
-					definition.getImage();
+			return JptCommonUiImages.gray(definition.getImageDescriptor(), attributeMapping.getPersistentAttribute().isVirtual());
 		}
 
 		private MappingUiDefinition<? extends ReadOnlyPersistentAttribute, ?> getAttributeMappingUiDefinition(AttributeMapping attributeMapping) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/PersistentTypeItemLabelProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/PersistentTypeItemLabelProvider.java
index f50004631f..7809512623 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/PersistentTypeItemLabelProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/PersistentTypeItemLabelProvider.java
@@ -9,8 +9,9 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.platform.generic;
 
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jpt.common.ui.internal.jface.AbstractItemExtendedLabelProvider;
-import org.eclipse.jpt.common.ui.jface.ItemLabelProvider;
+import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
 import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter;
@@ -20,12 +21,11 @@ import org.eclipse.jpt.jpa.core.context.PersistentType;
 import org.eclipse.jpt.jpa.core.context.TypeMapping;
 import org.eclipse.jpt.jpa.ui.JpaPlatformUi;
 import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition;
-import org.eclipse.swt.graphics.Image;
 
 public class PersistentTypeItemLabelProvider
 	extends AbstractItemExtendedLabelProvider<PersistentType>
 {
-	public PersistentTypeItemLabelProvider(PersistentType persistentType, ItemLabelProvider.Manager manager) {
+	public PersistentTypeItemLabelProvider(PersistentType persistentType, ItemExtendedLabelProvider.Manager manager) {
 		super(persistentType, manager);
 	}
 	
@@ -33,8 +33,8 @@ public class PersistentTypeItemLabelProvider
 	// ********** image **********
 
 	@Override
-	protected PropertyValueModel<Image> buildImageModel() {
-		return new TransformationPropertyValueModel<TypeMapping, Image>(this.buildMappingModel(), IMAGE_TRANSFORMER);
+	protected PropertyValueModel<ImageDescriptor> buildImageDescriptorModel() {
+		return new TransformationPropertyValueModel<TypeMapping, ImageDescriptor>(this.buildMappingModel(), IMAGE_DESCRIPTOR_TRANSFORMER);
 	}
 	
 	protected PropertyValueModel<TypeMapping> buildMappingModel() {
@@ -53,17 +53,17 @@ public class PersistentTypeItemLabelProvider
 		}
 	}
 
-	protected static final Transformer<TypeMapping, Image> IMAGE_TRANSFORMER = new ImageTransformer();
+	protected static final Transformer<TypeMapping, ImageDescriptor> IMAGE_DESCRIPTOR_TRANSFORMER = new ImageDescriptorTransformer();
 
 	/**
-	 * Transform a type mapping into the appropriate image.
+	 * Transform a type mapping into the appropriate image descriptor.
 	 */
-	protected static class ImageTransformer
-		extends TransformerAdapter<TypeMapping, Image>
+	protected static class ImageDescriptorTransformer
+		extends TransformerAdapter<TypeMapping, ImageDescriptor>
 	{
 		@Override
-		public Image transform(TypeMapping typeMapping) {
-			return this.getTypeMappingUiDefinition(typeMapping).getImage();
+		public ImageDescriptor transform(TypeMapping typeMapping) {
+			return this.getTypeMappingUiDefinition(typeMapping).getImageDescriptor();
 		}
 
 		private MappingUiDefinition<? extends PersistentType, ?> getTypeMappingUiDefinition(TypeMapping typeMapping) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/structure/OrmStructureItemLabelProviderFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/structure/OrmStructureItemLabelProviderFactory.java
index 78eb89da91..795c236aa2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/structure/OrmStructureItemLabelProviderFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/structure/OrmStructureItemLabelProviderFactory.java
@@ -13,9 +13,8 @@ import org.eclipse.jpt.common.ui.internal.jface.StaticItemExtendedLabelProvider;
 import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider;
 import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProviderFactory;
 import org.eclipse.jpt.jpa.core.context.orm.EntityMappings;
-import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
-import org.eclipse.jpt.jpa.ui.internal.plugin.JptJpaUiPlugin;
 
 /**
  * This factory builds item label providers for an <code>orm.xml</code> file
@@ -47,11 +46,12 @@ public class OrmStructureItemLabelProviderFactory
 		return super.buildProvider(item, manager);
 	}
 
-	protected ItemExtendedLabelProvider buildEntityMappingsProvider(EntityMappings entityMappings, @SuppressWarnings("unused") ItemExtendedLabelProvider.Manager manager) {
+	protected ItemExtendedLabelProvider buildEntityMappingsProvider(EntityMappings entityMappings, ItemExtendedLabelProvider.Manager manager) {
 		return new StaticItemExtendedLabelProvider(
-					JptJpaUiPlugin.instance().getImage(JptUiIcons.ENTITY_MAPPINGS),
+					JptJpaUiImages.ENTITY_MAPPINGS,
 					JptUiMessages.OrmItemLabelProviderFactory_entityMappingsLabel,
-					this.buildEntityMappingsDescription(entityMappings)
+					this.buildEntityMappingsDescription(entityMappings),
+					manager
 				);
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/structure/PersistenceStructureItemLabelProviderFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/structure/PersistenceStructureItemLabelProviderFactory.java
index b19730296b..8b053ad491 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/structure/PersistenceStructureItemLabelProviderFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/structure/PersistenceStructureItemLabelProviderFactory.java
@@ -18,13 +18,12 @@ import org.eclipse.jpt.jpa.core.context.persistence.JarFileRef;
 import org.eclipse.jpt.jpa.core.context.persistence.MappingFileRef;
 import org.eclipse.jpt.jpa.core.context.persistence.Persistence;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
 import org.eclipse.jpt.jpa.ui.internal.platform.generic.ClassRefItemLabelProvider;
 import org.eclipse.jpt.jpa.ui.internal.platform.generic.JarFileRefItemLabelProvider;
 import org.eclipse.jpt.jpa.ui.internal.platform.generic.MappingFileRefItemLabelProvider;
 import org.eclipse.jpt.jpa.ui.internal.platform.generic.PersistenceUnitItemLabelProvider;
-import org.eclipse.jpt.jpa.ui.internal.plugin.JptJpaUiPlugin;
 
 /**
  * This factory builds item label providers for a <code>persistence.xml</code> file
@@ -67,11 +66,12 @@ public class PersistenceStructureItemLabelProviderFactory
 		return null;
 	}
 
-	protected ItemExtendedLabelProvider buildPersistenceProvider(Persistence item, @SuppressWarnings("unused") ItemExtendedLabelProvider.Manager manager) {
+	protected ItemExtendedLabelProvider buildPersistenceProvider(Persistence item, ItemExtendedLabelProvider.Manager manager) {
 		return new StaticItemExtendedLabelProvider(
-					JptJpaUiPlugin.instance().getImage(JptUiIcons.PERSISTENCE),
+					JptJpaUiImages.PERSISTENCE,
 					JptUiMessages.PersistenceItemLabelProviderFactory_persistenceLabel,
-					this.buildPersistenceDescription(item)
+					this.buildPersistenceDescription(item),
+					manager
 				);
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/views/JpaDetailsView.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/views/JpaDetailsView.java
index fe10d4579c..c42f0141d4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/views/JpaDetailsView.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/views/JpaDetailsView.java
@@ -10,7 +10,8 @@
 package org.eclipse.jpt.jpa.ui.internal.views;
 
 import java.util.HashMap;
-
+import org.eclipse.jface.resource.ResourceManager;
+import org.eclipse.jpt.common.core.internal.utility.PlatformTools;
 import org.eclipse.jpt.common.ui.internal.widgets.FormWidgetFactory;
 import org.eclipse.jpt.common.utility.internal.ObjectTools;
 import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent;
@@ -19,6 +20,7 @@ import org.eclipse.jpt.common.utility.model.listener.PropertyChangeListener;
 import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.JpaStructureNode;
+import org.eclipse.jpt.jpa.ui.JpaWorkbench;
 import org.eclipse.jpt.jpa.ui.details.JpaDetailsPageManager;
 import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
 import org.eclipse.jpt.jpa.ui.internal.plugin.JptJpaUiPlugin;
@@ -29,6 +31,7 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.part.PageBook;
@@ -48,16 +51,6 @@ public class JpaDetailsView
 	extends ViewPart
 {
 	/**
-	 * The factory used by the details view and its page managers
-	 * to create the their widgets.
-	 * The widgetFactory is created when the view's control is
-	 * {@link #createPartControl(Composite) created}
-	 * and disposed, if necessary, when the view is
-	 * {@link #dispose() disposed}.
-	 */
-	private FormWidgetFactory widgetFactory;
-
-	/**
 	 * The scrolled form that holds the {@link #pageBook page book}.
 	 * We need to force it to reflow whenever we change the page book's
 	 * current page.
@@ -82,6 +75,24 @@ public class JpaDetailsView
 	private volatile JpaDetailsPageManager<? extends JpaStructureNode> currentPageManager;
 
 	/**
+	 * The resource manager is created when the view's control is
+	 * {@link #createPartControl(Composite) created}
+	 * and disposed, if necessary, when the view is
+	 * {@link #dispose() disposed}.
+	 */
+	private volatile ResourceManager resourceManager;
+
+	/**
+	 * The factory used by the details view and its page managers
+	 * to create the their widgets.
+	 * The widgetFactory is created when the view's control is
+	 * {@link #createPartControl(Composite) created}
+	 * and disposed, if necessary, when the view is
+	 * {@link #dispose() disposed}.
+	 */
+	private volatile FormWidgetFactory widgetFactory;
+
+	/**
 	 * The manager is created when the view's control is
 	 * {@link #createPartControl(Composite) created}
 	 * and disposed, if necessary, when the view is
@@ -108,6 +119,7 @@ public class JpaDetailsView
 
 	@Override
 	public void createPartControl(Composite parent) {
+		this.resourceManager = this.buildResourceManager();
 		this.widgetFactory = new FormWidgetFactory(new FormToolkit(parent.getDisplay()));
 		this.scrolledForm = this.widgetFactory.createScrolledForm(parent);
 		JptJpaUiPlugin.instance().controlAffectsJavaSource(this.scrolledForm);
@@ -127,6 +139,18 @@ public class JpaDetailsView
 		this.setJpaSelection(this.manager.getJpaSelectionModel().getValue());
 	}
 
+	private ResourceManager buildResourceManager() {
+		return this.getJpaWorkbench().buildLocalResourceManager();
+	}
+
+	private JpaWorkbench getJpaWorkbench() {
+		return PlatformTools.getAdapter(this.getWorkbench(), JpaWorkbench.class);
+	}
+
+	private IWorkbench getWorkbench() {
+		return this.getSite().getWorkbenchWindow().getWorkbench();
+	}
+
 	private Control buildDefaultPage() {
 		return this.widgetFactory.createLabel(this.pageBook, JptUiMessages.JpaDetailsView_viewNotAvailable);
 	}
@@ -235,7 +259,7 @@ public class JpaDetailsView
 	}
 
 	private JpaDetailsPageManager<? extends JpaStructureNode> buildPageManager(JpaStructureNode node) {
-		return this.getJpaDetailsPageManagerFactory(node).buildPageManager(this.pageBook, this.widgetFactory);
+		return this.getJpaDetailsPageManagerFactory(node).buildPageManager(this.pageBook, this.widgetFactory, this.resourceManager);
 	}
 
 	private JpaDetailsPageManager.Factory getJpaDetailsPageManagerFactory(JpaStructureNode node) {
@@ -252,9 +276,6 @@ public class JpaDetailsView
 
 	@Override
 	public void dispose() {
-		if (this.widgetFactory != null) {
-			this.widgetFactory.dispose();
-		}
 		if (this.manager != null) {
 			this.dispose_();
 		}
@@ -262,14 +283,19 @@ public class JpaDetailsView
 	}
 
 	private void dispose_() {
-		this.manager.getJpaSelectionModel().removePropertyChangeListener(PropertyValueModel.VALUE, this.jpaSelectionListener);
-		this.manager.dispose();
-
 		if (this.currentPageManager != null) {
 			this.currentPageManager.setSubject(null);
 			this.currentPageManager = null;
 		}
+
 		this.pageManagers.clear();
+
+		this.manager.getJpaSelectionModel().removePropertyChangeListener(PropertyValueModel.VALUE, this.jpaSelectionListener);
+		this.manager.dispose();
+
+		this.widgetFactory.dispose();
+
+		this.resourceManager.dispose();
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/views/JpaStructurePage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/views/JpaStructurePage.java
index 499d169b99..bf735cbfe9 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/views/JpaStructurePage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/views/JpaStructurePage.java
@@ -14,6 +14,8 @@ import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.IStatusLineManager;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.resource.LocalResourceManager;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -105,11 +107,19 @@ public class JpaStructurePage
 	 */
 	private final ISelectionChangedListener treePostSelectionListener = new TreePostSelectionChangedListener();
 
+	/**
+	 * Resource manager passed to tree state provider.
+	 */
+	private final ResourceManager resourceManager;
+
 
-	public JpaStructurePage(JpaStructureView structureView, JpaEditorManager editorManager) {
+	public JpaStructurePage(JpaStructureView structureView, JpaEditorManager editorManager, ResourceManager resourceManager) {
 		super();
 		this.structureView = structureView;
 		this.editorManager = editorManager;
+		// we build a local resource manager because these pages come and go
+		// with their corresponding editors
+		this.resourceManager = new LocalResourceManager(resourceManager);
 	}
 
 	@Override
@@ -139,6 +149,7 @@ public class JpaStructurePage
 
 	@Override
 	public void dispose() {
+		this.resourceManager.dispose();
 		this.disengageListeners();
 		super.dispose();
 	}
@@ -275,7 +286,8 @@ public class JpaStructurePage
 	private TreeStateProvider buildStateProvider(ItemTreeStateProviderFactoryProvider factoryProvider) {
 		return new ItemTreeStateProviderManager(
 				factoryProvider.getItemContentProviderFactory(),
-				factoryProvider.getItemLabelProviderFactory()
+				factoryProvider.getItemLabelProviderFactory(),
+				this.resourceManager
 			);
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/views/JpaStructureView.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/views/JpaStructureView.java
index 7a63a9230c..9b1c7e9fc4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/views/JpaStructureView.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/views/JpaStructureView.java
@@ -9,7 +9,10 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.views;
 
+import org.eclipse.jface.resource.ResourceManager;
+import org.eclipse.jpt.common.core.internal.utility.PlatformTools;
 import org.eclipse.jpt.common.utility.internal.ObjectTools;
+import org.eclipse.jpt.jpa.ui.JpaWorkbench;
 import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
 import org.eclipse.jpt.jpa.ui.selection.JpaEditorManager;
 import org.eclipse.jpt.jpa.ui.selection.JpaViewManager;
@@ -20,6 +23,7 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.part.IPage;
@@ -46,6 +50,14 @@ public class JpaStructureView
 	 */
 	private volatile Manager manager;
 
+	/**
+	 * The resource manager is created when the view's control is
+	 * {@link #createPartControl(Composite) created}
+	 * and disposed, if necessary, when the view is
+	 * {@link #dispose() disposed}.
+	 */
+	private volatile ResourceManager resourceManager;
+
 
 	public JpaStructureView() {
 		super();
@@ -54,6 +66,7 @@ public class JpaStructureView
 	@Override
 	public void createPartControl(Composite parent) {
 		this.manager = this.buildManager();
+		this.resourceManager = this.buildResourceManager();
 		super.createPartControl(parent);
 	}
 
@@ -71,6 +84,18 @@ public class JpaStructureView
 		return (JpaViewManager.PageManager) this.getAdapter(JpaViewManager.PageManager.class);
 	}
 
+	private ResourceManager buildResourceManager() {
+		return this.getJpaWorkbench().buildLocalResourceManager();
+	}
+
+	private JpaWorkbench getJpaWorkbench() {
+		return PlatformTools.getAdapter(this.getWorkbench(), JpaWorkbench.class);
+	}
+
+	private IWorkbench getWorkbench() {
+		return this.getSite().getWorkbenchWindow().getWorkbench();
+	}
+
 	@Override
 	protected IPage createDefaultPage(PageBook book) {
 		DefaultPage page = new DefaultPage();
@@ -121,7 +146,7 @@ public class JpaStructureView
 			// editor return null so the default page is displayed
 			return null;
 		}
-		JpaStructurePage page = new JpaStructurePage(this, editorManager);
+		JpaStructurePage page = new JpaStructurePage(this, editorManager, this.resourceManager);
 		this.initPage(page);
 		page.createControl(this.getPageBook());
 		return new PageRec(editor, page);
@@ -138,10 +163,15 @@ public class JpaStructureView
 	public void dispose() {
 		super.dispose();
 		if (this.manager != null) {
-			this.manager.dispose();
+			this.dispose_();
 		}
 	}
 
+	private void dispose_() {
+		this.resourceManager.dispose();
+		this.manager.dispose();
+	}
+
 	@Override
 	public String toString() {
 		return ObjectTools.toString(this);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/JpaFacetActionPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/JpaFacetActionPage.java
index 74c4711572..414bcf6c1b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/JpaFacetActionPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/JpaFacetActionPage.java
@@ -12,10 +12,9 @@ package org.eclipse.jpt.jpa.ui.internal.wizards;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jpt.jpa.core.internal.facet.JpaFacetDataModelProperties;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
-import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
 import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
-import org.eclipse.jpt.jpa.ui.internal.plugin.JptJpaUiPlugin;
 import org.eclipse.jst.common.project.facet.core.libprov.LibraryInstallDelegate;
 import org.eclipse.jst.common.project.facet.ui.libprov.LibraryProviderFrameworkUi;
 import org.eclipse.swt.SWT;
@@ -43,7 +42,7 @@ public abstract class JpaFacetActionPage
 		super(pageName);
 		setTitle(JptUiMessages.JpaFacetWizardPage_title);
 		setDescription(JptUiMessages.JpaFacetWizardPage_description);
-		setImageDescriptor(JptJpaUiPlugin.instance().buildImageDescriptor(JptUiIcons.JPA_WIZ_BANNER));
+		setImageDescriptor(JptJpaUiImages.JPA_PROJECT_BANNER);
 	}
 	
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/JpaMakePersistentWizard.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/JpaMakePersistentWizard.java
index a50e7eeef5..4014434d5b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/JpaMakePersistentWizard.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/JpaMakePersistentWizard.java
@@ -3,52 +3,61 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
- * 
+ *
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.wizards;
 
 import java.lang.reflect.InvocationTargetException;
-import java.util.List;
+import java.util.Set;
 import org.eclipse.jdt.core.IType;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.resource.LocalResourceManager;
 import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jpt.common.core.internal.utility.PlatformTools;
 import org.eclipse.jpt.jpa.core.JpaProject;
-import org.eclipse.jpt.jpa.core.context.persistence.Persistence;
-import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.jpa.core.context.persistence.PersistenceXml;
-import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
+import org.eclipse.jpt.jpa.ui.JpaWorkbench;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
 import org.eclipse.jpt.jpa.ui.internal.plugin.JptJpaUiPlugin;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.PlatformUI;
 
-public class JpaMakePersistentWizard extends Wizard {	
-	
-	public static final String HELP_CONTEXT_ID = JptJpaUiPlugin.instance().getPluginID() + ".GenerateEntitiesFromSchemaWizard"; //$NON-NLS-1$
+public class JpaMakePersistentWizard
+	extends Wizard
+{
+	private final JpaProject jpaProject;
 
-	final JpaProject jpaProject;
+	private final Set<IType> selectedTypes;
 
-	final List<IType> selectedTypes;
+	private final ResourceManager resourceManager;
 
-	private JpaMakePersistentWizardPage makePersistentWizardPage;	
-	
-	protected final ResourceManager resourceManager;
-	
-	public JpaMakePersistentWizard(JpaProject jpaProject, List<IType> selectedTypes) {
+	private JpaMakePersistentWizardPage makePersistentWizardPage;
+
+	private static final String HELP_CONTEXT_ID = JptJpaUiPlugin.instance().getPluginID() + ".GenerateEntitiesFromSchemaWizard"; //$NON-NLS-1$
+
+
+	public JpaMakePersistentWizard(JpaProject jpaProject, Set<IType> selectedTypes) {
 		super();
 		this.jpaProject = jpaProject;
 		this.selectedTypes = selectedTypes;
-		this.resourceManager = new LocalResourceManager(JFaceResources.getResources());
+		this.resourceManager = this.getJpaWorkbench().buildLocalResourceManager();
 		this.setWindowTitle(JptUiMessages.JpaMakePersistentWizardPage_title);
-		this.setDefaultPageImageDescriptor(JptJpaUiPlugin.instance().buildImageDescriptor(JptUiIcons.ENTITY_WIZ_BANNER));
+		this.setDefaultPageImageDescriptor(JptJpaUiImages.ENTITY_BANNER);
 	}
-	
+
+	private JpaWorkbench getJpaWorkbench() {
+		return PlatformTools.getAdapter(this.getWorkbench(), JpaWorkbench.class);
+	}
+
+	private IWorkbench getWorkbench() {
+		return PlatformUI.getWorkbench();
+	}
+
 	@Override
 	public void addPages() {
-		setForcePreviousAndNextButtons(true);
-		this.makePersistentWizardPage = new JpaMakePersistentWizardPage(this.jpaProject, this.selectedTypes, HELP_CONTEXT_ID);
+		this.setForcePreviousAndNextButtons(true);
+		this.makePersistentWizardPage = new JpaMakePersistentWizardPage(this.jpaProject, this.selectedTypes, this.resourceManager, HELP_CONTEXT_ID);
 		this.addPage(this.makePersistentWizardPage);
 		return;
 	}
@@ -57,23 +66,12 @@ public class JpaMakePersistentWizard extends Wizard {
 	public boolean performFinish() {
 		try {
 			this.makePersistentWizardPage.performFinish();
-		} catch (InvocationTargetException e) {
-			JptJpaUiPlugin.instance().logError(e);
+		} catch (InvocationTargetException ex) {
+			JptJpaUiPlugin.instance().logError(ex);
 		}
 		return true;
 	}
 
-	protected PersistenceUnit getPersistenceUnit(JpaProject jpaProject) {
-		PersistenceXml persistenceXml = jpaProject.getRootContextNode().getPersistenceXml();
-		if (persistenceXml != null) {
-			Persistence persistence = persistenceXml.getRoot();
-			if (persistence != null && persistence.getPersistenceUnitsSize() > 0) {
-				return persistence.getPersistenceUnits().iterator().next();
-			}
-		}
-		return null;
-	}
-
 	@Override
 	public void dispose() {
 		this.resourceManager.dispose();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/JpaMakePersistentWizardPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/JpaMakePersistentWizardPage.java
index 838a2e4280..a1b5f413dc 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/JpaMakePersistentWizardPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/JpaMakePersistentWizardPage.java
@@ -11,8 +11,8 @@ package org.eclipse.jpt.jpa.ui.internal.wizards;
 
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
-import java.util.List;
 import java.util.ListIterator;
+import java.util.Set;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IWorkspace;
@@ -28,6 +28,8 @@ import org.eclipse.jdt.ui.JavaElementComparator;
 import org.eclipse.jdt.ui.JavaElementLabelProvider;
 import org.eclipse.jface.dialogs.ProgressMonitorDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jface.viewers.CellEditor;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.ComboBoxViewerCellEditor;
@@ -50,15 +52,17 @@ import org.eclipse.jpt.common.ui.internal.utility.swt.SWTTools;
 import org.eclipse.jpt.common.utility.command.Command;
 import org.eclipse.jpt.common.utility.internal.ArrayTools;
 import org.eclipse.jpt.common.utility.internal.ObjectTools;
-import org.eclipse.jpt.common.utility.internal.collection.ListTools;
+import org.eclipse.jpt.common.utility.internal.filter.FilterAdapter;
 import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable;
 import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable;
 import org.eclipse.jpt.common.utility.internal.model.value.AspectPropertyValueModelAdapter;
 import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
+import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter;
 import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent;
 import org.eclipse.jpt.common.utility.model.listener.PropertyChangeListener;
 import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
+import org.eclipse.jpt.jpa.core.JpaFile;
 import org.eclipse.jpt.jpa.core.JpaProject;
 import org.eclipse.jpt.jpa.core.JpaProjectManager;
 import org.eclipse.jpt.jpa.core.MappingKeys;
@@ -99,19 +103,15 @@ import org.eclipse.ui.ide.IDE;
 import org.eclipse.ui.model.WorkbenchContentProvider;
 import org.eclipse.ui.model.WorkbenchLabelProvider;
 
-public class JpaMakePersistentWizardPage extends WizardPage {
-
-	// sizing constants
-	private final static int TABLE_HEIGHT = 250;
-	private final static int TABLE_WIDTH = 300;
-
-	private static String MAKE_PERSISTENT_PAGE_NAME = "MakePersistent"; //$NON-NLS-1$
+public class JpaMakePersistentWizardPage
+	extends WizardPage
+{
 	private TableViewer classTableViewer;
 	private final String helpContextId;
 
 	private final Type[] selectedTypes;
 
-	private final JpaProject jpaProject;
+	/* CU private */ final JpaProject jpaProject;
 	private JptResourceType jptResourceType;
 	
 	private final ModifiablePropertyValueModel<Boolean> annotateInJavaModel;
@@ -121,11 +121,26 @@ public class JpaMakePersistentWizardPage extends WizardPage {
 	
 	private final ModifiablePropertyValueModel<Boolean> listInPersistenceXmlModel;
 
-	protected JpaMakePersistentWizardPage(final JpaProject jpaProject, final List<IType> selectedTypes, final String helpContextId) {
+	/* CU private */ final ResourceManager resourceManager;
+
+	// sizing constants
+	private final static int TABLE_HEIGHT = 250;
+	private final static int TABLE_WIDTH = 300;
+
+	private static String MAKE_PERSISTENT_PAGE_NAME = "MakePersistent"; //$NON-NLS-1$
+
+
+	protected JpaMakePersistentWizardPage(
+			JpaProject jpaProject,
+			Set<IType> selectedJdtTypes,
+			ResourceManager resourceManager,
+			String helpContextId
+	) {
 		super(MAKE_PERSISTENT_PAGE_NAME);
 		this.jpaProject = jpaProject;
 
-		this.selectedTypes = this.buildTypes(selectedTypes);
+		this.selectedTypes = this.buildSelectedTypes(selectedJdtTypes);
+		this.resourceManager = resourceManager;
 		this.jptResourceType = JavaSourceFileDefinition.instance().getResourceType();
 		this.helpContextId = helpContextId;
 		this.annotateInJavaModel = new SimplePropertyValueModel<Boolean>(Boolean.TRUE);
@@ -135,36 +150,49 @@ public class JpaMakePersistentWizardPage extends WizardPage {
 		this.setMessage(JptUiMessages.JpaMakePersistentWizardPage_message);
 	}
 
-	protected Type[] buildTypes(final List<IType> selectedTypes) {
-		return ListTools.list(
-			new TransformationIterable<IType, Type>(nonPersistentTypes(selectedTypes)) {
-				@Override
-				protected Type transform(IType jdtType) {
-					return new Type(jdtType);
-				}
-			}).toArray(new Type[] {});
+	protected Type[] buildSelectedTypes(Set<IType> selectedJdtTypes) {
+		return ArrayTools.array(this.buildSelectedTypesIterable(selectedJdtTypes), Type.class);
+	}
+
+	protected Iterable<Type> buildSelectedTypesIterable(Set<IType> selectedJdtTypes) {
+		return new TransformationIterable<IType, Type>(this.selectNonPersistentJdtTypes(selectedJdtTypes), new JdtTypeTransformer());
+	}
+
+	/* CU private */ class JdtTypeTransformer
+		extends TransformerAdapter<IType, Type>
+	{
+		@Override
+		public Type transform(IType jdtType) {
+			return new Type(jdtType);
+		}
 	}
 
 	/**
-	 * Return all ITypes that are not already persistent.
+	 * Return all {@link IType JDT type}s that are not already persistent.
 	 * Any root structure nodes means the type is already annotated, 
-	 * listed in persistence.xml, or listed in a mapping file
+	 * listed in <code>persistence.xml</code>, or listed in a mapping file.
 	 */
-	protected Iterable<IType> nonPersistentTypes(final List<IType> selectedTypes) {
-		return new FilteringIterable<IType>(selectedTypes) {
-			@Override
-			protected boolean accept(IType jdtType) {
-				return getJpaProject().getJpaFile((IFile) jdtType.getResource()).getRootStructureNodesSize() == 0;
-			}
-		};
+	protected Iterable<IType> selectNonPersistentJdtTypes(Set<IType> selectedJdtTypes) {
+		return new FilteringIterable<IType>(selectedJdtTypes, new NonPersistentJdtTypeFilter());
 	}
 
-	protected JpaProject getJpaProject() {
-		return this.jpaProject;
+	/* CU private */ class NonPersistentJdtTypeFilter
+		extends FilterAdapter<IType>
+	{
+		@Override
+		public boolean accept(IType jdtType) {
+			return this.getJpaFile(jdtType).getRootStructureNodesSize() == 0;
+		}
+		private JpaFile getJpaFile(IType jdtType) {
+			return this.getJpaProject().getJpaFile((IFile) jdtType.getResource());
+		}
+		private JpaProject getJpaProject() {
+			return JpaMakePersistentWizardPage.this.jpaProject;
+		}
 	}
 
 	protected JpaPlatformUi getJpaPlatformUi() {
-		return (JpaPlatformUi) this.getJpaProject().getJpaPlatform().getAdapter(JpaPlatformUi.class);
+		return (JpaPlatformUi) this.jpaProject.getJpaPlatform().getAdapter(JpaPlatformUi.class);
 	}
 
 	public void createControl(Composite parent) {
@@ -410,19 +438,32 @@ public class JpaMakePersistentWizardPage extends WizardPage {
 	}
 
 	protected ColumnLabelProvider buildMappingColumnLabelProvider() {
-		return new ColumnLabelProvider() {
-			@Override
-			public String getText(Object element) {
-				MappingUiDefinition<? extends PersistentType, ?> mappingUiDefinition = getMappingUiDefinition(((Type) element).mappingKey);
-				return mappingUiDefinition.getLabel();
-			}
-			
-			@Override
-			public Image getImage(Object element) {
-				MappingUiDefinition<? extends PersistentType, ?> mappingUiDefinition = getMappingUiDefinition(((Type) element).mappingKey);
-				return mappingUiDefinition.getImage();
-			}
-		};
+		return new MappingColumnLabelProvider();
+	}
+
+	/* CU private */ class MappingColumnLabelProvider
+		extends ColumnLabelProvider
+	{
+		@Override
+		public String getText(Object element) {
+			return this.getMappingUiDefinition(element).getLabel();
+		}
+
+		@Override
+		public Image getImage(Object element) {
+			return this.getResourceManager().createImage(this.getImageDescriptor(element));
+		}
+
+		private ImageDescriptor getImageDescriptor(Object element) {
+			return this.getMappingUiDefinition(element).getImageDescriptor();
+		}
+
+		private MappingUiDefinition<? extends PersistentType, ?> getMappingUiDefinition(Object element) {
+			return JpaMakePersistentWizardPage.this.getMappingUiDefinition(((Type) element).mappingKey);
+		}
+		private ResourceManager getResourceManager() {
+			return JpaMakePersistentWizardPage.this.resourceManager;
+		}
 	}
 
 	protected MappingUiDefinition<? extends PersistentType, ?> getMappingUiDefinition(String mappingKey) {
@@ -448,7 +489,7 @@ public class JpaMakePersistentWizardPage extends WizardPage {
 			if (ormXmlResource == null) {
 				errorMessage = JptUiMessages.JpaMakePersistentWizardPage_mappingFileDoesNotExistError;
 			}
-			else if (getJpaProject().getJpaFile(ormXmlResource.getFile()).getRootStructureNodesSize() == 0) {
+			else if (this.jpaProject.getJpaFile(ormXmlResource.getFile()).getRootStructureNodesSize() == 0) {
 				errorMessage = JptUiMessages.JpaMakePersistentWizardPage_mappingFileNotListedInPersistenceXmlError;
 			}
 		}
@@ -471,7 +512,7 @@ public class JpaMakePersistentWizardPage extends WizardPage {
 	}
 
 	private void performAddToOrmXml() throws InvocationTargetException {
-		this.perform(new AddToOrmXmlRunnable(this.getJpaProject(), this.getOrmXmlResource(), this.selectedTypes));	
+		this.perform(new AddToOrmXmlRunnable(this.jpaProject, this.getOrmXmlResource(), this.selectedTypes));	
 		try {
 			this.openEditor(this.getOrmXmlResource().getFile());
 		}
@@ -481,7 +522,7 @@ public class JpaMakePersistentWizardPage extends WizardPage {
 	}
 
 	private void performAnnotateInJava() {
-		this.perform(new AnnotateInJavaRunnable(this.getJpaProject(), this.selectedTypes, this.isListInPersistenceXml()));
+		this.perform(new AnnotateInJavaRunnable(this.jpaProject, this.selectedTypes, this.isListInPersistenceXml()));
 	}
 
 	private void perform(IRunnableWithProgress runnable) {
@@ -516,7 +557,7 @@ public class JpaMakePersistentWizardPage extends WizardPage {
 	}
 
 	protected JptXmlResource getOrmXmlResource() {
-		return this.getJpaProject().getMappingFileXmlResource(new Path(this.getMappingFileLocation()));
+		return this.jpaProject.getMappingFileXmlResource(new Path(this.getMappingFileLocation()));
 	}
 	
 	protected boolean isListInPersistenceXml() {
@@ -539,11 +580,12 @@ public class JpaMakePersistentWizardPage extends WizardPage {
 		return new File(getMappingFileLocation()).getName();
 	}
 
+
 	private class Type implements AbstractPersistenceUnit.MappedType {
 
 		private final IType jdtType;
 
-		private String mappingKey;
+		/* CU private */ String mappingKey;
 
 		protected Type(IType jdtType) {
 			super();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/conversion/java/JavaMetadataConversionWizard.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/conversion/java/JavaMetadataConversionWizard.java
index fe9c24f2cd..2183023479 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/conversion/java/JavaMetadataConversionWizard.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/conversion/java/JavaMetadataConversionWizard.java
@@ -9,9 +9,8 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.wizards.conversion.java;
 import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
-import org.eclipse.jpt.jpa.ui.internal.plugin.JptJpaUiPlugin;
 
 public class JavaMetadataConversionWizard
 	extends Wizard
@@ -26,7 +25,7 @@ public class JavaMetadataConversionWizard
 		}
 		this.page = page;
 		this.setWindowTitle(JptUiMessages.JavaMetadataConversionWizard_title);
-		this.setDefaultPageImageDescriptor(JptJpaUiPlugin.instance().buildImageDescriptor(JptUiIcons.JPA_FILE_WIZ_BANNER));
+		this.setDefaultPageImageDescriptor(JptJpaUiImages.JPA_FILE_BANNER);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/entity/EntityWizard.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/entity/EntityWizard.java
index 524dff4b19..f8f3628451 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/entity/EntityWizard.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/entity/EntityWizard.java
@@ -22,7 +22,7 @@ import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jpt.common.core.internal.utility.PlatformTools;
 import org.eclipse.jpt.jpa.core.context.JpaContextNode;
-import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 import org.eclipse.jpt.jpa.ui.internal.plugin.JptJpaUiPlugin;
 import org.eclipse.jpt.jpa.ui.internal.wizards.entity.data.model.EntityDataModelProvider;
 import org.eclipse.jst.j2ee.internal.plugin.J2EEEditorUtility;
@@ -47,7 +47,7 @@ public class EntityWizard
     public EntityWizard(IDataModel model) {
 		super(model);
         setWindowTitle(EntityWizardMsg.ENTITY_WIZARD_TITLE);
-        setDefaultPageImageDescriptor(JptJpaUiPlugin.instance().buildImageDescriptor(JptUiIcons.ENTITY_WIZ_BANNER));        
+        setDefaultPageImageDescriptor(JptJpaUiImages.ENTITY_BANNER);
 	}    
  
 	public EntityWizard(){
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/AssociationTablesPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/AssociationTablesPage.java
index e54dc6d62f..65237287d7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/AssociationTablesPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/AssociationTablesPage.java
@@ -16,12 +16,12 @@ import static org.eclipse.jpt.jpa.ui.internal.wizards.gen.SWTUtil.createText;
 import java.util.ArrayList;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.resource.ResourceManager;
+import org.eclipse.jpt.common.ui.JptCommonUiImages;
 import org.eclipse.jpt.common.utility.internal.iterable.IterableTools;
 import org.eclipse.jpt.jpa.db.Schema;
 import org.eclipse.jpt.jpa.db.Table;
 import org.eclipse.jpt.jpa.gen.internal.Association;
 import org.eclipse.jpt.jpa.gen.internal.ORMGenCustomizer;
-import org.eclipse.jpt.jpa.ui.internal.ImageRepository;
 import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
@@ -93,7 +93,7 @@ public class AssociationTablesPage extends NewAssociationWizardPage {
 		});
 		
 		Button browser1 = createButton(assocTablesGroup, 1, "", SWT.NONE);
-		browser1.setImage( ImageRepository.getBrowseButtonImage(this.resourceManager)); 
+		browser1.setImage(this.resourceManager.createImage(JptCommonUiImages.BROWSE_BUTTON));
 
 		browser1.addSelectionListener(new SelectionListener(){
 			public void widgetDefaultSelected(SelectionEvent e) {}
@@ -118,7 +118,7 @@ public class AssociationTablesPage extends NewAssociationWizardPage {
 		});
 		
 		Button browser2 = createButton(assocTablesGroup, 1, "", SWT.NONE);
-		browser2.setImage( ImageRepository.getBrowseButtonImage(this.resourceManager)); 
+		browser2.setImage(this.resourceManager.createImage(JptCommonUiImages.BROWSE_BUTTON));
 
 		browser2.addSelectionListener(new SelectionListener(){
 			public void widgetDefaultSelected(SelectionEvent e) {}
@@ -143,7 +143,7 @@ public class AssociationTablesPage extends NewAssociationWizardPage {
 		joinTableTextField.setEnabled(false);
 
 		joinTableBrowse = createButton(assocTablesGroup, 1, "", SWT.NONE);
-		joinTableBrowse.setImage( ImageRepository.getBrowseButtonImage(this.resourceManager)); 
+		joinTableBrowse.setImage(this.resourceManager.createImage(JptCommonUiImages.BROWSE_BUTTON));
 		joinTableBrowse.setEnabled(false);
 		
 		joinTableBrowse.addSelectionListener(new SelectionListener(){
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/DatabaseGroup.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/DatabaseGroup.java
index cb4689817a..6876ef6c63 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/DatabaseGroup.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/DatabaseGroup.java
@@ -22,6 +22,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jface.wizard.IWizardContainer;
+import org.eclipse.jpt.common.ui.JptCommonUiImages;
 import org.eclipse.jpt.common.utility.internal.collection.CollectionTools;
 import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable;
 import org.eclipse.jpt.common.utility.internal.iterator.CloneIterator;
@@ -34,7 +35,6 @@ import org.eclipse.jpt.jpa.db.ConnectionProfileFactory;
 import org.eclipse.jpt.jpa.db.Schema;
 import org.eclipse.jpt.jpa.db.SchemaContainer;
 import org.eclipse.jpt.jpa.db.ui.internal.DTPUiTools;
-import org.eclipse.jpt.jpa.ui.internal.ImageRepository;
 import org.eclipse.jpt.jpa.ui.internal.plugin.JptJpaUiPlugin;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -90,7 +90,7 @@ public class DatabaseGroup
 		this.connectionComboBox = this.buildConnectionComboBox(parent, widthHint);
 
 		// add connection button
-		Button addConnectionButton = this.buildButton(parent, JptUiEntityGenMessages.addConnectionLink, ImageRepository.getAddConnectionButtonImage(this.resourceManager), this.buildAddConnectionLinkSelectionListener());
+		Button addConnectionButton = this.buildButton(parent, JptUiEntityGenMessages.addConnectionLink, this.resourceManager.createImage(JptCommonUiImages.ADD_CONNECTION_BUTTON), this.buildAddConnectionLinkSelectionListener());
 		addConnectionButton.setLayoutData(new GridData());
 
 		// A composite holds the reconnect button & text
@@ -106,7 +106,7 @@ public class DatabaseGroup
 		comp.setLayout(gridLayout);
 
 		// reconnection button
-		this.reconnectButton = this.buildButton(comp, JptUiEntityGenMessages.connectLink, ImageRepository.getReconnectButtonImage(this.resourceManager),  this.buildReconnectLinkSelectionListener());
+		this.reconnectButton = this.buildButton(comp, JptUiEntityGenMessages.connectLink, this.resourceManager.createImage(JptCommonUiImages.RECONNECT_BUTTON),  this.buildReconnectLinkSelectionListener());
 		this.buildLabel(comp, 1, JptUiEntityGenMessages.schemaInfo);
 
 		// schema combo-box
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/DefaultTableGenerationWizardPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/DefaultTableGenerationWizardPage.java
index 1148e54c16..ade70784da 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/DefaultTableGenerationWizardPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/DefaultTableGenerationWizardPage.java
@@ -34,6 +34,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerFilter;
 import org.eclipse.jface.window.Window;
+import org.eclipse.jface.wizard.IWizard;
 import org.eclipse.jpt.common.core.internal.utility.JDTTools;
 import org.eclipse.jpt.jpa.core.JpaProject;
 import org.eclipse.jpt.jpa.gen.internal.ORMGenCustomizer;
@@ -355,13 +356,17 @@ public class DefaultTableGenerationWizardPage extends NewTypeWizardPage {
 	}
 
 	protected ORMGenCustomizer getCustomizer() {
-		GenerateEntitiesFromSchemaWizard wizard = (GenerateEntitiesFromSchemaWizard) this.getWizard();
-		return wizard.getCustomizer();
-	}	
+		return this.getWizard().getCustomizer();
+	}
+
+	@Override
+	public GenerateEntitiesFromSchemaWizard getWizard() {
+		return (GenerateEntitiesFromSchemaWizard) super.getWizard();
+	}
 
 	@Override
     public final void performHelp() {
-        this.getHelpSystem().displayHelp( GenerateEntitiesFromSchemaWizard.HELP_CONTEXT_ID );
+        this.getHelpSystem().displayHelp(this.getWizard().getHelpContextID());
     }
     
 	protected final IWorkbenchHelpSystem getHelpSystem() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/GenerateEntitiesFromSchemaWizard.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/GenerateEntitiesFromSchemaWizard.java
index 177aece056..a5904086a4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/GenerateEntitiesFromSchemaWizard.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/GenerateEntitiesFromSchemaWizard.java
@@ -7,7 +7,6 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-
 package org.eclipse.jpt.jpa.ui.internal.wizards.gen;
 
 import java.io.File;
@@ -26,8 +25,6 @@ import org.eclipse.jdt.core.IPackageFragment;
 import org.eclipse.jdt.core.IPackageFragmentRoot;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.resource.LocalResourceManager;
 import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.window.Window;
@@ -51,7 +48,8 @@ import org.eclipse.jpt.jpa.gen.internal.DatabaseAnnotationNameBuilder;
 import org.eclipse.jpt.jpa.gen.internal.ORMGenCustomizer;
 import org.eclipse.jpt.jpa.gen.internal.ORMGenTable;
 import org.eclipse.jpt.jpa.gen.internal.PackageGenerator;
-import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
+import org.eclipse.jpt.jpa.ui.JpaWorkbench;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
 import org.eclipse.jpt.jpa.ui.internal.plugin.JptJpaUiPlugin;
 import org.eclipse.osgi.util.NLS;
@@ -60,11 +58,13 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.INewWizard;
 import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.PlatformUI;
 
-public class GenerateEntitiesFromSchemaWizard extends Wizard 
-	implements INewWizard  {	
-	
-	public static final String HELP_CONTEXT_ID = JptJpaUiPlugin.instance().getPluginID() + ".GenerateEntitiesFromSchemaWizard"; //$NON-NLS-1$
+public class GenerateEntitiesFromSchemaWizard
+	extends Wizard 
+	implements INewWizard
+{	
+	private static final String HELP_CONTEXT_ID = JptJpaUiPlugin.instance().getPluginID() + ".GenerateEntitiesFromSchemaWizard"; //$NON-NLS-1$
 
 	protected JpaProject jpaProject;
 
@@ -85,7 +85,7 @@ public class GenerateEntitiesFromSchemaWizard extends Wizard
 	protected final ResourceManager resourceManager;
 	
 	public GenerateEntitiesFromSchemaWizard() {
-		this.resourceManager = new LocalResourceManager(JFaceResources.getResources());
+		this.resourceManager = this.buildResourceManager();
 		this.setWindowTitle( JptUiEntityGenMessages.GenerateEntitiesWizard_generateEntities);
 	}
 	
@@ -93,9 +93,21 @@ public class GenerateEntitiesFromSchemaWizard extends Wizard
 		super();
 		this.jpaProject = jpaProject;
 		this.selection = selection;
-		this.resourceManager = new LocalResourceManager(JFaceResources.getResources());
+		this.resourceManager = this.buildResourceManager();
 		this.setWindowTitle( JptUiEntityGenMessages.GenerateEntitiesWizard_generateEntities);
-		this.setDefaultPageImageDescriptor(JptJpaUiPlugin.instance().buildImageDescriptor(JptUiIcons.ENTITY_WIZ_BANNER));
+		this.setDefaultPageImageDescriptor(JptJpaUiImages.ENTITY_BANNER);
+	}
+
+	protected ResourceManager buildResourceManager() {
+		return this.getJpaWorkbench().buildLocalResourceManager();
+	}
+
+	protected JpaWorkbench getJpaWorkbench() {
+		return PlatformTools.getAdapter(this.getWorkbench(), JpaWorkbench.class);
+	}
+	
+	protected IWorkbench getWorkbench() {
+		return PlatformUI.getWorkbench();
 	}
 	
 	@Override
@@ -530,7 +542,10 @@ public class GenerateEntitiesFromSchemaWizard extends Wizard
 	}
 
 	protected PromptJPAProjectWizardPage buildProjectWizardPage() {
-		return new PromptJPAProjectWizardPage(HELP_CONTEXT_ID);
+		return new PromptJPAProjectWizardPage(this.getHelpContextID());
+	}
+	public String getHelpContextID() {
+		return HELP_CONTEXT_ID;
 	}
 
 	protected JpaProject getJpaProject(IProject project) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/PromptJPAProjectWizardPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/PromptJPAProjectWizardPage.java
index 3e811680bb..e4ce990156 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/PromptJPAProjectWizardPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/PromptJPAProjectWizardPage.java
@@ -92,11 +92,16 @@ public class PromptJPAProjectWizardPage extends WizardPage {
 			String projName = item.getText(0);
 			IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
 			JpaProject jpaProj = this.getJpaProject(project);
-			((GenerateEntitiesFromSchemaWizard)this.getWizard()).setJpaProject(jpaProj);
+			this.getWizard().setJpaProject(jpaProj);
 			this.validate();
 		}
 	}
 	
+	@Override
+	public GenerateEntitiesFromSchemaWizard getWizard() {
+		return (GenerateEntitiesFromSchemaWizard) super.getWizard();
+	}
+
 	private void fillJpaProjectList() {
 		this.projTableViewer.setInput(this.getSortedJpaProjectsNames());
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/SelectTableDialog.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/SelectTableDialog.java
index f9b9ee0d97..6c1691316f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/SelectTableDialog.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/SelectTableDialog.java
@@ -12,13 +12,12 @@ package org.eclipse.jpt.jpa.ui.internal.wizards.gen;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.jpt.jpa.db.Schema;
 import org.eclipse.jpt.jpa.db.Table;
-import org.eclipse.jpt.jpa.ui.internal.ImageRepository;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.dialogs.ElementListSelectionDialog;
@@ -31,7 +30,7 @@ public class SelectTableDialog extends ElementListSelectionDialog {
 	public SelectTableDialog(Shell shell, final ResourceManager resourceManager){
 		super(shell, new ILabelProvider(){
 			public Image getImage(Object element) {
-				return ImageRepository.getTableImage(resourceManager);
+				return resourceManager.createImage(JptJpaUiImages.ENTITY_GEN_TABLE);
 			}
 
 			public String getText(Object element) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/TableAssociationsWizardPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/TableAssociationsWizardPage.java
index e428cb96cd..d7a961594e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/TableAssociationsWizardPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/TableAssociationsWizardPage.java
@@ -22,16 +22,17 @@ import org.eclipse.jdt.internal.ui.wizards.dialogfields.DialogField;
 import org.eclipse.jdt.internal.ui.wizards.dialogfields.IStringButtonAdapter;
 import org.eclipse.jdt.internal.ui.wizards.dialogfields.LayoutUtil;
 import org.eclipse.jdt.internal.ui.wizards.dialogfields.StringButtonDialogField;
+import org.eclipse.jface.resource.LocalResourceManager;
 import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.jpt.common.ui.JptCommonUiImages;
 import org.eclipse.jpt.jpa.core.JpaProject;
 import org.eclipse.jpt.jpa.gen.internal.Association;
 import org.eclipse.jpt.jpa.gen.internal.AssociationRole;
 import org.eclipse.jpt.jpa.gen.internal.ORMGenColumn;
 import org.eclipse.jpt.jpa.gen.internal.ORMGenCustomizer;
-import org.eclipse.jpt.jpa.ui.internal.ImageRepository;
 import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StackLayout;
@@ -136,7 +137,7 @@ public class TableAssociationsWizardPage extends WizardPage {
 		
 		createAssociationLink = new Button(c, SWT.NONE);
 		createAssociationLink.setToolTipText( JptUiEntityGenMessages.GenerateEntitiesWizard_assocPage_newAssoc );
-		createAssociationLink.setImage( ImageRepository.getAddButtonImage(this.resourceManager) );
+		createAssociationLink.setImage(this.resourceManager.createImage(JptCommonUiImages.ADD_BUTTON));
 		createAssociationLink.addSelectionListener(new SelectionListener(){
 			public void widgetDefaultSelected(SelectionEvent e) {}	
 			public void widgetSelected(SelectionEvent e) {
@@ -149,7 +150,7 @@ public class TableAssociationsWizardPage extends WizardPage {
 		Color foreground = new Color(deleteAssociationLink.getDisplay(), 0,0,255);
 		deleteAssociationLink.setForeground(foreground);
 		foreground.dispose();
-		deleteAssociationLink.setImage( ImageRepository.getDeleteButtonImage(this.resourceManager));
+		deleteAssociationLink.setImage(this.resourceManager.createImage(JptCommonUiImages.DELETE_BUTTON));
 		deleteAssociationLink.setToolTipText( JptUiEntityGenMessages.GenerateEntitiesWizard_assocPage_delAssoc );
 		deleteAssociationLink.addSelectionListener(new SelectionListener(){
 			public void widgetDefaultSelected(SelectionEvent e) {}	
@@ -265,7 +266,7 @@ public class TableAssociationsWizardPage extends WizardPage {
 		LayoutUtil.setWidthHint(referrerRoleCascadeField.getTextControl(null), maxFieldWidth );
 		Button btn = referrerRoleCascadeField.getChangeControl(null);
 		GridData data = (GridData)btn.getLayoutData();
-		btn.setImage( ImageRepository.getBrowseButtonImage(this.resourceManager) );
+		btn.setImage(this.resourceManager.createImage(JptCommonUiImages.BROWSE_BUTTON));
 		data.horizontalAlignment = SWT.BEGINNING;
 		data.widthHint = 30;
 		btn.setLayoutData(data);
@@ -384,7 +385,7 @@ public class TableAssociationsWizardPage extends WizardPage {
 		int maxFieldWidth = convertWidthInCharsToPixels(40);
 		LayoutUtil.setWidthHint(referencedRoleCascadeField.getTextControl(null), maxFieldWidth );
 		Button btn = referencedRoleCascadeField.getChangeControl(null);
-		btn.setImage( ImageRepository.getBrowseButtonImage(this.resourceManager) );
+		btn.setImage(this.resourceManager.createImage(JptCommonUiImages.BROWSE_BUTTON));
 		GridData data = (GridData)btn.getLayoutData();
 		data.horizontalAlignment = SWT.BEGINNING;
 		data.widthHint = 30;
@@ -743,15 +744,17 @@ public class TableAssociationsWizardPage extends WizardPage {
 	}	
 	
 	private ORMGenCustomizer getCustomizer(){
-		GenerateEntitiesFromSchemaWizard wizard = (GenerateEntitiesFromSchemaWizard) this.getWizard();
-		return wizard.getCustomizer();
+		return this.getWizard().getCustomizer();
 	}
-	
-	
+
+	@Override
+	public GenerateEntitiesFromSchemaWizard getWizard() {
+		return (GenerateEntitiesFromSchemaWizard) super.getWizard();
+	}
+
     @Override
-    public final void performHelp() 
-    {
-        this.getHelpSystem().displayHelp( GenerateEntitiesFromSchemaWizard.HELP_CONTEXT_ID );
+    public final void performHelp() {
+        this.getHelpSystem().displayHelp(this.getWizard().getHelpContextID());
     }
     
 	protected final IWorkbenchHelpSystem getHelpSystem() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/TableFigure.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/TableFigure.java
index 7cf16fa95c..42988e396b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/TableFigure.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/TableFigure.java
@@ -19,7 +19,7 @@ import org.eclipse.draw2d.PositionConstants;
 import org.eclipse.draw2d.geometry.Insets;
 import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.jface.resource.ResourceManager;
-import org.eclipse.jpt.jpa.ui.internal.ImageRepository;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Font;
@@ -50,7 +50,7 @@ public class TableFigure extends Figure
 		setBackgroundColor(this.tableColor);
 		setOpaque(true);
 		setSize(150, 20);
-		Label nameLabel = new Label("", ImageRepository.getTableObjImage(this.resourceManager));
+		Label nameLabel = new Label("", this.resourceManager.createImage(JptJpaUiImages.ENTITY_GEN_TABLE_OBJECT));
 		nameLabel.setFont(this.tableFont);
 		nameLabel.setText(name);
 		nameLabel.setForegroundColor(this.borderColor);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/TablesAndColumnsCustomizationWizardPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/TablesAndColumnsCustomizationWizardPage.java
index 6e31d951eb..2101edd966 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/TablesAndColumnsCustomizationWizardPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/TablesAndColumnsCustomizationWizardPage.java
@@ -12,7 +12,6 @@ package org.eclipse.jpt.jpa.ui.internal.wizards.gen;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.internal.ui.wizards.dialogfields.LayoutUtil;
@@ -33,7 +32,7 @@ import org.eclipse.jpt.jpa.core.JpaProject;
 import org.eclipse.jpt.jpa.gen.internal.ORMGenColumn;
 import org.eclipse.jpt.jpa.gen.internal.ORMGenCustomizer;
 import org.eclipse.jpt.jpa.gen.internal.ORMGenTable;
-import org.eclipse.jpt.jpa.ui.internal.ImageRepository;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StackLayout;
@@ -287,10 +286,14 @@ public class TablesAndColumnsCustomizationWizardPage extends NewTypeWizardPage {
 	}	
 	
 	protected ORMGenCustomizer getCustomizer(){
-		GenerateEntitiesFromSchemaWizard wizard = (GenerateEntitiesFromSchemaWizard) this.getWizard();
-		return wizard.getCustomizer();
+		return this.getWizard().getCustomizer();
 	}
 	
+	@Override
+	public GenerateEntitiesFromSchemaWizard getWizard() {
+		return (GenerateEntitiesFromSchemaWizard) super.getWizard();
+	}
+
 	public boolean isDynamic() {
 		return false;
 	}
@@ -349,12 +352,13 @@ public class TablesAndColumnsCustomizationWizardPage extends NewTypeWizardPage {
 		@Override
 		public Image getImage(Object element) {
 			if( element instanceof ORMGenTable ){
-				return ImageRepository.getTableImage(resourceManager);
-			}else 	if( element instanceof ORMGenColumn ){
+				return resourceManager.createImage(JptJpaUiImages.ENTITY_GEN_TABLE);
+			}
+			if( element instanceof ORMGenColumn ){
 				ORMGenColumn col = ( ORMGenColumn)element;
 				return col.isPrimaryKey() ?
-						ImageRepository.getKeyColumnImage(resourceManager) :
-						ImageRepository.getColumnImage(resourceManager);
+						resourceManager.createImage(JptJpaUiImages.ENTITY_GEN_KEY_COLUMN) :
+						resourceManager.createImage(JptJpaUiImages.ENTITY_GEN_COLUMN);
 			}
 			return null;
 		}
@@ -386,13 +390,11 @@ public class TablesAndColumnsCustomizationWizardPage extends NewTypeWizardPage {
 	}
 
     @Override
-    public final void performHelp() 
-    {
-        this.getHelpSystem().displayHelp( GenerateEntitiesFromSchemaWizard.HELP_CONTEXT_ID );
+    public final void performHelp() {
+        this.getHelpSystem().displayHelp(this.getWizard().getHelpContextID());
     }
 
 	protected final IWorkbenchHelpSystem getHelpSystem() {
 		return PlatformUI.getWorkbench().getHelpSystem();
 	}
-
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/TablesSelectorWizardPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/TablesSelectorWizardPage.java
index 7bff1f262b..5edf2b1a4b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/TablesSelectorWizardPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/TablesSelectorWizardPage.java
@@ -17,7 +17,6 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-
 import org.eclipse.core.resources.WorkspaceJob;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
@@ -43,16 +42,16 @@ import org.eclipse.jface.viewers.ViewerFilter;
 import org.eclipse.jface.viewers.ViewerSorter;
 import org.eclipse.jface.wizard.IWizardPage;
 import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.jpt.common.ui.JptCommonUiImages;
 import org.eclipse.jpt.common.ui.internal.util.SWTUtil;
 import org.eclipse.jpt.common.ui.internal.util.TableLayoutComposite;
-import org.eclipse.jpt.common.utility.internal.collection.CollectionTools;
 import org.eclipse.jpt.common.utility.internal.StringMatcher;
+import org.eclipse.jpt.common.utility.internal.collection.CollectionTools;
 import org.eclipse.jpt.jpa.core.JpaProject;
 import org.eclipse.jpt.jpa.db.ConnectionProfile;
 import org.eclipse.jpt.jpa.db.Schema;
 import org.eclipse.jpt.jpa.db.Table;
 import org.eclipse.jpt.jpa.gen.internal.ORMGenCustomizer;
-import org.eclipse.jpt.jpa.ui.internal.ImageRepository;
 import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
 import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
 import org.eclipse.jpt.jpa.ui.internal.plugin.JptJpaUiPlugin;
@@ -140,9 +139,14 @@ public class TablesSelectorWizardPage extends WizardPage {
 
     @Override
     public final void performHelp() {
-    	this.getHelpSystem().displayHelp( GenerateEntitiesFromSchemaWizard.HELP_CONTEXT_ID);
+    	this.getHelpSystem().displayHelp(this.getWizard().getHelpContextID());
     }
     
+	@Override
+	public GenerateEntitiesFromSchemaWizard getWizard() {
+		return (GenerateEntitiesFromSchemaWizard) super.getWizard();
+	}
+
 	protected final IWorkbenchHelpSystem getHelpSystem() {
 		return PlatformUI.getWorkbench().getHelpSystem();
 	}
@@ -406,7 +410,7 @@ public class TablesSelectorWizardPage extends WizardPage {
 	private Button buildSelectAllButton(Composite parent) {
 		Button button = this.buildSelectionButton(parent,
 			JptUiMessages.General_selectAll,
-			ImageRepository.getSelectAllButtonImage(this.resourceManager));
+			this.resourceManager.createImage(JptCommonUiImages.SELECT_ALL_BUTTON));
 		
 		button.addSelectionListener(this.buildSelectAllSelectionListener());
 		return button;
@@ -415,7 +419,7 @@ public class TablesSelectorWizardPage extends WizardPage {
 	private Button buildDeselectAllButton(Composite parent) {
 		Button button = this.buildSelectionButton(parent,
 			JptUiMessages.General_deselectAll,
-			ImageRepository.getDeselectAllButtonImage(this.resourceManager));
+			this.resourceManager.createImage(JptCommonUiImages.DESELECT_ALL_BUTTON));
 		
 		button.addSelectionListener(this.buildDeselectAllSelectionListener());
 		return button;
@@ -424,7 +428,7 @@ public class TablesSelectorWizardPage extends WizardPage {
 	private Button buildRefreshTablesButton(Composite parent) {
 		Button button = this.buildSelectionButton(parent,
 			JptUiMessages.General_refresh,
-			ImageRepository.getRefreshButtonImage(this.resourceManager));
+			this.resourceManager.createImage(JptCommonUiImages.REFRESH_BUTTON));
 		
 		button.addSelectionListener(this.buildRefreshTablesSelectionListener());
 		return button;
@@ -723,8 +727,7 @@ public class TablesSelectorWizardPage extends WizardPage {
 		}
 
 		//Create the ORMGenCustomizer
-		GenerateEntitiesFromSchemaWizard wizard = (GenerateEntitiesFromSchemaWizard) getWizard();
-		this.customizer = wizard.createORMGenCustomizer(schema);
+		this.customizer = this.getWizard().createORMGenCustomizer(schema);
 
 		if(this.tableTable!=null && this.customizer != null) {
 			this.restoreWizardState();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/orm/MappingFileWizard.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/orm/MappingFileWizard.java
index d84d85e1ef..aa983ed955 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/orm/MappingFileWizard.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/orm/MappingFileWizard.java
@@ -40,7 +40,7 @@ import org.eclipse.jpt.jpa.core.context.persistence.Persistence;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceXml;
 import org.eclipse.jpt.jpa.core.internal.operations.OrmFileCreationDataModelProvider;
-import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
 import org.eclipse.jpt.jpa.ui.internal.plugin.JptJpaUiPlugin;
 import org.eclipse.swt.widgets.Display;
@@ -81,7 +81,7 @@ public class MappingFileWizard extends Wizard
 		super();
 		this.dataModel = dataModel;
 		setWindowTitle(JptUiMessages.MappingFileWizard_title);
-		setDefaultPageImageDescriptor(JptJpaUiPlugin.instance().buildImageDescriptor(JptUiIcons.JPA_FILE_WIZ_BANNER));
+		setDefaultPageImageDescriptor(JptJpaUiImages.JPA_FILE_BANNER);
 	}
 	
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/proj/JpaProjectWizard.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/proj/JpaProjectWizard.java
index 5a251e2237..956521178a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/proj/JpaProjectWizard.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/proj/JpaProjectWizard.java
@@ -11,9 +11,8 @@ package org.eclipse.jpt.jpa.ui.internal.wizards.proj;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
-import org.eclipse.jpt.jpa.ui.internal.plugin.JptJpaUiPlugin;
 import org.eclipse.jpt.jpa.ui.internal.wizards.proj.model.JpaProjectCreationDataModelProvider;
 import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
@@ -37,12 +36,12 @@ public class JpaProjectWizard
 	
 	@Override
 	protected ImageDescriptor getDefaultPageImageDescriptor() {
-		return JptJpaUiPlugin.instance().buildImageDescriptor(JptUiIcons.JPA_WIZ_BANNER);
+		return JptJpaUiImages.JPA_PROJECT_BANNER;
 	}
 	
 	@Override
 	protected IWizardPage createFirstPage() {
-		return new JpaProjectWizardFirstPage(model, "first.page"); //$NON-NLS-1$ 
+		return new JpaProjectWizardFirstPage(this.model, "first.page"); //$NON-NLS-1$ 
 	}
 	
 	@Override
@@ -52,11 +51,11 @@ public class JpaProjectWizard
 	
 	@Override
 	protected IFacetedProjectTemplate getTemplate() {
-		return ProjectFacetsManager.getTemplate("jpt.jpa.template");
+		return ProjectFacetsManager.getTemplate("jpt.jpa.template"); //$NON-NLS-1$
 	}
 	
 	@Override
 	protected String getFinalPerspectiveID() {
-		return "org.eclipse.jpt.ui.jpaPerspective";
+		return "org.eclipse.jpt.ui.jpaPerspective"; //$NON-NLS-1$
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/jpa2/details/java/JavaUiFactory2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/jpa2/details/java/JavaUiFactory2_0.java
index 344199aea0..f40fc6543c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/jpa2/details/java/JavaUiFactory2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/jpa2/details/java/JavaUiFactory2_0.java
@@ -3,12 +3,13 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
+ * 
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.jpa2.details.java;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaElementCollectionMapping2_0;
@@ -17,26 +18,24 @@ import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory;
 import org.eclipse.swt.widgets.Composite;
 
 /**
- * Use {@link JavaUiFactory2_0} to create any java JPA composites
+ * Use a Java UI factory to create any Java JPA composites.
  * <p>
  * Provisional API: This interface is part of an interim API that is still under
  * development and expected to change significantly before reaching stability.
  * It is available at this early stage to solicit feedback from pioneering
  * adopters on the understanding that any code that uses this API will almost
  * certainly be broken (repeatedly) as the API evolves.
- *
- *
+ * 
  * @version 3.0
  * @since 3.0
  */
 public interface JavaUiFactory2_0
 	extends JavaUiFactory
 {	
-
 	JpaComposite createJavaElementCollectionMapping2_0Composite(
-		PropertyValueModel<JavaElementCollectionMapping2_0> subjectHolder,
+		PropertyValueModel<JavaElementCollectionMapping2_0> mappingModel,
 		PropertyValueModel<Boolean> enabledModel,
-		Composite parent,
-		WidgetFactory widgetFactory);
-
-}
-\ No newline at end of file
+		Composite parentComposite,
+		WidgetFactory widgetFactory,
+		ResourceManager resourceManager);
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/jpa2/details/orm/OrmXmlUiFactory2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/jpa2/details/orm/OrmXmlUiFactory2_0.java
index 529bca1974..5e5f537c5a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/jpa2/details/orm/OrmXmlUiFactory2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/jpa2/details/orm/OrmXmlUiFactory2_0.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.jpa2.details.orm;
 
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmElementCollectionMapping2_0;
@@ -17,7 +18,8 @@ import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory;
 import org.eclipse.swt.widgets.Composite;
 
 /**
- * Use {@link OrmXmlUiFactory2_0} to create any ORM JPA composites
+ * Use an <code>orm.xml</code> UI factory to create any <code>orm.xml</code>
+ * JPA composites.
  * <p>
  * Provisional API: This interface is part of an interim API that is still under
  * development and expected to change significantly before reaching stability.
@@ -25,18 +27,16 @@ import org.eclipse.swt.widgets.Composite;
  * adopters on the understanding that any code that uses this API will almost
  * certainly be broken (repeatedly) as the API evolves.
  *
- * @see org.eclipse.jpt.jpa.ui.internal.BaseJpaUiFactory
- *
  * @version 3.0
  * @since 3.0
  */
-public interface OrmXmlUiFactory2_0 extends OrmXmlUiFactory
+public interface OrmXmlUiFactory2_0
+	extends OrmXmlUiFactory
 {
-	
 	JpaComposite createOrmElementCollectionMapping2_0Composite(
-		PropertyValueModel<OrmElementCollectionMapping2_0> subjectHolder,
+		PropertyValueModel<OrmElementCollectionMapping2_0> mappingModel,
 		PropertyValueModel<Boolean> enabledModel,
-		Composite parent,
-		WidgetFactory widgetFactory);
-
+		Composite parentComposite,
+		WidgetFactory widgetFactory,
+		ResourceManager resourceManager);
 }
 \ No newline at end of file
diff --git a/jpa/tests/org.eclipse.jpt.jpa.ui.tests/.classpath b/jpa/tests/org.eclipse.jpt.jpa.ui.tests/.classpath
index 516ebfb5b7..426aa9ef4c 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.ui.tests/.classpath
+++ b/jpa/tests/org.eclipse.jpt.jpa.ui.tests/.classpath
@@ -6,6 +6,7 @@
 		<accessrules>
 			<accessrule kind="accessible" pattern="org/eclipse/jpt/jpa/ui/**"/>
 			<accessrule kind="accessible" pattern="org/eclipse/jpt/jpa/core/**"/>
+			<accessrule kind="accessible" pattern="org/eclipse/jpt/common/ui/**"/>
 			<accessrule kind="accessible" pattern="org/eclipse/jpt/common/core/**"/>
 			<accessrule kind="accessible" pattern="org/eclipse/jpt/common/utility/**"/>
 		</accessrules>
diff --git a/jpa/tests/org.eclipse.jpt.jpa.ui.tests/META-INF/MANIFEST.MF b/jpa/tests/org.eclipse.jpt.jpa.ui.tests/META-INF/MANIFEST.MF
index ac7a73df14..3739cedb72 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.ui.tests/META-INF/MANIFEST.MF
+++ b/jpa/tests/org.eclipse.jpt.jpa.ui.tests/META-INF/MANIFEST.MF
@@ -13,6 +13,7 @@ Require-Bundle:
  org.eclipse.core.runtime,
  org.eclipse.jface,
  org.eclipse.jpt.common.core.tests,
+ org.eclipse.jpt.common.ui.tests,
  org.eclipse.jpt.jpa.core.tests,
  org.eclipse.jpt.jpa.core.tests.extension.resource,
  org.eclipse.jpt.common.utility,
diff --git a/jpa/tests/org.eclipse.jpt.jpa.ui.tests/src/org/eclipse/jpt/jpa/ui/tests/internal/JptJpaUiTests.java b/jpa/tests/org.eclipse.jpt.jpa.ui.tests/src/org/eclipse/jpt/jpa/ui/tests/internal/JptJpaUiTests.java
index 2ccc77dadc..f9b81646b1 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.ui.tests/src/org/eclipse/jpt/jpa/ui/tests/internal/JptJpaUiTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.ui.tests/src/org/eclipse/jpt/jpa/ui/tests/internal/JptJpaUiTests.java
@@ -12,7 +12,9 @@ package org.eclipse.jpt.jpa.ui.tests.internal;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.eclipse.jpt.common.core.tests.BundleActivatorTest;
+import org.eclipse.jpt.common.ui.tests.ImageDescriptorTest;
 import org.eclipse.jpt.jpa.ui.JpaPlatformUi;
+import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 import org.eclipse.jpt.jpa.ui.tests.internal.platform.JptJpaUiPlatformTests;
 
 // TODO we need to add BundleActivatorTests for:
@@ -26,6 +28,7 @@ public class JptJpaUiTests {
 		TestSuite suite = new TestSuite(JptJpaUiTests.class.getPackage().getName());
 		suite.addTest(JptJpaUiPlatformTests.suite());
 		suite.addTest(new BundleActivatorTest(JpaPlatformUi.class));
+		suite.addTest(new ImageDescriptorTest(JptJpaUiImages.class));
 		return suite;
 	}
author	Brian Vosburgh	2012-12-07 16:29:32 +0000
committer	Brian Vosburgh	2012-12-07 16:54:08 +0000
commit	1e389f86244bbe4e970b7df05f27a1bcee415f13 (patch)
tree	62f5d3bdae0deba8268f6feacdb75d48383e54e0
parent	931700a7d41a409b97fe68d1209b8022e8504525 (diff)
download	webtools.dali-1e389f86244bbe4e970b7df05f27a1bcee415f13.tar.gz webtools.dali-1e389f86244bbe4e970b7df05f27a1bcee415f13.tar.xz webtools.dali-1e389f86244bbe4e970b7df05f27a1bcee415f13.zip