diff options
author | marcelop | 2006-12-29 18:27:35 +0000 |
---|---|---|
committer | marcelop | 2006-12-29 18:27:35 +0000 |
commit | d94f5411dc4f46272ee7e1a0e5cdb937025bc307 (patch) | |
tree | 540e4e412b6a61cd7abe2a750e0f75030c9d2980 /examples/org.eclipse.emf.examples.library.edit | |
parent | 41e73b7687395a359f1e969cc072140c6b27224c (diff) | |
download | org.eclipse.emf-d94f5411dc4f46272ee7e1a0e5cdb937025bc307.tar.gz org.eclipse.emf-d94f5411dc4f46272ee7e1a0e5cdb937025bc307.tar.xz org.eclipse.emf-d94f5411dc4f46272ee7e1a0e5cdb937025bc307.zip |
[169245] Removing compilation warnings
Diffstat (limited to 'examples/org.eclipse.emf.examples.library.edit')
14 files changed, 163 insertions, 56 deletions
diff --git a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/AudioVisualItemItemProvider.java b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/AudioVisualItemItemProvider.java index 14cdfe85a..19bee30d6 100644 --- a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/AudioVisualItemItemProvider.java +++ b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/AudioVisualItemItemProvider.java @@ -1,7 +1,7 @@ /** * <copyright> * - * Copyright (c) 2005 IBM Corporation and others. + * Copyright (c) 2005-2006 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 @@ -12,7 +12,7 @@ * * </copyright> * - * $Id: AudioVisualItemItemProvider.java,v 1.2 2006/05/15 22:06:35 emerks Exp $ + * $Id: AudioVisualItemItemProvider.java,v 1.3 2006/12/29 18:27:35 marcelop Exp $ */ package org.eclipse.emf.examples.extlibrary.provider; @@ -25,9 +25,11 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.ResourceLocator; +import org.eclipse.emf.edit.command.CommandParameter; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; @@ -69,7 +71,8 @@ public class AudioVisualItemItemProvider * <!-- end-user-doc --> * @generated */ - public List getPropertyDescriptors(Object object) + @Override + public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) { @@ -157,6 +160,7 @@ public class AudioVisualItemItemProvider * <!-- end-user-doc --> * @generated */ + @Override public String getText(Object object) { String label = ((AudioVisualItem)object).getTitle(); @@ -172,6 +176,7 @@ public class AudioVisualItemItemProvider * <!-- end-user-doc --> * @generated */ + @Override public void notifyChanged(Notification notification) { updateChildren(notification); @@ -194,7 +199,8 @@ public class AudioVisualItemItemProvider * <!-- end-user-doc --> * @generated */ - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) + @Override + protected void collectNewChildDescriptors(Collection<CommandParameter> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); } @@ -205,6 +211,7 @@ public class AudioVisualItemItemProvider * <!-- end-user-doc --> * @generated */ + @Override public ResourceLocator getResourceLocator() { return EXTLibraryEditPlugin.INSTANCE; diff --git a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/BookItemProvider.java b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/BookItemProvider.java index 0037bedc1..9bd1b4413 100644 --- a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/BookItemProvider.java +++ b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/BookItemProvider.java @@ -1,7 +1,7 @@ /** * <copyright> * - * Copyright (c) 2005 IBM Corporation and others. + * Copyright (c) 2005-2006 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 @@ -12,7 +12,7 @@ * * </copyright> * - * $Id: BookItemProvider.java,v 1.4 2006/05/15 22:06:35 emerks Exp $ + * $Id: BookItemProvider.java,v 1.5 2006/12/29 18:27:35 marcelop Exp $ */ package org.eclipse.emf.examples.extlibrary.provider; @@ -25,9 +25,11 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.ResourceLocator; +import org.eclipse.emf.edit.command.CommandParameter; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; @@ -69,7 +71,8 @@ public class BookItemProvider * <!-- end-user-doc --> * @generated */ - public List getPropertyDescriptors(Object object) + @Override + public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) { @@ -181,6 +184,7 @@ public class BookItemProvider * <!-- end-user-doc --> * @generated */ + @Override public Object getImage(Object object) { return overlayImage(object, getResourceLocator().getImage("full/obj16/Book")); //$NON-NLS-1$ @@ -192,6 +196,7 @@ public class BookItemProvider * <!-- end-user-doc --> * @generated */ + @Override public String getText(Object object) { String label = ((Book)object).getTitle(); @@ -207,6 +212,7 @@ public class BookItemProvider * <!-- end-user-doc --> * @generated */ + @Override public void notifyChanged(Notification notification) { updateChildren(notification); @@ -229,7 +235,8 @@ public class BookItemProvider * <!-- end-user-doc --> * @generated */ - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) + @Override + protected void collectNewChildDescriptors(Collection<CommandParameter> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); } @@ -240,6 +247,7 @@ public class BookItemProvider * <!-- end-user-doc --> * @generated */ + @Override public ResourceLocator getResourceLocator() { return EXTLibraryEditPlugin.INSTANCE; diff --git a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/BookOnTapeItemProvider.java b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/BookOnTapeItemProvider.java index ffd7854cd..e5149cb3c 100644 --- a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/BookOnTapeItemProvider.java +++ b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/BookOnTapeItemProvider.java @@ -1,7 +1,7 @@ /** * <copyright> * - * Copyright (c) 2005 IBM Corporation and others. + * Copyright (c) 2005-2006 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 @@ -12,7 +12,7 @@ * * </copyright> * - * $Id: BookOnTapeItemProvider.java,v 1.4 2006/05/15 22:06:35 emerks Exp $ + * $Id: BookOnTapeItemProvider.java,v 1.5 2006/12/29 18:27:35 marcelop Exp $ */ package org.eclipse.emf.examples.extlibrary.provider; @@ -25,9 +25,11 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.ResourceLocator; +import org.eclipse.emf.edit.command.CommandParameter; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; @@ -67,7 +69,8 @@ public class BookOnTapeItemProvider * <!-- end-user-doc --> * @generated */ - public List getPropertyDescriptors(Object object) + @Override + public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) { @@ -131,6 +134,7 @@ public class BookOnTapeItemProvider * <!-- end-user-doc --> * @generated */ + @Override public Object getImage(Object object) { return overlayImage(object, getResourceLocator().getImage("full/obj16/BookOnTape")); //$NON-NLS-1$ @@ -142,6 +146,7 @@ public class BookOnTapeItemProvider * <!-- end-user-doc --> * @generated */ + @Override public String getText(Object object) { String label = ((BookOnTape)object).getTitle(); @@ -157,6 +162,7 @@ public class BookOnTapeItemProvider * <!-- end-user-doc --> * @generated */ + @Override public void notifyChanged(Notification notification) { updateChildren(notification); @@ -170,7 +176,8 @@ public class BookOnTapeItemProvider * <!-- end-user-doc --> * @generated */ - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) + @Override + protected void collectNewChildDescriptors(Collection<CommandParameter> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); } @@ -181,6 +188,7 @@ public class BookOnTapeItemProvider * <!-- end-user-doc --> * @generated */ + @Override public ResourceLocator getResourceLocator() { return EXTLibraryEditPlugin.INSTANCE; diff --git a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/BorrowerItemProvider.java b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/BorrowerItemProvider.java index bafee9ca1..36f15cb11 100644 --- a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/BorrowerItemProvider.java +++ b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/BorrowerItemProvider.java @@ -1,7 +1,7 @@ /** * <copyright> * - * Copyright (c) 2005 IBM Corporation and others. + * Copyright (c) 2005-2006 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 @@ -12,7 +12,7 @@ * * </copyright> * - * $Id: BorrowerItemProvider.java,v 1.4 2006/05/15 22:06:35 emerks Exp $ + * $Id: BorrowerItemProvider.java,v 1.5 2006/12/29 18:27:35 marcelop Exp $ */ package org.eclipse.emf.examples.extlibrary.provider; @@ -25,9 +25,11 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.ResourceLocator; +import org.eclipse.emf.edit.command.CommandParameter; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; @@ -67,7 +69,8 @@ public class BorrowerItemProvider * <!-- end-user-doc --> * @generated */ - public List getPropertyDescriptors(Object object) + @Override + public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) { @@ -107,6 +110,7 @@ public class BorrowerItemProvider * <!-- end-user-doc --> * @generated */ + @Override public Object getImage(Object object) { return overlayImage(object, getResourceLocator().getImage("full/obj16/Borrower")); //$NON-NLS-1$ @@ -118,6 +122,7 @@ public class BorrowerItemProvider * <!-- end-user-doc --> * @generated */ + @Override public String getText(Object object) { String label = ((Borrower)object).getLastName(); @@ -133,6 +138,7 @@ public class BorrowerItemProvider * <!-- end-user-doc --> * @generated */ + @Override public void notifyChanged(Notification notification) { updateChildren(notification); @@ -146,7 +152,8 @@ public class BorrowerItemProvider * <!-- end-user-doc --> * @generated */ - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) + @Override + protected void collectNewChildDescriptors(Collection<CommandParameter> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); } @@ -157,6 +164,7 @@ public class BorrowerItemProvider * <!-- end-user-doc --> * @generated */ + @Override public ResourceLocator getResourceLocator() { return EXTLibraryEditPlugin.INSTANCE; diff --git a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/CirculatingItemItemProvider.java b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/CirculatingItemItemProvider.java index c06d38dd8..5d9d4a3d2 100644 --- a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/CirculatingItemItemProvider.java +++ b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/CirculatingItemItemProvider.java @@ -1,7 +1,7 @@ /** * <copyright> * - * Copyright (c) 2005 IBM Corporation and others. + * Copyright (c) 2005-2006 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 @@ -12,7 +12,7 @@ * * </copyright> * - * $Id: CirculatingItemItemProvider.java,v 1.4 2006/05/15 22:06:35 emerks Exp $ + * $Id: CirculatingItemItemProvider.java,v 1.5 2006/12/29 18:27:35 marcelop Exp $ */ package org.eclipse.emf.examples.extlibrary.provider; @@ -26,9 +26,11 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.ResourceLocator; +import org.eclipse.emf.edit.command.CommandParameter; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; @@ -70,7 +72,8 @@ public class CirculatingItemItemProvider * <!-- end-user-doc --> * @generated */ - public List getPropertyDescriptors(Object object) + @Override + public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) { @@ -134,6 +137,7 @@ public class CirculatingItemItemProvider * <!-- end-user-doc --> * @generated */ + @Override public Object getImage(Object object) { return overlayImage(object, getResourceLocator().getImage("full/obj16/CirculatingItem")); //$NON-NLS-1$ @@ -145,6 +149,7 @@ public class CirculatingItemItemProvider * <!-- end-user-doc --> * @generated */ + @Override public String getText(Object object) { Date labelValue = ((CirculatingItem)object).getPublicationDate(); @@ -161,6 +166,7 @@ public class CirculatingItemItemProvider * <!-- end-user-doc --> * @generated */ + @Override public void notifyChanged(Notification notification) { updateChildren(notification); @@ -181,7 +187,8 @@ public class CirculatingItemItemProvider * <!-- end-user-doc --> * @generated */ - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) + @Override + protected void collectNewChildDescriptors(Collection<CommandParameter> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); } @@ -192,6 +199,7 @@ public class CirculatingItemItemProvider * <!-- end-user-doc --> * @generated */ + @Override public ResourceLocator getResourceLocator() { return EXTLibraryEditPlugin.INSTANCE; diff --git a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/EXTLibraryEditPlugin.java b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/EXTLibraryEditPlugin.java index d40245e0f..730f338a4 100644 --- a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/EXTLibraryEditPlugin.java +++ b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/EXTLibraryEditPlugin.java @@ -1,7 +1,7 @@ /** * <copyright> * - * Copyright (c) 2005 IBM Corporation and others. + * Copyright (c) 2005-2006 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 @@ -12,7 +12,7 @@ * * </copyright> * - * $Id: EXTLibraryEditPlugin.java,v 1.2 2005/12/05 12:36:45 emerks Exp $ + * $Id: EXTLibraryEditPlugin.java,v 1.3 2006/12/29 18:27:35 marcelop Exp $ */ package org.eclipse.emf.examples.extlibrary.provider; @@ -65,6 +65,7 @@ public final class EXTLibraryEditPlugin extends EMFPlugin * @return the singleton instance. * @generated */ + @Override public ResourceLocator getPluginResourceLocator() { return plugin; diff --git a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/EXTLibraryItemProviderAdapterFactory.java b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/EXTLibraryItemProviderAdapterFactory.java index 6d20e5cf9..dea7e2bb2 100644 --- a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/EXTLibraryItemProviderAdapterFactory.java +++ b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/EXTLibraryItemProviderAdapterFactory.java @@ -1,7 +1,7 @@ /** * <copyright> * - * Copyright (c) 2005 IBM Corporation and others. + * Copyright (c) 2005-2006 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 @@ -12,7 +12,7 @@ * * </copyright> * - * $Id: EXTLibraryItemProviderAdapterFactory.java,v 1.2 2005/12/05 12:36:45 emerks Exp $ + * $Id: EXTLibraryItemProviderAdapterFactory.java,v 1.3 2006/12/29 18:27:35 marcelop Exp $ */ package org.eclipse.emf.examples.extlibrary.provider; @@ -70,7 +70,7 @@ public class EXTLibraryItemProviderAdapterFactory extends EXTLibraryAdapterFacto * <!-- end-user-doc --> * @generated */ - protected Collection supportedTypes = new ArrayList(); + protected Collection<Object> supportedTypes = new ArrayList<Object>(); /** * This constructs an instance. @@ -84,7 +84,7 @@ public class EXTLibraryItemProviderAdapterFactory extends EXTLibraryAdapterFacto supportedTypes.add(IStructuredItemContentProvider.class); supportedTypes.add(ITreeItemContentProvider.class); supportedTypes.add(IItemLabelProvider.class); - supportedTypes.add(IItemPropertySource.class); + supportedTypes.add(IItemPropertySource.class); } /** @@ -101,6 +101,7 @@ public class EXTLibraryItemProviderAdapterFactory extends EXTLibraryAdapterFacto * <!-- end-user-doc --> * @generated */ + @Override public Adapter createBookAdapter() { if (bookItemProvider == null) @@ -125,6 +126,7 @@ public class EXTLibraryItemProviderAdapterFactory extends EXTLibraryAdapterFacto * <!-- end-user-doc --> * @generated */ + @Override public Adapter createLibraryAdapter() { if (libraryItemProvider == null) @@ -149,6 +151,7 @@ public class EXTLibraryItemProviderAdapterFactory extends EXTLibraryAdapterFacto * <!-- end-user-doc --> * @generated */ + @Override public Adapter createWriterAdapter() { if (writerItemProvider == null) @@ -173,6 +176,7 @@ public class EXTLibraryItemProviderAdapterFactory extends EXTLibraryAdapterFacto * <!-- end-user-doc --> * @generated */ + @Override public Adapter createBookOnTapeAdapter() { if (bookOnTapeItemProvider == null) @@ -197,6 +201,7 @@ public class EXTLibraryItemProviderAdapterFactory extends EXTLibraryAdapterFacto * <!-- end-user-doc --> * @generated */ + @Override public Adapter createVideoCassetteAdapter() { if (videoCassetteItemProvider == null) @@ -221,6 +226,7 @@ public class EXTLibraryItemProviderAdapterFactory extends EXTLibraryAdapterFacto * <!-- end-user-doc --> * @generated */ + @Override public Adapter createBorrowerAdapter() { if (borrowerItemProvider == null) @@ -245,6 +251,7 @@ public class EXTLibraryItemProviderAdapterFactory extends EXTLibraryAdapterFacto * <!-- end-user-doc --> * @generated */ + @Override public Adapter createPersonAdapter() { if (personItemProvider == null) @@ -269,6 +276,7 @@ public class EXTLibraryItemProviderAdapterFactory extends EXTLibraryAdapterFacto * <!-- end-user-doc --> * @generated */ + @Override public Adapter createEmployeeAdapter() { if (employeeItemProvider == null) @@ -306,6 +314,7 @@ public class EXTLibraryItemProviderAdapterFactory extends EXTLibraryAdapterFacto * <!-- end-user-doc --> * @generated */ + @Override public boolean isFactoryForType(Object type) { return supportedTypes.contains(type) || super.isFactoryForType(type); @@ -317,6 +326,7 @@ public class EXTLibraryItemProviderAdapterFactory extends EXTLibraryAdapterFacto * <!-- end-user-doc --> * @generated */ + @Override public Adapter adapt(Notifier notifier, Object type) { return super.adapt(notifier, this); @@ -327,12 +337,13 @@ public class EXTLibraryItemProviderAdapterFactory extends EXTLibraryAdapterFacto * <!-- end-user-doc --> * @generated */ + @Override public Object adapt(Object object, Object type) { if (isFactoryForType(type)) { Object adapter = super.adapt(object, type); - if (!(type instanceof Class) || (((Class)type).isInstance(adapter))) + if (!(type instanceof Class) || (((Class<?>)type).isInstance(adapter))) { return adapter; } diff --git a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/EmployeeItemProvider.java b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/EmployeeItemProvider.java index 522b6c2fb..dd2f6d89b 100644 --- a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/EmployeeItemProvider.java +++ b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/EmployeeItemProvider.java @@ -1,7 +1,7 @@ /** * <copyright> * - * Copyright (c) 2005 IBM Corporation and others. + * Copyright (c) 2005-2006 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 @@ -12,7 +12,7 @@ * * </copyright> * - * $Id: EmployeeItemProvider.java,v 1.4 2006/05/15 22:06:35 emerks Exp $ + * $Id: EmployeeItemProvider.java,v 1.5 2006/12/29 18:27:35 marcelop Exp $ */ package org.eclipse.emf.examples.extlibrary.provider; @@ -25,9 +25,11 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.ResourceLocator; +import org.eclipse.emf.edit.command.CommandParameter; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; @@ -67,7 +69,8 @@ public class EmployeeItemProvider * <!-- end-user-doc --> * @generated */ - public List getPropertyDescriptors(Object object) + @Override + public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) { @@ -107,6 +110,7 @@ public class EmployeeItemProvider * <!-- end-user-doc --> * @generated */ + @Override public Object getImage(Object object) { return overlayImage(object, getResourceLocator().getImage("full/obj16/Employee")); //$NON-NLS-1$ @@ -118,6 +122,7 @@ public class EmployeeItemProvider * <!-- end-user-doc --> * @generated */ + @Override public String getText(Object object) { String label = ((Employee)object).getLastName(); @@ -133,6 +138,7 @@ public class EmployeeItemProvider * <!-- end-user-doc --> * @generated */ + @Override public void notifyChanged(Notification notification) { updateChildren(notification); @@ -146,7 +152,8 @@ public class EmployeeItemProvider * <!-- end-user-doc --> * @generated */ - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) + @Override + protected void collectNewChildDescriptors(Collection<CommandParameter> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); } @@ -157,6 +164,7 @@ public class EmployeeItemProvider * <!-- end-user-doc --> * @generated */ + @Override public ResourceLocator getResourceLocator() { return EXTLibraryEditPlugin.INSTANCE; diff --git a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/ItemItemProvider.java b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/ItemItemProvider.java index 7e0cbe529..8db74e7a7 100644 --- a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/ItemItemProvider.java +++ b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/ItemItemProvider.java @@ -1,7 +1,7 @@ /** * <copyright> * - * Copyright (c) 2005 IBM Corporation and others. + * Copyright (c) 2005-2006 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 @@ -12,7 +12,7 @@ * * </copyright> * - * $Id: ItemItemProvider.java,v 1.3 2006/05/15 22:06:35 emerks Exp $ + * $Id: ItemItemProvider.java,v 1.4 2006/12/29 18:27:35 marcelop Exp $ */ package org.eclipse.emf.examples.extlibrary.provider; @@ -26,9 +26,11 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.ResourceLocator; +import org.eclipse.emf.edit.command.CommandParameter; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; @@ -71,7 +73,8 @@ public class ItemItemProvider * <!-- end-user-doc --> * @generated */ - public List getPropertyDescriptors(Object object) + @Override + public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) { @@ -111,6 +114,7 @@ public class ItemItemProvider * <!-- end-user-doc --> * @generated */ + @Override public String getText(Object object) { Date labelValue = ((Item)object).getPublicationDate(); @@ -127,6 +131,7 @@ public class ItemItemProvider * <!-- end-user-doc --> * @generated */ + @Override public void notifyChanged(Notification notification) { updateChildren(notification); @@ -147,7 +152,8 @@ public class ItemItemProvider * <!-- end-user-doc --> * @generated */ - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) + @Override + protected void collectNewChildDescriptors(Collection<CommandParameter> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); } @@ -158,6 +164,7 @@ public class ItemItemProvider * <!-- end-user-doc --> * @generated */ + @Override public ResourceLocator getResourceLocator() { return EXTLibraryEditPlugin.INSTANCE; diff --git a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/LibraryItemProvider.java b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/LibraryItemProvider.java index 784b3c2fd..77c78415d 100644 --- a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/LibraryItemProvider.java +++ b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/LibraryItemProvider.java @@ -1,7 +1,7 @@ /** * <copyright> * - * Copyright (c) 2005 IBM Corporation and others. + * Copyright (c) 2005-2006 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 @@ -12,7 +12,7 @@ * * </copyright> * - * $Id: LibraryItemProvider.java,v 1.4 2006/05/15 22:06:35 emerks Exp $ + * $Id: LibraryItemProvider.java,v 1.5 2006/12/29 18:27:35 marcelop Exp $ */ package org.eclipse.emf.examples.extlibrary.provider; @@ -27,9 +27,11 @@ import org.eclipse.emf.common.util.ResourceLocator; import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.emf.edit.command.CommandParameter; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; @@ -73,7 +75,8 @@ public class LibraryItemProvider * <!-- end-user-doc --> * @generated */ - public List getPropertyDescriptors(Object object) + @Override + public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) { @@ -163,7 +166,8 @@ public class LibraryItemProvider * <!-- end-user-doc --> * @generated */ - public Collection getChildrenFeatures(Object object) + @Override + public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) { if (childrenFeatures == null) { @@ -182,6 +186,7 @@ public class LibraryItemProvider * <!-- end-user-doc --> * @generated */ + @Override protected EStructuralFeature getChildFeature(Object object, Object child) { // Check the type of the specified child object and return the proper feature to use for @@ -196,6 +201,7 @@ public class LibraryItemProvider * <!-- end-user-doc --> * @generated */ + @Override public Object getImage(Object object) { return overlayImage(object, getResourceLocator().getImage("full/obj16/Library")); //$NON-NLS-1$ @@ -207,6 +213,7 @@ public class LibraryItemProvider * <!-- end-user-doc --> * @generated */ + @Override public String getText(Object object) { String label = ((Library)object).getName(); @@ -222,6 +229,7 @@ public class LibraryItemProvider * <!-- end-user-doc --> * @generated */ + @Override public void notifyChanged(Notification notification) { updateChildren(notification); @@ -250,7 +258,8 @@ public class LibraryItemProvider * <!-- end-user-doc --> * @generated */ - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) + @Override + protected void collectNewChildDescriptors(Collection<CommandParameter> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); @@ -296,6 +305,7 @@ public class LibraryItemProvider * <!-- end-user-doc --> * @generated */ + @Override public ResourceLocator getResourceLocator() { return EXTLibraryEditPlugin.INSTANCE; diff --git a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/PeriodicalItemProvider.java b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/PeriodicalItemProvider.java index 844249b6f..4c8e80540 100644 --- a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/PeriodicalItemProvider.java +++ b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/PeriodicalItemProvider.java @@ -1,7 +1,7 @@ /** * <copyright> * - * Copyright (c) 2005 IBM Corporation and others. + * Copyright (c) 2005-2006 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 @@ -12,7 +12,7 @@ * * </copyright> * - * $Id: PeriodicalItemProvider.java,v 1.3 2006/05/15 22:06:35 emerks Exp $ + * $Id: PeriodicalItemProvider.java,v 1.4 2006/12/29 18:27:35 marcelop Exp $ */ package org.eclipse.emf.examples.extlibrary.provider; @@ -25,9 +25,11 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.ResourceLocator; +import org.eclipse.emf.edit.command.CommandParameter; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; @@ -69,7 +71,8 @@ public class PeriodicalItemProvider * <!-- end-user-doc --> * @generated */ - public List getPropertyDescriptors(Object object) + @Override + public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) { @@ -133,6 +136,7 @@ public class PeriodicalItemProvider * <!-- end-user-doc --> * @generated */ + @Override public String getText(Object object) { String label = ((Periodical)object).getTitle(); @@ -148,6 +152,7 @@ public class PeriodicalItemProvider * <!-- end-user-doc --> * @generated */ + @Override public void notifyChanged(Notification notification) { updateChildren(notification); @@ -169,7 +174,8 @@ public class PeriodicalItemProvider * <!-- end-user-doc --> * @generated */ - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) + @Override + protected void collectNewChildDescriptors(Collection<CommandParameter> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); } @@ -180,6 +186,7 @@ public class PeriodicalItemProvider * <!-- end-user-doc --> * @generated */ + @Override public ResourceLocator getResourceLocator() { return EXTLibraryEditPlugin.INSTANCE; diff --git a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/PersonItemProvider.java b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/PersonItemProvider.java index 6b33e51b3..0007f5870 100644 --- a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/PersonItemProvider.java +++ b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/PersonItemProvider.java @@ -1,7 +1,7 @@ /** * <copyright> * - * Copyright (c) 2005 IBM Corporation and others. + * Copyright (c) 2005-2006 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 @@ -12,7 +12,7 @@ * * </copyright> * - * $Id: PersonItemProvider.java,v 1.4 2006/05/15 22:06:35 emerks Exp $ + * $Id: PersonItemProvider.java,v 1.5 2006/12/29 18:27:35 marcelop Exp $ */ package org.eclipse.emf.examples.extlibrary.provider; @@ -25,9 +25,11 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.ResourceLocator; +import org.eclipse.emf.edit.command.CommandParameter; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; @@ -70,7 +72,8 @@ public class PersonItemProvider * <!-- end-user-doc --> * @generated */ - public List getPropertyDescriptors(Object object) + @Override + public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) { @@ -158,6 +161,7 @@ public class PersonItemProvider * <!-- end-user-doc --> * @generated */ + @Override public Object getImage(Object object) { return overlayImage(object, getResourceLocator().getImage("full/obj16/Person")); //$NON-NLS-1$ @@ -169,6 +173,7 @@ public class PersonItemProvider * <!-- end-user-doc --> * @generated */ + @Override public String getText(Object object) { String label = ((Person)object).getLastName(); @@ -184,6 +189,7 @@ public class PersonItemProvider * <!-- end-user-doc --> * @generated */ + @Override public void notifyChanged(Notification notification) { updateChildren(notification); @@ -206,7 +212,8 @@ public class PersonItemProvider * <!-- end-user-doc --> * @generated */ - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) + @Override + protected void collectNewChildDescriptors(Collection<CommandParameter> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); } @@ -217,6 +224,7 @@ public class PersonItemProvider * <!-- end-user-doc --> * @generated */ + @Override public ResourceLocator getResourceLocator() { return EXTLibraryEditPlugin.INSTANCE; diff --git a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/VideoCassetteItemProvider.java b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/VideoCassetteItemProvider.java index c374a47ae..38efcf680 100644 --- a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/VideoCassetteItemProvider.java +++ b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/VideoCassetteItemProvider.java @@ -1,7 +1,7 @@ /** * <copyright> * - * Copyright (c) 2005 IBM Corporation and others. + * Copyright (c) 2005-2006 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 @@ -12,7 +12,7 @@ * * </copyright> * - * $Id: VideoCassetteItemProvider.java,v 1.4 2006/05/15 22:06:35 emerks Exp $ + * $Id: VideoCassetteItemProvider.java,v 1.5 2006/12/29 18:27:35 marcelop Exp $ */ package org.eclipse.emf.examples.extlibrary.provider; @@ -25,9 +25,11 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.ResourceLocator; +import org.eclipse.emf.edit.command.CommandParameter; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; @@ -67,7 +69,8 @@ public class VideoCassetteItemProvider * <!-- end-user-doc --> * @generated */ - public List getPropertyDescriptors(Object object) + @Override + public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) { @@ -107,6 +110,7 @@ public class VideoCassetteItemProvider * <!-- end-user-doc --> * @generated */ + @Override public Object getImage(Object object) { return overlayImage(object, getResourceLocator().getImage("full/obj16/VideoCassette")); //$NON-NLS-1$ @@ -118,6 +122,7 @@ public class VideoCassetteItemProvider * <!-- end-user-doc --> * @generated */ + @Override public String getText(Object object) { String label = ((VideoCassette)object).getTitle(); @@ -133,6 +138,7 @@ public class VideoCassetteItemProvider * <!-- end-user-doc --> * @generated */ + @Override public void notifyChanged(Notification notification) { updateChildren(notification); @@ -146,7 +152,8 @@ public class VideoCassetteItemProvider * <!-- end-user-doc --> * @generated */ - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) + @Override + protected void collectNewChildDescriptors(Collection<CommandParameter> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); } @@ -157,6 +164,7 @@ public class VideoCassetteItemProvider * <!-- end-user-doc --> * @generated */ + @Override public ResourceLocator getResourceLocator() { return EXTLibraryEditPlugin.INSTANCE; diff --git a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/WriterItemProvider.java b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/WriterItemProvider.java index f1a11204d..aa6a51dbf 100644 --- a/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/WriterItemProvider.java +++ b/examples/org.eclipse.emf.examples.library.edit/src/org/eclipse/emf/examples/extlibrary/provider/WriterItemProvider.java @@ -1,7 +1,7 @@ /** * <copyright> * - * Copyright (c) 2005 IBM Corporation and others. + * Copyright (c) 2005-2006 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 @@ -12,7 +12,7 @@ * * </copyright> * - * $Id: WriterItemProvider.java,v 1.4 2006/05/15 22:06:35 emerks Exp $ + * $Id: WriterItemProvider.java,v 1.5 2006/12/29 18:27:35 marcelop Exp $ */ package org.eclipse.emf.examples.extlibrary.provider; @@ -25,9 +25,11 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.ResourceLocator; +import org.eclipse.emf.edit.command.CommandParameter; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; @@ -69,7 +71,8 @@ public class WriterItemProvider * <!-- end-user-doc --> * @generated */ - public List getPropertyDescriptors(Object object) + @Override + public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) { @@ -133,6 +136,7 @@ public class WriterItemProvider * <!-- end-user-doc --> * @generated */ + @Override public Object getImage(Object object) { return overlayImage(object, getResourceLocator().getImage("full/obj16/Writer")); //$NON-NLS-1$ @@ -144,6 +148,7 @@ public class WriterItemProvider * <!-- end-user-doc --> * @generated */ + @Override public String getText(Object object) { String label = ((Writer)object).getName(); @@ -159,6 +164,7 @@ public class WriterItemProvider * <!-- end-user-doc --> * @generated */ + @Override public void notifyChanged(Notification notification) { updateChildren(notification); @@ -179,7 +185,8 @@ public class WriterItemProvider * <!-- end-user-doc --> * @generated */ - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) + @Override + protected void collectNewChildDescriptors(Collection<CommandParameter> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); } @@ -190,6 +197,7 @@ public class WriterItemProvider * <!-- end-user-doc --> * @generated */ + @Override public ResourceLocator getResourceLocator() { return EXTLibraryEditPlugin.INSTANCE; |