Attachment 226052 Details for Bug 381818 – different images for different providers

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] different images for different providers

image.patch (text/plain), 5.08 KB, created by Tobias Verhoeven

on 2013-01-24 10:35:38 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Verhoeven

Created: 2013-01-24 10:35:38 EST

Size: 5.08 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.emf.ecp.ui
>diff --git src/org/eclipse/emf/ecp/spi/ui/DefaultUIProvider.java src/org/eclipse/emf/ecp/spi/ui/DefaultUIProvider.java
>index 2a3257d..189c948 100644
>--- src/org/eclipse/emf/ecp/spi/ui/DefaultUIProvider.java
>+++ src/org/eclipse/emf/ecp/spi/ui/DefaultUIProvider.java
>@@ -17,6 +17,7 @@
> import org.eclipse.emf.ecore.util.EcoreUtil;
> import org.eclipse.emf.ecp.core.ECPProject;
> import org.eclipse.emf.ecp.core.ECPProviderRegistry;
>+import org.eclipse.emf.ecp.core.ECPRepository;
> import org.eclipse.emf.ecp.core.util.ECPCheckoutSource;
> import org.eclipse.emf.ecp.core.util.ECPModelContext;
> import org.eclipse.emf.ecp.core.util.ECPProperties;
>@@ -63,6 +64,11 @@
>  * @author Eugen Neufeld
>  */
> public class DefaultUIProvider extends Element implements UIProvider {
>+
>+	private static final Image PROJECT_OPEN = Activator.getImage("icons/project_open.gif"); //$NON-NLS-1$
>+	private static final Image PROJECT_CLOSED = Activator.getImage("icons/project_closed.gif"); //$NON-NLS-1$
>+	private static final Image REPOSITORY = Activator.getImage("icons/repository.gif"); //$NON-NLS-1$
>+
> 	private final Disposable disposable = new Disposable(this) {
> 		@Override
> 		protected void doDispose() {
>@@ -158,6 +164,15 @@
> 	}
> 
> 	public Image getImage(Object element) {
>+		if (element instanceof ECPProject) {
>+			ECPProject project = (ECPProject) element;
>+			return project.isOpen() ? PROJECT_OPEN : PROJECT_CLOSED;
>+		}
>+
>+		if (element instanceof ECPRepository) {
>+			return REPOSITORY;
>+		}
>+
> 		return UIProvider.EMF_LABEL_PROVIDER.getImage(element);
> 	}
> 
>diff --git src/org/eclipse/emf/ecp/ui/model/ModelLabelProvider.java src/org/eclipse/emf/ecp/ui/model/ModelLabelProvider.java
>index 255880a..0baef4b 100644
>--- src/org/eclipse/emf/ecp/ui/model/ModelLabelProvider.java
>+++ src/org/eclipse/emf/ecp/ui/model/ModelLabelProvider.java
>@@ -13,18 +13,13 @@
> import org.eclipse.emf.ecp.core.ECPProjectManager;
> import org.eclipse.emf.ecp.core.util.ECPModelContextProvider;
> import org.eclipse.emf.ecp.core.util.observer.IECPProjectsChangedUIObserver;
>-import org.eclipse.emf.ecp.internal.ui.Activator;
> 
> import org.eclipse.jface.viewers.LabelProviderChangedEvent;
>-import org.eclipse.swt.graphics.Image;
> 
> /**
>  * @author Eike Stepper
>  */
> public class ModelLabelProvider extends ECPLabelProvider implements IECPProjectsChangedUIObserver {
>-	private static final Image PROJECT_OPEN = Activator.getImage("icons/project_open.gif"); //$NON-NLS-1$
>-
>-	private static final Image PROJECT_CLOSED = Activator.getImage("icons/project_closed.gif"); //$NON-NLS-1$
> 
> 	public ModelLabelProvider(ECPModelContextProvider modelContextProvider) {
> 		super(modelContextProvider);
>@@ -44,16 +39,6 @@
> 		}
> 
> 		return super.getText(element);
>-	}
>-
>-	@Override
>-	public Image getImage(Object element) {
>-		if (element instanceof ECPProject) {
>-			ECPProject project = (ECPProject) element;
>-			return project.isOpen() ? PROJECT_OPEN : PROJECT_CLOSED;
>-		}
>-
>-		return super.getImage(element);
> 	}
> 
> 	public void projectsChanged(ECPProject[] oldProjects, ECPProject[] newProjects) throws Exception {
>diff --git src/org/eclipse/emf/ecp/ui/model/RepositoriesLabelProvider.java src/org/eclipse/emf/ecp/ui/model/RepositoriesLabelProvider.java
>index 12e54fc..a3a29ef 100644
>--- src/org/eclipse/emf/ecp/ui/model/RepositoriesLabelProvider.java
>+++ src/org/eclipse/emf/ecp/ui/model/RepositoriesLabelProvider.java
>@@ -4,50 +4,30 @@
>  * 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
>+ * Eike Stepper - initial API and implementation
>  */
> package org.eclipse.emf.ecp.ui.model;
> 
> import org.eclipse.emf.ecp.core.ECPRepository;
> import org.eclipse.emf.ecp.core.util.ECPModelContextProvider;
>-import org.eclipse.emf.ecp.internal.ui.Activator;
>-
>-import org.eclipse.swt.graphics.Image;
> 
> /**
>  * @author Eike Stepper
>  */
>-public class RepositoriesLabelProvider extends ECPLabelProvider
>-{
>-  private static final Image REPOSITORY = Activator.getImage("icons/repository.gif"); //$NON-NLS-1$
>+public class RepositoriesLabelProvider extends ECPLabelProvider {
> 
>-  public RepositoriesLabelProvider(ECPModelContextProvider modelContextProvider)
>-  {
>-    super(modelContextProvider);
>-  }
>+	public RepositoriesLabelProvider(ECPModelContextProvider modelContextProvider) {
>+		super(modelContextProvider);
>+	}
> 
>-  @Override
>-  public String getText(Object element)
>-  {
>-    if (element instanceof ECPRepository)
>-    {
>-      ECPRepository repository = (ECPRepository)element;
>-      return repository.getLabel();
>-    }
>+	@Override
>+	public String getText(Object element) {
>+		if (element instanceof ECPRepository) {
>+			ECPRepository repository = (ECPRepository) element;
>+			return repository.getLabel();
>+		}
> 
>-    return super.getText(element);
>-  }
>-
>-  @Override
>-  public Image getImage(Object element)
>-  {
>-    if (element instanceof ECPRepository)
>-    {
>-      return REPOSITORY;
>-    }
>-
>-    return super.getImage(element);
>-  }
>+		return super.getText(element);
>+	}
> }

Flags:

eneufeld: iplog+

Actions: View | Diff

Attachments on bug 381818: 226052