cleaning up ItemLabelProviders

7 files changed, 36 insertions, 29 deletions

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbContextRootItemLabelProvider.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbContextRootItemLabelProvider.java
index 8b6f394555..1fa5c4e31d 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbContextRootItemLabelProvider.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbContextRootItemLabelProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2010  Oracle. All rights reserved.
+ *  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
@@ -31,8 +31,8 @@ public class JaxbContextRootItemLabelProvider
 	
 	
 	@Override
-	public JaxbContextRoot model() {
-		return (JaxbContextRoot) super.model();
+	public JaxbContextRoot getModel() {
+		return (JaxbContextRoot) super.getModel();
 	}
 	
 	@Override
@@ -47,8 +47,10 @@ public class JaxbContextRootItemLabelProvider
 	
 	@Override
 	protected PropertyValueModel<String> buildDescriptionModel() {
-		return new StaticPropertyValueModel<String>(
-				JptJaxbUiMessages.JaxbContent_label
-						+ " - " + model().getResource().getFullPath().makeRelative());
+		StringBuilder sb = new StringBuilder();
+		sb.append(JptJaxbUiMessages.JaxbContent_label);
+		sb.append(" - ");  //$NON-NLS-1$
+		sb.append(getModel().getResource().getFullPath().makeRelative());
+		return new StaticPropertyValueModel<String>(sb.toString());
 	}
 }
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbEnumConstantItemLabelProvider.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbEnumConstantItemLabelProvider.java
index 5163dae4ce..0a839f0d08 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbEnumConstantItemLabelProvider.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbEnumConstantItemLabelProvider.java
@@ -30,8 +30,8 @@ public class JaxbEnumConstantItemLabelProvider
 	
 	
 	@Override
-	public JaxbEnumConstant model() {
-		return (JaxbEnumConstant) super.model();
+	public JaxbEnumConstant getModel() {
+		return (JaxbEnumConstant) super.getModel();
 	}
 	
 	@Override
@@ -41,11 +41,11 @@ public class JaxbEnumConstantItemLabelProvider
 	
 	@Override
 	protected PropertyValueModel<String> buildTextModel() {
-		return new StaticPropertyValueModel<String>(model().getName());
+		return new StaticPropertyValueModel<String>(getModel().getName());
 	}
 	
 	@Override
 	protected PropertyValueModel<String> buildDescriptionModel() {
-		return new StaticPropertyValueModel<String>(model().getName());
+		return new StaticPropertyValueModel<String>(getModel().getName());
 	}
 }
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbPackageItemLabelProvider.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbPackageItemLabelProvider.java
index b0ba82cbf4..a275cb7634 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbPackageItemLabelProvider.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbPackageItemLabelProvider.java
@@ -28,7 +28,10 @@ public class JaxbPackageItemLabelProvider
 		super(jaxbPackage, labelProvider);
 	}
 	
-	
+	@Override
+	public JaxbPackage getModel() {
+		return (JaxbPackage) super.getModel();
+	}
 	
 	@Override
 	protected PropertyValueModel<Image> buildImageModel() {
@@ -37,13 +40,15 @@ public class JaxbPackageItemLabelProvider
 	
 	@Override
 	protected PropertyValueModel<String> buildTextModel() {
-		return new StaticPropertyValueModel(((JaxbPackage) model()).getName());
+		return new StaticPropertyValueModel<String>(getModel().getName());
 	}
 	
 	@Override
 	protected PropertyValueModel<String> buildDescriptionModel() {
-		JaxbPackage jaxbPackage = (JaxbPackage) model();
-		return new StaticPropertyValueModel(
-				jaxbPackage.getName() + " - " + jaxbPackage.getResource().getFullPath().makeRelative());
+		StringBuilder sb = new StringBuilder();
+		sb.append(getModel().getName());
+		sb.append(" - ");  //$NON-NLS-1$
+		sb.append(getModel().getResource().getFullPath().makeRelative());
+		return new StaticPropertyValueModel<String>(sb.toString());
 	}
 }
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 16254f6edb..2bbec7003d 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
@@ -30,15 +30,15 @@ public abstract class JaxbPersistentAttributeItemLabelProvider
 	
 	
 	@Override
