cleaning up ItemLabelProviders

12 files changed, 143 insertions, 72 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jface/JarFileItemLabelProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jface/JarFileItemLabelProvider.java
index 79033cccc8..9bb9e7cdeb 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jface/JarFileItemLabelProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jface/JarFileItemLabelProvider.java
@@ -26,6 +26,10 @@ public class JarFileItemLabelProvider extends AbstractItemLabelProvider
 		super(jarFile, labelProvider);
 	}
 	
+	@Override
+	public JarFile getModel() {
+		return (JarFile) super.getModel();
+	}
 	
 	@Override
 	protected PropertyValueModel<Image> buildImageModel() {
@@ -34,14 +38,15 @@ public class JarFileItemLabelProvider extends AbstractItemLabelProvider
 	
 	@Override
 	protected PropertyValueModel<String> buildTextModel() {
-		return new StaticPropertyValueModel<String>(((JarFile) model()).getResource().getName());
+		return new StaticPropertyValueModel<String>(getModel().getResource().getName());
 	}
 	
 	@Override
 	protected PropertyValueModel<String> buildDescriptionModel() {
-		JarFile jarFile = (JarFile) model();
-		return new StaticPropertyValueModel<String>(
-			jarFile.getResource().getName()
-			+ " - " + jarFile.getResource().getParent().getFullPath().makeRelative().toString());
+		StringBuilder sb = new StringBuilder();
+		sb.append(getModel().getResource().getName());
+		sb.append(" - ");  //$NON-NLS-1$
+		sb.append(getModel().getResource().getParent().getFullPath().makeRelative());
+		return new StaticPropertyValueModel<String>(sb.toString());
 	}
 }
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 f2b488aca9..4df9c503b2 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
+ * 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.
@@ -26,11 +26,15 @@ public class ClassRefItemLabelProvider extends AbstractItemLabelProvider
 		super(classRef, labelProvider);
 	}
 	
