renamed model() to getModel() and treeContentProvider() to getTreeContentProvider()

15 files changed, 93 insertions, 94 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistencexml/details/EclipseLinkNavigatorItemContentProviderFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistencexml/details/EclipseLinkNavigatorItemContentProviderFactory.java
index 913ca474c6..0a5249b4b4 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistencexml/details/EclipseLinkNavigatorItemContentProviderFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistencexml/details/EclipseLinkNavigatorItemContentProviderFactory.java
@@ -56,8 +56,8 @@ public class EclipseLinkNavigatorItemContentProviderFactory
 		}
 		
 		@Override
-		public EclipseLinkPersistenceUnit model() {
-			return (EclipseLinkPersistenceUnit) super.model();
+		public EclipseLinkPersistenceUnit getModel() {
+			return (EclipseLinkPersistenceUnit) super.getModel();
 		}
 		
 		@Override
@@ -75,7 +75,7 @@ public class EclipseLinkNavigatorItemContentProviderFactory
 				new PropertyAspectAdapter<MappingFileRef, MappingFile>(
 						new PropertyAspectAdapter<EclipseLinkPersistenceUnit, MappingFileRef>(
 								EclipseLinkPersistenceUnit.IMPLIED_ECLIPSELINK_MAPPING_FILE_REF_PROPERTY,
-								model()) {
+								getModel()) {
 							@Override
 							protected MappingFileRef buildValue_() {
 								return subject.getImpliedEclipseLinkMappingFileRef();
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/structure/EclipseLinkPersistenceItemContentProviderFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/structure/EclipseLinkPersistenceItemContentProviderFactory.java
index 7b5019588c..8cf25c96ef 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/structure/EclipseLinkPersistenceItemContentProviderFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/structure/EclipseLinkPersistenceItemContentProviderFactory.java
@@ -51,8 +51,8 @@ public class EclipseLinkPersistenceItemContentProviderFactory
 		}
 		
 		@Override
-		public EclipseLinkPersistenceUnit model() {
-			return (EclipseLinkPersistenceUnit) super.model();
+		public EclipseLinkPersistenceUnit getModel() {
+			return (EclipseLinkPersistenceUnit) super.getModel();
 		}
 		
 		@Override
@@ -60,7 +60,7 @@ public class EclipseLinkPersistenceItemContentProviderFactory
 			ListValueModel<MappingFileRef> specifiedMappingFileLvm = 
 				new ListAspectAdapter<PersistenceUnit, MappingFileRef>(
 						PersistenceUnit.SPECIFIED_MAPPING_FILE_REFS_LIST,
-						model()) {
+						getModel()) {
 					@Override
 					protected ListIterator<MappingFileRef> listIterator_() {
 						return subject.specifiedMappingFileRefs();
@@ -75,7 +75,7 @@ public class EclipseLinkPersistenceItemContentProviderFactory
 				new PropertyListValueModelAdapter<MappingFileRef>(
 					new PropertyAspectAdapter<PersistenceUnit, MappingFileRef>(
 							PersistenceUnit.IMPLIED_MAPPING_FILE_REF_PROPERTY,
-							model()) {
+							getModel()) {
 						@Override
 						protected MappingFileRef buildValue_() {
 							return subject.getImpliedMappingFileRef();
@@ -86,7 +86,7 @@ public class EclipseLinkPersistenceItemContentProviderFactory
 				new PropertyListValueModelAdapter<MappingFileRef>(
 					new PropertyAspectAdapter<EclipseLinkPersistenceUnit, MappingFileRef>(
 							EclipseLinkPersistenceUnit.IMPLIED_ECLIPSELINK_MAPPING_FILE_REF_PROPERTY,
-							model()) {
+							getModel()) {
 						@Override
 						protected MappingFileRef buildValue_() {
 							return subject.getImpliedEclipseLinkMappingFileRef();
@@ -96,7 +96,7 @@ public class EclipseLinkPersistenceItemContentProviderFactory
 			ListValueModel<ClassRef> specifiedClassLvm = 
 				new ListAspectAdapter<PersistenceUnit, ClassRef>(
 						PersistenceUnit.SPECIFIED_CLASS_REFS_LIST,
-						model()) {
+						getModel()) {
 					@Override
 					protected ListIterator<ClassRef> listIterator_() {
 						return subject.specifiedClassRefs();
@@ -109,7 +109,7 @@ public class EclipseLinkPersistenceItemContentProviderFactory
 			ListValueModel<ClassRef> impliedClassLvm = 
 				new ListAspectAdapter<PersistenceUnit, ClassRef>(
 						PersistenceUnit.IMPLIED_CLASS_REFS_LIST,
-						model()) {
+						getModel()) {
 					@Override
 					protected ListIterator<ClassRef> listIterator_() {
 						return subject.impliedClassRefs();
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/AbstractTreeItemContentProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/AbstractTreeItemContentProvider.java
index 885532ac4b..eb1cfbc0d2 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/AbstractTreeItemContentProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/AbstractTreeItemContentProvider.java
@@ -67,36 +67,36 @@ public abstract class AbstractTreeItemContentProvider<E>
 	protected ListChangeListener buildChildrenListener() {
 		return new ListChangeListener() {
 			public void itemsAdded(ListChangeEvent event) {
-				treeContentProvider().updateContent(model());
+				getTreeContentProvider().updateContent(getModel());
 			}
 			
 			public void itemsMoved(ListChangeEvent event) {
-				treeContentProvider().updateContent(model());
+				getTreeContentProvider().updateContent(getModel());
 			}
 			
 			public void itemsRemoved(ListChangeEvent event) {
-				treeContentProvider().updateContent(model());
+				getTreeContentProvider().updateContent(getModel());
 				for (Iterator<?> stream = event.items(); stream.hasNext(); ) {
-					treeContentProvider().dispose(stream.next());
+					getTreeContentProvider().dispose(stream.next());
 				}
 			}
 			
 			public void itemsReplaced(ListChangeEvent event) {
-				treeContentProvider().updateContent(model());
+				getTreeContentProvider().updateContent(getModel());
 				for (Iterator<?> stream = event.replacedItems(); stream.hasNext(); ) {
-					treeContentProvider().dispose(stream.next());
+					getTreeContentProvider().dispose(stream.next());
 				}
 			}
 			
 			public void listChanged(ListChangeEvent event) {
-				treeContentProvider().updateContent(model());
+				getTreeContentProvider().updateContent(getModel());
 				// in the case of a list changed event, we don't have 
 				// access to the removed objects, so we can't dispose them.
 				// keep a watch on this to see if this becomes a problem.
 			}
 			
 			public void listCleared(ListChangeEvent event) {
-				treeContentProvider().updateContent(model());
+				getTreeContentProvider().updateContent(getModel());
 				// in the case of a list cleared event, we don't have 
 				// access to the removed objects, so we can't dispose them.
 				// keep a watch on this to see if this becomes a problem.
@@ -108,20 +108,19 @@ public abstract class AbstractTreeItemContentProvider<E>
 	 * Return the children model
 	 * (lazy and just-in-time initialized)
 	 */
-	protected ListValueModel<E> childrenModel() {
-		if (childrenModel == null) {
-			childrenModel = buildChildrenModel();
+	protected ListValueModel<E> getChildrenModel() {
+		if (this.childrenModel == null) {
+			this.childrenModel = buildChildrenModel();
 			engageChildren();
 		}
-		return childrenModel;
+		return this.childrenModel;
 	}
 	
 	/**
 	 * Construct a children model
 	 */
-	@SuppressWarnings("unchecked")
 	protected ListValueModel<E> buildChildrenModel() {
-		return new NullListValueModel();
+		return new NullListValueModel<E>();
 	}
 	
 	/**
@@ -147,15 +146,15 @@ public abstract class AbstractTreeItemContentProvider<E>
 	/**
 	 * Return the model object represented by this node
 	 */
-	public Model model() {
-		return model;
+	public Model getModel() {
+		return this.model;
 	}
 	
 	/**
 	 * Return the tree content provider that delegates to this node
 	 */
-	public DelegatingTreeContentAndLabelProvider treeContentProvider() {
-		return treeContentProvider;
+	public DelegatingTreeContentAndLabelProvider getTreeContentProvider() {
+		return this.treeContentProvider;
 	}
 	
 	public Object getParent() {
@@ -167,14 +166,14 @@ public abstract class AbstractTreeItemContentProvider<E>
 	}
 	
 	public Object[] getChildren() {
-		return CollectionTools.array(childrenModel().listIterator());
+		return CollectionTools.array(getChildrenModel().listIterator());
 	}
 	
 	/**
 	 * Override with potentially more efficient logic
 	 */
 	public boolean hasChildren() {
-		return childrenModel().listIterator().hasNext();
+		return getChildrenModel().listIterator().hasNext();
 	}
 	
 	/**
@@ -182,7 +181,7 @@ public abstract class AbstractTreeItemContentProvider<E>
 	 */
 	public void dispose() {
 		for (Object child : getChildren()) {
-			treeContentProvider().dispose(child);
+			getTreeContentProvider().dispose(child);
 		}
 		disengageChildren();
 	}
@@ -192,7 +191,7 @@ public abstract class AbstractTreeItemContentProvider<E>
 	 * subclass logic 
 	 */
 	protected void engageChildren() {
-		childrenModel.addListChangeListener(ListValueModel.LIST_VALUES, childrenListener);
+		this.childrenModel.addListChangeListener(ListValueModel.LIST_VALUES, this.childrenListener);
 	}
 	
 	/** 
@@ -200,8 +199,8 @@ public abstract class AbstractTreeItemContentProvider<E>
 	 * subclass logic 
 	 */
 	protected void disengageChildren() {
-		if (childrenModel != null) {
-			childrenModel.removeListChangeListener(ListValueModel.LIST_VALUES, childrenListener);
+		if (this.childrenModel != null) {
+			this.childrenModel.removeListChangeListener(ListValueModel.LIST_VALUES, this.childrenListener);
 		}
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/GenericNavigatorItemContentProviderFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/GenericNavigatorItemContentProviderFactory.java
index faaf2b773b..fbef5923c5 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/GenericNavigatorItemContentProviderFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/GenericNavigatorItemContentProviderFactory.java
@@ -81,13 +81,13 @@ public class GenericNavigatorItemContentProviderFactory
 		}
 		
 		@Override
-		public PersistenceUnit model() {
-			return (PersistenceUnit) super.model();
+		public PersistenceUnit getModel() {
+			return (PersistenceUnit) super.getModel();
 		}
 		
 		@Override
 		public PersistenceXml getParent() {
-			return model().getParent().getParent();
+			return getModel().getParent().getParent();
 		}
 	
 		@Override
@@ -107,7 +107,7 @@ public class GenericNavigatorItemContentProviderFactory
 							new ItemPropertyListValueModelAdapter<MappingFileRef>(
 								new ListAspectAdapter<PersistenceUnit, MappingFileRef>(
 										PersistenceUnit.SPECIFIED_MAPPING_FILE_REFS_LIST,
-										model()) {
+										getModel()) {
 									@Override
 									protected ListIterator<MappingFileRef> listIterator_() {
 										return subject.specifiedMappingFileRefs();
@@ -139,7 +139,7 @@ public class GenericNavigatorItemContentProviderFactory
 				new PropertyAspectAdapter<MappingFileRef, MappingFile>(
 						new PropertyAspectAdapter<PersistenceUnit, MappingFileRef>(
 								PersistenceUnit.IMPLIED_MAPPING_FILE_REF_PROPERTY,
-								model()) {
+								getModel()) {
 							@Override
 							protected MappingFileRef buildValue_() {
 								return subject.getImpliedMappingFileRef();
@@ -186,7 +186,7 @@ public class GenericNavigatorItemContentProviderFactory
 		
 		protected ListValueModel<ClassRef> buildSpecifiedClassRefLvm() {
 			return new ListAspectAdapter<PersistenceUnit, ClassRef>(
-				PersistenceUnit.SPECIFIED_CLASS_REFS_LIST, model()) {
+				PersistenceUnit.SPECIFIED_CLASS_REFS_LIST, getModel()) {
 					@Override
 					protected ListIterator<ClassRef> listIterator_() {
 						return subject.specifiedClassRefs();
@@ -200,7 +200,7 @@ public class GenericNavigatorItemContentProviderFactory
 		
 		protected ListValueModel<ClassRef> buildImpliedClassRefLvm() {
 			return new ListAspectAdapter<PersistenceUnit, ClassRef>(
-				PersistenceUnit.IMPLIED_CLASS_REFS_LIST, model()) {
+				PersistenceUnit.IMPLIED_CLASS_REFS_LIST, getModel()) {
 					@Override
 					protected ListIterator<ClassRef> listIterator_() {
 						return subject.impliedClassRefs();
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/JavaPersistentTypeItemContentProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/JavaPersistentTypeItemContentProvider.java
index df768004ac..6c198cd9cf 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/JavaPersistentTypeItemContentProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/JavaPersistentTypeItemContentProvider.java
@@ -27,18 +27,18 @@ public class JavaPersistentTypeItemContentProvider extends AbstractTreeItemConte
 	}
 	
 	@Override
-	public JavaPersistentType model() {
-		return (JavaPersistentType) super.model();
+	public JavaPersistentType getModel() {
+		return (JavaPersistentType) super.getModel();
 	}
 	
 	@Override
 	public Object getParent() {
-		return model().getParent();
+		return getModel().getParent();
 	}
 	
 	@Override
 	protected ListValueModel<JavaPersistentAttribute> buildChildrenModel() {
-		return new ListAspectAdapter<JavaPersistentType, JavaPersistentAttribute>(PersistentType.SPECIFIED_ATTRIBUTES_LIST, model()) {
+		return new ListAspectAdapter<JavaPersistentType, JavaPersistentAttribute>(PersistentType.SPECIFIED_ATTRIBUTES_LIST, getModel()) {
 			@Override
 			protected ListIterator<JavaPersistentAttribute> listIterator_() {
 				return subject.attributes();
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/OrmPersistentTypeItemContentProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/OrmPersistentTypeItemContentProvider.java
index 0c15789050..4ce75ad045 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/OrmPersistentTypeItemContentProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/OrmPersistentTypeItemContentProvider.java
@@ -30,13 +30,13 @@ public class OrmPersistentTypeItemContentProvider extends AbstractTreeItemConten
 		}
 		
 		@Override
-		public OrmPersistentType model() {
-			return (OrmPersistentType) super.model();
+		public OrmPersistentType getModel() {
+			return (OrmPersistentType) super.getModel();
 		}
 		
 		@Override
 		public Object getParent() {
-			return model().getParent();
+			return getModel().getParent();
 		}
 		
 		@Override
@@ -49,7 +49,7 @@ public class OrmPersistentTypeItemContentProvider extends AbstractTreeItemConten
 		
 
 		protected ListValueModel<OrmPersistentAttribute> buildSpecifiedPersistentAttributesListHolder() {
-			return new ListAspectAdapter<OrmPersistentType, OrmPersistentAttribute>(PersistentType.SPECIFIED_ATTRIBUTES_LIST, model()) {
+			return new ListAspectAdapter<OrmPersistentType, OrmPersistentAttribute>(PersistentType.SPECIFIED_ATTRIBUTES_LIST, getModel()) {
 				@Override
 				protected ListIterator<OrmPersistentAttribute> listIterator_() {
 					return subject.specifiedAttributes();
@@ -62,7 +62,7 @@ public class OrmPersistentTypeItemContentProvider extends AbstractTreeItemConten
 		}
 		
 		protected ListValueModel<OrmPersistentAttribute> buildVirtualPersistentAttributesListHolder() {
-			return new ListAspectAdapter<OrmPersistentType, OrmPersistentAttribute>(OrmPersistentType.VIRTUAL_ATTRIBUTES_LIST, model()) {
+			return new ListAspectAdapter<OrmPersistentType, OrmPersistentAttribute>(OrmPersistentType.VIRTUAL_ATTRIBUTES_LIST, getModel()) {
 				@Override
 				protected ListIterator<OrmPersistentAttribute> listIterator_() {
 					return subject.virtualAttributes();
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/OrmXmlItemContentProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/OrmXmlItemContentProvider.java
index 1013407a20..d79c22be9f 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/OrmXmlItemContentProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/OrmXmlItemContentProvider.java
@@ -31,13 +31,13 @@ public class OrmXmlItemContentProvider
 	}
 	
 	@Override
-	public OrmXml model() {
-		return (OrmXml) super.model();
+	public OrmXml getModel() {
+		return (OrmXml) super.getModel();
 	}
 	
 	@Override
 	public PersistenceUnit getParent() {
-		return model().getPersistenceUnit();
+		return getModel().getPersistenceUnit();
 	}
 	
 	@Override
@@ -58,7 +58,7 @@ public class OrmXmlItemContentProvider
 	
 	protected PropertyValueModel<EntityMappings> buildEntityMappingsHolder() {
 		return new PropertyAspectAdapter<OrmXml, EntityMappings>(
-				OrmXml.ENTITY_MAPPINGS_PROPERTY, model()) {
+				OrmXml.ENTITY_MAPPINGS_PROPERTY, getModel()) {
 			@Override
 			protected EntityMappings buildValue_() {
 				return subject.getEntityMappings();
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/PersistenceXmlItemContentProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/PersistenceXmlItemContentProvider.java
index a90d1ec8aa..31bd6d9c1d 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/PersistenceXmlItemContentProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/PersistenceXmlItemContentProvider.java
@@ -30,20 +30,20 @@ public class PersistenceXmlItemContentProvider
 	}
 	
 	@Override
-	public PersistenceXml model() {
-		return (PersistenceXml) super.model();
+	public PersistenceXml getModel() {
+		return (PersistenceXml) super.getModel();
 	}
 	
 	@Override
 	public JpaRootContextNode getParent() {
-		return (JpaRootContextNode) model().getParent();
+		return (JpaRootContextNode) getModel().getParent();
 	}
 	
 	@Override
 	protected ListValueModel<PersistenceUnit> buildChildrenModel() {
 		return new ListAspectAdapter<Persistence, PersistenceUnit>(
 				new PropertyAspectAdapter<PersistenceXml, Persistence>(
-						PersistenceXml.PERSISTENCE_PROPERTY, model()) {
+						PersistenceXml.PERSISTENCE_PROPERTY, getModel()) {
 					@Override
 					protected Persistence buildValue_() {
 						return subject.getPersistence();
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/PersistentAttributeItemContentProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/PersistentAttributeItemContentProvider.java
index 85b0d2e351..9c7712fd9f 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/PersistentAttributeItemContentProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/PersistentAttributeItemContentProvider.java
@@ -23,13 +23,13 @@ public class PersistentAttributeItemContentProvider extends AbstractTreeItemCont
 	}
 	
 	@Override
-	public PersistentAttribute model() {
-		return (PersistentAttribute) super.model();
+	public PersistentAttribute getModel() {
+		return (PersistentAttribute) super.getModel();
 	}
 	
 	@Override
 	public Object getParent() {
-		return model().getParent();
+		return getModel().getParent();
 	}
 	
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/RootContextItemContentProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/RootContextItemContentProvider.java
index c6e1311a2c..da97c34855 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/RootContextItemContentProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/RootContextItemContentProvider.java
@@ -28,13 +28,13 @@ public class RootContextItemContentProvider
 	}
 	
 	@Override
-	public JpaRootContextNode model() {
-		return (JpaRootContextNode) super.model();
+	public JpaRootContextNode getModel() {
+		return (JpaRootContextNode) super.getModel();
 	}
 	
 	@Override
 	public IProject getParent() {
-		return model().getJpaProject().getProject();
+		return getModel().getJpaProject().getProject();
 	}
 	
 	@Override
@@ -42,7 +42,7 @@ public class RootContextItemContentProvider
 		return new PropertyListValueModelAdapter<PersistenceXml>(
 				new PropertyAspectAdapter<JpaRootContextNode, PersistenceXml>(
 						JpaRootContextNode.PERSISTENCE_XML_PROPERTY,
-						model()) {
+						getModel()) {
 					 @Override
 					protected PersistenceXml buildValue_() {
 						return subject.getPersistenceXml();
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/OrmItemContentProviderFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/OrmItemContentProviderFactory.java
index d5ac2aa3a8..d599d9ba44 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/OrmItemContentProviderFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/OrmItemContentProviderFactory.java
@@ -51,8 +51,8 @@ public class OrmItemContentProviderFactory extends GeneralJpaMappingItemContentP
 		}
 		
 		@Override
-		public EntityMappings model() {
-			return (EntityMappings) super.model();
+		public EntityMappings getModel() {
+			return (EntityMappings) super.getModel();
 		}
 		
 		@Override
@@ -65,7 +65,7 @@ public class OrmItemContentProviderFactory extends GeneralJpaMappingItemContentP
 		@Override
 		protected ListValueModel<OrmPersistentType> buildChildrenModel() {
 			return new ListAspectAdapter<EntityMappings, OrmPersistentType>(
-					EntityMappings.PERSISTENT_TYPES_LIST, model()) {
+					EntityMappings.PERSISTENT_TYPES_LIST, getModel()) {
 				@Override
 				protected ListIterator<OrmPersistentType> listIterator_() {
 					return subject.ormPersistentTypes();
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/PersistenceItemContentProviderFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/PersistenceItemContentProviderFactory.java
index 2f08fab4dd..b91aa198d6 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/PersistenceItemContentProviderFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/PersistenceItemContentProviderFactory.java
@@ -63,8 +63,8 @@ public class PersistenceItemContentProviderFactory
 		}
 			
 		@Override
-		public Persistence model() {
-			return (Persistence) super.model();
+		public Persistence getModel() {
+			return (Persistence) super.getModel();
 		}
 		
 		@Override
@@ -77,7 +77,7 @@ public class PersistenceItemContentProviderFactory
 		@Override
 		protected ListValueModel<PersistenceUnit> buildChildrenModel() {
 			return new ListAspectAdapter<Persistence, PersistenceUnit>(
-					Persistence.PERSISTENCE_UNITS_LIST, model()) {
+					Persistence.PERSISTENCE_UNITS_LIST, getModel()) {
 				@Override
 				protected ListIterator<PersistenceUnit> listIterator_() {
 					return subject.persistenceUnits();
@@ -99,13 +99,13 @@ public class PersistenceItemContentProviderFactory
 		}
 		
 		@Override
-		public PersistenceUnit model() {
-			return (PersistenceUnit) super.model();
+		public PersistenceUnit getModel() {
+			return (PersistenceUnit) super.getModel();
 		}
 		
 		@Override
 		public Persistence getParent() {
-			return model().getParent();
+			return getModel().getParent();
 		}
 		
 		@Override
@@ -113,7 +113,7 @@ public class PersistenceItemContentProviderFactory
 			ListValueModel<MappingFileRef> specifiedMappingFileLvm = 
 				new ListAspectAdapter<PersistenceUnit, MappingFileRef>(
 						PersistenceUnit.SPECIFIED_MAPPING_FILE_REFS_LIST,
-						model()) {
+						getModel()) {
 					@Override
 					protected ListIterator<MappingFileRef> listIterator_() {
 						return subject.specifiedMappingFileRefs();
@@ -128,7 +128,7 @@ public class PersistenceItemContentProviderFactory
 				new PropertyListValueModelAdapter<MappingFileRef>(
 					new PropertyAspectAdapter<PersistenceUnit, MappingFileRef>(
 							PersistenceUnit.IMPLIED_MAPPING_FILE_REF_PROPERTY,
-							model()) {
+							getModel()) {
 						@Override
 						protected MappingFileRef buildValue_() {
 							return subject.getImpliedMappingFileRef();
@@ -138,7 +138,7 @@ public class PersistenceItemContentProviderFactory
 			ListValueModel<ClassRef> specifiedClassLvm = 
 				new ListAspectAdapter<PersistenceUnit, ClassRef>(
 						PersistenceUnit.SPECIFIED_CLASS_REFS_LIST,
-						model()) {
+						getModel()) {
 					@Override
 					protected ListIterator<ClassRef> listIterator_() {
 						return subject.specifiedClassRefs();
@@ -151,7 +151,7 @@ public class PersistenceItemContentProviderFactory
 			ListValueModel<ClassRef> impliedClassLvm = 
 				new ListAspectAdapter<PersistenceUnit, ClassRef>(
 						PersistenceUnit.IMPLIED_CLASS_REFS_LIST,
-						model()) {
+						getModel()) {
 					@Override
 					protected ListIterator<ClassRef> listIterator_() {
 						return subject.impliedClassRefs();
@@ -180,13 +180,13 @@ public class PersistenceItemContentProviderFactory
 		}
 		
 		@Override
-		public MappingFileRef model() {
-			return (MappingFileRef) super.model();
+		public MappingFileRef getModel() {
+			return (MappingFileRef) super.getModel();
 		}
 		
 		@Override
 		public Object getParent() {
-			return model().getPersistenceUnit();
+			return getModel().getPersistenceUnit();
 		}
 		
 		@Override
@@ -204,13 +204,13 @@ public class PersistenceItemContentProviderFactory
 		}
 		
 		@Override
-		public ClassRef model() {
-			return (ClassRef) super.model();
+		public ClassRef getModel() {
+			return (ClassRef) super.getModel();
 		}
 		
 		@Override
 		public Object getParent() {
-			return model().getPersistenceUnit();
+			return getModel().getPersistenceUnit();
 		}
 		
 		@Override
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/ResourceModelItemContentProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/ResourceModelItemContentProvider.java
index dd5033ad3e..50d3cbb776 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/ResourceModelItemContentProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/ResourceModelItemContentProvider.java
@@ -36,8 +36,8 @@ public class ResourceModelItemContentProvider extends AbstractTreeItemContentPro
 	}
 	
 	@Override
-	public JpaFile model() {
-		return (JpaFile) super.model();
+	public JpaFile getModel() {
+		return (JpaFile) super.getModel();
 	}
 	
 	@Override
@@ -56,6 +56,6 @@ public class ResourceModelItemContentProvider extends AbstractTreeItemContentPro
 	}
 	
 	protected PropertyValueModel<JpaFile> buildJpaFileValueModel() {
-		return new SimplePropertyValueModel<JpaFile>(this.model());
+		return new SimplePropertyValueModel<JpaFile>(this.getModel());
 	}
 }
\ No newline at end of file
diff --git a/jpa/tests/org.eclipse.jpt.ui.tests/src/org/eclipse/jpt/ui/tests/internal/jface/DelegatingLabelProviderUiTest.java b/jpa/tests/org.eclipse.jpt.ui.tests/src/org/eclipse/jpt/ui/tests/internal/jface/DelegatingLabelProviderUiTest.java
index 90afb5c6ef..1eec469a66 100644
--- a/jpa/tests/org.eclipse.jpt.ui.tests/src/org/eclipse/jpt/ui/tests/internal/jface/DelegatingLabelProviderUiTest.java
+++ b/jpa/tests/org.eclipse.jpt.ui.tests/src/org/eclipse/jpt/ui/tests/internal/jface/DelegatingLabelProviderUiTest.java
@@ -327,8 +327,8 @@ public class DelegatingLabelProviderUiTest extends ApplicationWindow
 		}
 		
 		@Override
-		public Root model() {
-			return (Root) super.model();
+		public Root getModel() {
+			return (Root) super.getModel();
 		}
 		
 		@Override
@@ -338,7 +338,7 @@ public class DelegatingLabelProviderUiTest extends ApplicationWindow
 		
 		@Override
 		protected ListValueModel<Vehicle> buildChildrenModel() {
-			return new StaticListValueModel<Vehicle>(CollectionTools.list(model().vehicles()));
+			return new StaticListValueModel<Vehicle>(CollectionTools.list(getModel().vehicles()));
 		}
 	}
 	
@@ -350,13 +350,13 @@ public class DelegatingLabelProviderUiTest extends ApplicationWindow
 		}
 		
 		@Override
-		public Vehicle model() {
-			return (Vehicle) super.model();
+		public Vehicle getModel() {
+			return (Vehicle) super.getModel();
 		}
 		
 		@Override
 		public Object getParent() {
-			return model().parent();
+			return getModel().parent();
 		}
 		
 		@Override
diff --git a/jpa/tests/org.eclipse.jpt.ui.tests/src/org/eclipse/jpt/ui/tests/internal/jface/DelegatingTreeContentProviderUiTest.java b/jpa/tests/org.eclipse.jpt.ui.tests/src/org/eclipse/jpt/ui/tests/internal/jface/DelegatingTreeContentProviderUiTest.java
index 87203da17d..0039cca5ec 100644
--- a/jpa/tests/org.eclipse.jpt.ui.tests/src/org/eclipse/jpt/ui/tests/internal/jface/DelegatingTreeContentProviderUiTest.java
+++ b/jpa/tests/org.eclipse.jpt.ui.tests/src/org/eclipse/jpt/ui/tests/internal/jface/DelegatingTreeContentProviderUiTest.java
@@ -326,7 +326,7 @@ public class DelegatingTreeContentProviderUiTest extends ApplicationWindow
 		}
 
 		protected TreeNode treeNode() {
-			return (TreeNode) model();
+			return (TreeNode) getModel();
 		}
 
 		@Override