diff options
4 files changed, 38 insertions, 7 deletions
diff --git a/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOResource.gif b/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOResource.gif Binary files differindex a3908bcf7b..acd9c16732 100644 --- a/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOResource.gif +++ b/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOResource.gif diff --git a/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOResourceFolder.gif b/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOResourceFolder.gif Binary files differindex 480c478072..aa98255c29 100644 --- a/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOResourceFolder.gif +++ b/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOResourceFolder.gif diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceFolderItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceFolderItemProvider.java index 9a648ee90c..3f5303679f 100644 --- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceFolderItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceFolderItemProvider.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: CDOResourceFolderItemProvider.java,v 1.2 2008-10-19 01:29:03 smcduff Exp $ + * $Id: CDOResourceFolderItemProvider.java,v 1.3 2008-12-06 12:41:41 vroldanbet Exp $ */ package org.eclipse.emf.cdo.eresource.provider; @@ -107,14 +107,24 @@ public class CDOResourceFolderItemProvider extends CDOResourceNodeItemProvider i /** * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc --> * - * @generated + * @generated NOT */ @Override public String getText(Object object) { String label = ((CDOResourceFolder)object).getName(); - return label == null || label.length() == 0 ? getString("_UI_CDOResourceFolder_type") - : getString("_UI_CDOResourceFolder_type") + " " + label; + return label == null || label.length() == 0 ? getString("_UI_CDOResourceFolder_type") + "?" : "/" + label; + } + + /** + * Returns the parent of the folder. Might be another folder, or the root resource + * + * @ADDED + */ + @Override + public Object getParent(Object object) + { + return ((CDOResourceFolder)object).eContainer(); } /** diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceItemProvider.java index 1ff7b4dc5a..115a40b1e8 100644 --- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceItemProvider.java @@ -4,18 +4,18 @@ * 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 - * + * * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ package org.eclipse.emf.cdo.eresource.provider; -import org.eclipse.emf.cdo.common.CDOProtocolConstants; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.eresource.EresourcePackage; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; @@ -194,7 +194,28 @@ public class CDOResourceItemProvider extends CDOResourceNodeItemProvider impleme public String getText(Object object) { CDOResource resource = (CDOResource)object; - return CDOProtocolConstants.PROTOCOL_NAME + ":" + resource.getPath(); + URI uri = resource.getURI(); + return uri == null ? resource.toString() : uri.toString(); + } + + /** + * Returns the parent of the argument CDOResource + * + * @ADDED + * @since 2.0 + */ + @Override + public Object getParent(Object object) + { + CDOResource resource = (CDOResource)object; + if (resource.isRoot()) + { + return resource.getResourceSet(); + } + else + { + return resource.getFolder(); + } } /** |