-	public JaxbPersistentAttribute model() {
-		return (JaxbPersistentAttribute) super.model();
+	public JaxbPersistentAttribute getModel() {
+		return (JaxbPersistentAttribute) super.getModel();
 	}
 	
 	@Override
 	protected PropertyValueModel<Image> buildImageModel() {
 		return new PropertyAspectAdapter<JaxbPersistentAttribute, Image>(
 				new String[] {JaxbPersistentAttribute.DEFAULT_MAPPING_KEY_PROPERTY, JaxbPersistentAttribute.MAPPING_PROPERTY}, 
-				model()) {
+				getModel()) {
 			@Override
 			protected Image buildValue_() {
 				return JaxbMappingImageHelper.imageForAttributeMapping(this.subject.getMappingKey());
@@ -48,11 +48,11 @@ public abstract class JaxbPersistentAttributeItemLabelProvider
 	
 	@Override
 	protected PropertyValueModel<String> buildTextModel() {
-		return new StaticPropertyValueModel<String>(model().getName());
+		return new StaticPropertyValueModel<String>(getModel().getName());
 	}
 	
 	@Override
 	protected PropertyValueModel<String> buildDescriptionModel() {
-		return new StaticPropertyValueModel<String>(model().getName());
+		return new StaticPropertyValueModel<String>(getModel().getName());
 	}
 }
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbPersistentFieldItemLabelProvider.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbPersistentFieldItemLabelProvider.java
index 2893b9e0df..d35c840617 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbPersistentFieldItemLabelProvider.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbPersistentFieldItemLabelProvider.java
@@ -24,8 +24,8 @@ public class JaxbPersistentFieldItemLabelProvider
 	
 	
 	@Override
-	public JaxbPersistentField model() {
-		return (JaxbPersistentField) super.model();
+	public JaxbPersistentField getModel() {
+		return (JaxbPersistentField) super.getModel();
 	}
 
 }
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbPersistentPropertyItemLabelProvider.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbPersistentPropertyItemLabelProvider.java
index 7fa5089486..18702e53d1 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbPersistentPropertyItemLabelProvider.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbPersistentPropertyItemLabelProvider.java
@@ -24,7 +24,7 @@ public class JaxbPersistentPropertyItemLabelProvider
 	
 	
 	@Override
-	public JaxbPersistentProperty model() {
-		return (JaxbPersistentProperty) super.model();
+	public JaxbPersistentProperty getModel() {
+		return (JaxbPersistentProperty) super.getModel();
 	}
 }
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 20dac55e72..c97eb44550 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
@@ -26,21 +26,21 @@ public abstract class JaxbTypeItemLabelProvider
 	}
 	
 	@Override
-	public JaxbType model() {
-		return (JaxbType) super.model();
+	public JaxbType getModel() {
+		return (JaxbType) super.getModel();
 	}
 
 	@Override
 	protected PropertyValueModel<String> buildTextModel() {
-		return new StaticPropertyValueModel<String>(model().getTypeQualifiedName());
+		return new StaticPropertyValueModel<String>(getModel().getTypeQualifiedName());
 	}
 	
 	@Override
 	protected PropertyValueModel<String> buildDescriptionModel() {
 		StringBuilder sb = new StringBuilder();
-		sb.append(model().getFullyQualifiedName());
+		sb.append(getModel().getFullyQualifiedName());
 		sb.append(" - ");  //$NON-NLS-1$
-		sb.append(model().getResource().getFullPath().makeRelative());
+		sb.append(getModel().getResource().getFullPath().makeRelative());
 		return new StaticPropertyValueModel<String>(sb.toString());
 	}
 }