-	
+	@Override
+	public ClassRef getModel() {
+		return (ClassRef) super.getModel();
+	}
+
 	@Override
 	protected PropertyValueModel<Image> buildImageModel() {
 		Image image;
-		if (((ClassRef) model()).isVirtual()) {
+		if (getModel().isVirtual()) {
 			image = JptUiIcons.ghost(JptUiIcons.CLASS_REF);
 		}
 		else {
@@ -41,10 +45,10 @@ public class ClassRefItemLabelProvider extends AbstractItemLabelProvider
 	
 	@Override
 	protected PropertyValueModel<String> buildTextModel() {
-		return new PropertyAspectAdapter<ClassRef, String>(ClassRef.CLASS_NAME_PROPERTY, (ClassRef) model()) {
+		return new PropertyAspectAdapter<ClassRef, String>(ClassRef.CLASS_NAME_PROPERTY, getModel()) {
 			 @Override
 			protected String buildValue_() {
-				return subject.getClassName();
+				return this.subject.getClassName();
 			}
 		};
 	}
@@ -52,12 +56,16 @@ public class ClassRefItemLabelProvider extends AbstractItemLabelProvider
 	@Override
 	protected PropertyValueModel<String> buildDescriptionModel() {
 		//TODO also need to listen to the PersistenceUnit name property since this value depends on it
-		return new PropertyAspectAdapter<ClassRef, String>(ClassRef.CLASS_NAME_PROPERTY, (ClassRef) model()) {
+		return new PropertyAspectAdapter<ClassRef, String>(ClassRef.CLASS_NAME_PROPERTY, getModel()) {
 			@Override
 			protected String buildValue_() {
-				return subject.getPersistenceUnit().getName() 
-				+ "/\"" + subject.getClassName()
-				+ "\" - " + subject.getResource().getFullPath().makeRelative();
+				StringBuilder sb = new StringBuilder();
+				sb.append(this.subject.getPersistenceUnit().getName());
+				sb.append("/\"");  //$NON-NLS-1$
+				sb.append(this.subject.getClassName());
+				sb.append("\" - "); //$NON-NLS-1$
+				sb.append(this.subject.getResource().getFullPath().makeRelative());
+				return sb.toString();
 			}
 		};
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/EntityMappingsItemLabelProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/EntityMappingsItemLabelProvider.java
index 0d28953cc3..186cead056 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/EntityMappingsItemLabelProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/EntityMappingsItemLabelProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
+ * 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.
@@ -26,6 +26,10 @@ public class EntityMappingsItemLabelProvider extends AbstractItemLabelProvider
 		super(entityMappings, labelProvider);
 	}
 	
+	@Override
+	public EntityMappings getModel() {
+		return (EntityMappings) super.getModel();
+	}
 	
 	@Override
 	protected PropertyValueModel<Image> buildImageModel() {
@@ -41,8 +45,10 @@ public class EntityMappingsItemLabelProvider extends AbstractItemLabelProvider
 	
 	@Override
 	protected PropertyValueModel<String> buildDescriptionModel() {
-		return new StaticPropertyValueModel<String>(
-			JptUiMessages.OrmItemLabelProviderFactory_entityMappingsLabel
-				+ " - " + ((EntityMappings) model()).getResource().getFullPath().makeRelative());
+		StringBuilder sb = new StringBuilder();
+		sb.append(JptUiMessages.OrmItemLabelProviderFactory_entityMappingsLabel);
+		sb.append(" - ");  //$NON-NLS-1$
+		sb.append(getModel().getResource().getFullPath().makeRelative());
+		return new StaticPropertyValueModel<String>(sb.toString());
 	}
 }
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 c21c58fb9b..13e65e9c8a 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2009  Oracle. 
+ *  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 
@@ -27,13 +27,17 @@ public class JarFileRefItemLabelProvider extends AbstractItemLabelProvider
 		super(jarFileRef, labelProvider);
 	}
 	
+	@Override
+	public JarFileRef getModel() {
+		return (JarFileRef) super.getModel();
+	}
 	
 	@Override
 	protected PropertyValueModel<String> buildTextModel() {
-		return new PropertyAspectAdapter<JarFileRef, String>(JarFileRef.FILE_NAME_PROPERTY, (JarFileRef) model()) {
+		return new PropertyAspectAdapter<JarFileRef, String>(JarFileRef.FILE_NAME_PROPERTY, getModel()) {
 			 @Override
 			protected String buildValue_() {
-				return subject.getFileName();
+				return this.subject.getFileName();
 			}
 		};
 	}
@@ -45,12 +49,16 @@ public class JarFileRefItemLabelProvider extends AbstractItemLabelProvider
 	
 	@Override
 	protected PropertyValueModel<String> buildDescriptionModel() {
-		return new PropertyAspectAdapter<JarFileRef, String>(JarFileRef.FILE_NAME_PROPERTY, (JarFileRef) model()) {
+		return new PropertyAspectAdapter<JarFileRef, String>(JarFileRef.FILE_NAME_PROPERTY, getModel()) {
 			@Override
 			protected String buildValue_() {
-				return subject.getPersistenceUnit().getName() 
-				+ "/\"" + subject.getFileName()
-				+ "\" - " + subject.getResource().getFullPath().makeRelative();
+				StringBuilder sb = new StringBuilder();
+				sb.append(this.subject.getPersistenceUnit().getName());
+				sb.append("/\"");  //$NON-NLS-1$
+				sb.append(this.subject.getFileName());
+				sb.append("\" - "); //$NON-NLS-1$
+				sb.append(this.subject.getResource().getFullPath().makeRelative());
+				return sb.toString();
 			}
 		};
 	}
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 bf1af296e0..5694795ac4 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
@@ -26,11 +26,15 @@ public class MappingFileRefItemLabelProvider extends AbstractItemLabelProvider
 		super(mappingFileRef, labelProvider);
 	}
 	
+	@Override
+	public MappingFileRef getModel() {
+		return (MappingFileRef) super.getModel();
+	}
 	
 	@Override
 	protected PropertyValueModel<Image> buildImageModel() {
 		Image image;
-		if (((MappingFileRef) model()).isImplied()) {
+		if (getModel().isImplied()) {
 			image = JptUiIcons.ghost(JptUiIcons.MAPPING_FILE_REF);
 		}
 		else {
@@ -41,22 +45,26 @@ public class MappingFileRefItemLabelProvider extends AbstractItemLabelProvider
 	
 	@Override
 	protected PropertyValueModel<String> buildTextModel() {
-		return new PropertyAspectAdapter<MappingFileRef, String>(MappingFileRef.FILE_NAME_PROPERTY, (MappingFileRef) model()) {
+		return new PropertyAspectAdapter<MappingFileRef, String>(MappingFileRef.FILE_NAME_PROPERTY, getModel()) {
 			 @Override
 			protected String buildValue_() {
-				return subject.getFileName();
+				return this.subject.getFileName();
 			}
 		};
 	}
 	
 	@Override
 	protected PropertyValueModel<String> buildDescriptionModel() {
-		return new PropertyAspectAdapter<MappingFileRef, String>(MappingFileRef.FILE_NAME_PROPERTY, (MappingFileRef) model()) {
+		return new PropertyAspectAdapter<MappingFileRef, String>(MappingFileRef.FILE_NAME_PROPERTY, getModel()) {
 			@Override
 			protected String buildValue_() {
-				return subject.getPersistenceUnit().getName() 
-				+ "/\"" + subject.getFileName() + "\""
-				+ " - " + subject.getResource().getFullPath().makeRelative();
+				StringBuilder sb = new StringBuilder();
+				sb.append(this.subject.getPersistenceUnit().getName());
+				sb.append("/\"");  //$NON-NLS-1$
+				sb.append(this.subject.getFileName());
+				sb.append("\" - "); //$NON-NLS-1$
+				sb.append(this.subject.getResource().getFullPath().makeRelative());
+				return sb.toString();
 			}
 		};
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/OrmXmlItemLabelProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/OrmXmlItemLabelProvider.java
index 2593c4dadb..0cf2cb69dd 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/OrmXmlItemLabelProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/OrmXmlItemLabelProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
+ * 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.
@@ -25,6 +25,10 @@ public class OrmXmlItemLabelProvider extends AbstractItemLabelProvider
 		super(ormXml, labelProvider);
 	}
 	
+	@Override
+	public OrmXml getModel() {
+		return (OrmXml) super.getModel();
+	}
 	
 	@Override
 	protected PropertyValueModel<Image> buildImageModel() {
@@ -33,14 +37,15 @@ public class OrmXmlItemLabelProvider extends AbstractItemLabelProvider
 	
 	@Override
 	protected PropertyValueModel<String> buildTextModel() {
-		return new StaticPropertyValueModel<String>(((OrmXml) model()).getResource().getName());
+		return new StaticPropertyValueModel<String>(getModel().getResource().getName());
 	}
 	
 	@Override
 	protected PropertyValueModel<String> buildDescriptionModel() {
-		OrmXml ormXml = (OrmXml) model();
-		return new StaticPropertyValueModel<String>(
-			ormXml.getResource().getName()
-			+ " - " + ormXml.getResource().getParent().getFullPath().makeRelative().toString());
+		StringBuilder sb = new StringBuilder();
+		sb.append(getModel().getResource().getName());
+		sb.append(" - ");  //$NON-NLS-1$
+		sb.append(getModel().getResource().getParent().getFullPath().makeRelative());
+		return new StaticPropertyValueModel<String>(sb.toString());
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/PersistenceItemLabelProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/PersistenceItemLabelProvider.java
index c3706213e7..1c757607d1 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/PersistenceItemLabelProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/PersistenceItemLabelProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
+ * 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.
@@ -26,7 +26,11 @@ public class PersistenceItemLabelProvider extends AbstractItemLabelProvider
 		super(persistence, labelProvider);
 	}
 	
-	
+	@Override
+	public Persistence getModel() {
+		return (Persistence) super.getModel();
+	}
+
 	@Override
 	protected PropertyValueModel<Image> buildImageModel() {
 		return new StaticPropertyValueModel<Image>(JptJpaUiPlugin.getImage(JptUiIcons.PERSISTENCE));
@@ -40,8 +44,10 @@ public class PersistenceItemLabelProvider extends AbstractItemLabelProvider
 	
 	@Override
 	protected PropertyValueModel<String> buildDescriptionModel() {
-		return new StaticPropertyValueModel<String>(
-			JptUiMessages.PersistenceItemLabelProviderFactory_persistenceLabel
-				+ " - " + ((Persistence) model()).getResource().getFullPath().makeRelative());
+		StringBuilder sb = new StringBuilder();
+		sb.append(JptUiMessages.PersistenceItemLabelProviderFactory_persistenceLabel);
+		sb.append(" - ");  //$NON-NLS-1$
+		sb.append(getModel().getResource().getFullPath().makeRelative());
+		return new StaticPropertyValueModel<String>(sb.toString());
 	}
 }
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 eaa8423760..3f07076449 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
+ * 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.
@@ -26,7 +26,11 @@ public class PersistenceUnitItemLabelProvider extends AbstractItemLabelProvider
 		super(persistenceUnit, labelProvider);
 	}
 	
-	
+	@Override
+	public PersistenceUnit getModel() {
+		return (PersistenceUnit) super.getModel();
+	}
+
 	@Override
 	protected PropertyValueModel<Image> buildImageModel() {
 		return new StaticPropertyValueModel<Image>(JptJpaUiPlugin.getImage(JptUiIcons.PERSISTENCE_UNIT));
@@ -34,21 +38,24 @@ public class PersistenceUnitItemLabelProvider extends AbstractItemLabelProvider
 	
 	@Override
 	protected PropertyValueModel<String> buildTextModel() {
-		return new PropertyAspectAdapter<PersistenceUnit, String>(PersistenceUnit.NAME_PROPERTY, (PersistenceUnit) model()) {
+		return new PropertyAspectAdapter<PersistenceUnit, String>(PersistenceUnit.NAME_PROPERTY, getModel()) {
 			 @Override
 			protected String buildValue_() {
-				return subject.getName();
+				return this.subject.getName();
 			}
 		};
 	}
 	
 	@Override
 	protected PropertyValueModel<String> buildDescriptionModel() {
-		return new PropertyAspectAdapter<PersistenceUnit, String>(PersistenceUnit.NAME_PROPERTY, (PersistenceUnit) model()) {
+		return new PropertyAspectAdapter<PersistenceUnit, String>(PersistenceUnit.NAME_PROPERTY, getModel()) {
 			@Override
 			protected String buildValue_() {
-				return subject.getName()
-				+ " - " + subject.getResource().getFullPath().makeRelative();
+				StringBuilder sb = new StringBuilder();
+				sb.append(this.subject.getName());
+				sb.append(" - ");  //$NON-NLS-1$
+				sb.append(this.subject.getResource().getFullPath().makeRelative());
+				return sb.toString();
 			}
 		};
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/PersistenceXmlItemLabelProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/PersistenceXmlItemLabelProvider.java
index 3e6220ca59..c8c8b9a2fd 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/PersistenceXmlItemLabelProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/PersistenceXmlItemLabelProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
+ * 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.
@@ -25,7 +25,11 @@ public class PersistenceXmlItemLabelProvider extends AbstractItemLabelProvider
 		super(persistenceXml, labelProvider);
 	}
 	
-	
+	@Override
+	public PersistenceXml getModel() {
+		return (PersistenceXml) super.getModel();
+	}
+
 	@Override
 	protected PropertyValueModel<Image> buildImageModel() {
 		return new StaticPropertyValueModel<Image>(JptJpaUiPlugin.getImage(JptUiIcons.JPA_FILE));
@@ -33,14 +37,15 @@ public class PersistenceXmlItemLabelProvider extends AbstractItemLabelProvider
 	
 	@Override
 	protected PropertyValueModel<String> buildTextModel() {
-		return new StaticPropertyValueModel<String>(((PersistenceXml) model()).getResource().getName());
+		return new StaticPropertyValueModel<String>(getModel().getResource().getName());
 	}
 	
 	@Override
 	protected PropertyValueModel<String> buildDescriptionModel() {
-		PersistenceXml persistenceXml = (PersistenceXml) model();
-		return new StaticPropertyValueModel<String>(
-			persistenceXml.getResource().getName()
-			+ " - " + persistenceXml.getResource().getParent().getFullPath().makeRelative().toString());
+		StringBuilder sb = new StringBuilder();
+		sb.append(getModel().getResource().getName());
+		sb.append(" - ");  //$NON-NLS-1$
+		sb.append(getModel().getResource().getParent().getFullPath().makeRelative());
+		return new StaticPropertyValueModel<String>(sb.toString());
 	}
 }
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 213a1b1c86..874c05c1ae 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
@@ -27,16 +27,19 @@ public class PersistentAttributeItemLabelProvider
 		super(persistentAttribute, labelProvider);
 	}
 	
-	
+	@Override
+	public ReadOnlyPersistentAttribute getModel() {
+		return (ReadOnlyPersistentAttribute) super.getModel();
+	}
 	
 	@Override
 	protected PropertyValueModel<Image> buildImageModel() {
 		return new PropertyAspectAdapter<ReadOnlyPersistentAttribute, Image>(
 				new String[] {ReadOnlyPersistentAttribute.DEFAULT_MAPPING_KEY_PROPERTY, ReadOnlyPersistentAttribute.MAPPING_PROPERTY}, 
-				(ReadOnlyPersistentAttribute) model()) {
+				getModel()) {
 			@Override
 			protected Image buildValue_() {
-				if (((ReadOnlyPersistentAttribute) model()).isVirtual()) {
+				if (getModel().isVirtual()) {
 					return JptUiIcons.ghost(JpaMappingImageHelper.iconKeyForAttributeMapping(this.subject.getMappingKey()));
 				}
 				return JpaMappingImageHelper.imageForAttributeMapping(this.subject.getMappingKey());
@@ -46,17 +49,17 @@ public class PersistentAttributeItemLabelProvider
 	
 	@Override
 	protected PropertyValueModel<String> buildTextModel() {
-		return new PropertyAspectAdapter<ReadOnlyPersistentAttribute, String>(ReadOnlyPersistentAttribute.NAME_PROPERTY, (ReadOnlyPersistentAttribute) model()) {
+		return new PropertyAspectAdapter<ReadOnlyPersistentAttribute, String>(ReadOnlyPersistentAttribute.NAME_PROPERTY, getModel()) {
 			@Override
 			protected String buildValue_() {
-				return subject.getName();
+				return this.subject.getName();
 			}
 		};
 	}
 	
 	@Override
 	protected PropertyValueModel<String> buildDescriptionModel() {
-		return new PropertyAspectAdapter<ReadOnlyPersistentAttribute, String>(ReadOnlyPersistentAttribute.NAME_PROPERTY, (ReadOnlyPersistentAttribute) model()) {
+		return new PropertyAspectAdapter<ReadOnlyPersistentAttribute, String>(ReadOnlyPersistentAttribute.NAME_PROPERTY, getModel()) {
 			@Override
 			protected String buildValue_() {
 				StringBuilder sb = new StringBuilder();
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 5541917411..91fbab1338 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
+ * 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.
@@ -25,30 +25,34 @@ public class PersistentTypeItemLabelProvider extends AbstractItemLabelProvider
 		super(persistentType, labelProvider);
 	}
 	
+	@Override
+	public PersistentType getModel() {
+		return (PersistentType) super.getModel();
+	}
 	
 	@Override
 	protected PropertyValueModel<Image> buildImageModel() {
-		return new PropertyAspectAdapter<PersistentType, Image>(PersistentType.MAPPING_PROPERTY, (PersistentType) model()) {
+		return new PropertyAspectAdapter<PersistentType, Image>(PersistentType.MAPPING_PROPERTY, getModel()) {
 			@Override
 			protected Image buildValue_() {
-				return JpaMappingImageHelper.imageForTypeMapping(subject.getMappingKey());
+				return JpaMappingImageHelper.imageForTypeMapping(this.subject.getMappingKey());
 			}
 		};
 	}
 	
 	@Override
 	protected PropertyValueModel<String> buildTextModel() {
-		return new PropertyAspectAdapter<PersistentType, String>(PersistentType.NAME_PROPERTY, (PersistentType) model()) {
+		return new PropertyAspectAdapter<PersistentType, String>(PersistentType.NAME_PROPERTY, getModel()) {
 			@Override
 			protected String buildValue_() {
-				return subject.getSimpleName();
+				return this.subject.getSimpleName();
 			}
 		};
 	}
 	
 	@Override
 	protected PropertyValueModel<String> buildDescriptionModel() {
-		return new PropertyAspectAdapter<PersistentType, String>(PersistentType.NAME_PROPERTY, (PersistentType) model()) {
+		return new PropertyAspectAdapter<PersistentType, String>(PersistentType.NAME_PROPERTY, getModel()) {
 			@Override
 			protected String buildValue_() {
 				StringBuilder sb = new StringBuilder();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/RootContextItemLabelProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/RootContextItemLabelProvider.java
index d00996f6c8..306a90a75e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/RootContextItemLabelProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/RootContextItemLabelProvider.java
@@ -26,6 +26,10 @@ public class RootContextItemLabelProvider extends AbstractItemLabelProvider
 		super(rootContextNode, labelProvider);
 	}
 	
+	@Override
+	public JpaRootContextNode getModel() {
+		return (JpaRootContextNode) super.getModel();
+	}
 	
 	@Override
 	protected PropertyValueModel<Image> buildImageModel() {
@@ -39,8 +43,10 @@ public class RootContextItemLabelProvider extends AbstractItemLabelProvider
 	
 	@Override
 	protected PropertyValueModel<String> buildDescriptionModel() {
-		return new StaticPropertyValueModel<String>(
-			JptUiMessages.JpaContent_label
-				+ " - " + ((JpaRootContextNode) model()).getResource().getFullPath().makeRelative());
+		StringBuilder sb = new StringBuilder();
+		sb.append(JptUiMessages.JpaContent_label);
+		sb.append(" - ");  //$NON-NLS-1$
+		sb.append(getModel().getResource().getFullPath().makeRelative());
+		return new StaticPropertyValueModel<String>(sb.toString());
 	}
 }