diff options
| author | kmoore | 2008-11-11 19:40:27 +0000 |
|---|---|---|
| committer | kmoore | 2008-11-11 19:40:27 +0000 |
| commit | 2c2785ac115e65ece8bccfc584d39b7295d8bab0 (patch) | |
| tree | acf7547bb6f3538f25ddd0113476183d949e2ae9 /jpa | |
| parent | 8b484beeb86d66f860a05f03b1935dcf01576d1d (diff) | |
| download | webtools.dali-2c2785ac115e65ece8bccfc584d39b7295d8bab0.tar.gz webtools.dali-2c2785ac115e65ece8bccfc584d39b7295d8bab0.tar.xz webtools.dali-2c2785ac115e65ece8bccfc584d39b7295d8bab0.zip | |
minor cleanup, overriding the model() method
Diffstat (limited to 'jpa')
3 files changed, 18 insertions, 3 deletions
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 5f515fb694..df768004ac 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 @@ -30,6 +30,7 @@ public class JavaPersistentTypeItemContentProvider extends AbstractTreeItemConte public JavaPersistentType model() { return (JavaPersistentType) super.model(); } + @Override public Object getParent() { return model().getParent(); 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 df5f2f808d..d5ac2aa3a8 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 @@ -50,6 +50,10 @@ public class OrmItemContentProviderFactory extends GeneralJpaMappingItemContentP super(entityMappings, contentProvider); } + @Override + public EntityMappings model() { + return (EntityMappings) super.model(); + } @Override public Object getParent() { @@ -61,7 +65,7 @@ public class OrmItemContentProviderFactory extends GeneralJpaMappingItemContentP @Override protected ListValueModel<OrmPersistentType> buildChildrenModel() { return new ListAspectAdapter<EntityMappings, OrmPersistentType>( - EntityMappings.PERSISTENT_TYPES_LIST, (EntityMappings) model()) { + EntityMappings.PERSISTENT_TYPES_LIST, model()) { @Override protected ListIterator<OrmPersistentType> listIterator_() { return subject.ormPersistentTypes(); 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 a5a7ec41da..90afb5c6ef 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,13 +327,18 @@ public class DelegatingLabelProviderUiTest extends ApplicationWindow } @Override + public Root model() { + return (Root) super.model(); + } + + @Override public Object getParent() { return null; } @Override protected ListValueModel<Vehicle> buildChildrenModel() { - return new StaticListValueModel<Vehicle>(CollectionTools.list(((Root) model()).vehicles())); + return new StaticListValueModel<Vehicle>(CollectionTools.list(model().vehicles())); } } @@ -345,8 +350,13 @@ public class DelegatingLabelProviderUiTest extends ApplicationWindow } @Override + public Vehicle model() { + return (Vehicle) super.model(); + } + + @Override public Object getParent() { - return ((Vehicle) model()).parent(); + return model().parent(); } @Override |