Attachment #226052 for bug #381818

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

View | Details | Raw Unified | Return to bug 381818
Collapse All | Expand All

Lines 17-22 Link Here

(-)src/org/eclipse/emf/ecp/spi/ui/DefaultUIProvider.java (+15 lines)
17	import org.eclipse.emf.ecore.util.EcoreUtil;	17	import org.eclipse.emf.ecore.util.EcoreUtil;
18	import org.eclipse.emf.ecp.core.ECPProject;	18	import org.eclipse.emf.ecp.core.ECPProject;
19	import org.eclipse.emf.ecp.core.ECPProviderRegistry;	19	import org.eclipse.emf.ecp.core.ECPProviderRegistry;
		20	import org.eclipse.emf.ecp.core.ECPRepository;
20	import org.eclipse.emf.ecp.core.util.ECPCheckoutSource;	21	import org.eclipse.emf.ecp.core.util.ECPCheckoutSource;
21	import org.eclipse.emf.ecp.core.util.ECPModelContext;	22	import org.eclipse.emf.ecp.core.util.ECPModelContext;
22	import org.eclipse.emf.ecp.core.util.ECPProperties;	23	import org.eclipse.emf.ecp.core.util.ECPProperties;
Lines 63-68 Link Here
63	* @author Eugen Neufeld	64	* @author Eugen Neufeld
64	*/	65	*/
65	public class DefaultUIProvider extends Element implements UIProvider {	66	public class DefaultUIProvider extends Element implements UIProvider {
		67
		68	private static final Image PROJECT_OPEN = Activator.getImage("icons/project_open.gif"); //$NON-NLS-1$
		69	private static final Image PROJECT_CLOSED = Activator.getImage("icons/project_closed.gif"); //$NON-NLS-1$
		70	private static final Image REPOSITORY = Activator.getImage("icons/repository.gif"); //$NON-NLS-1$
		71
66	private final Disposable disposable = new Disposable(this) {	72	private final Disposable disposable = new Disposable(this) {
67	@Override	73	@Override
68	protected void doDispose() {	74	protected void doDispose() {
Lines 158-163 Link Here
158	}	164	}
159		165
160	public Image getImage(Object element) {	166	public Image getImage(Object element) {
		167	if (element instanceof ECPProject) {
		168	ECPProject project = (ECPProject) element;
		169	return project.isOpen() ? PROJECT_OPEN : PROJECT_CLOSED;
		170	}
		171
		172	if (element instanceof ECPRepository) {
		173	return REPOSITORY;
		174	}
		175
161	return UIProvider.EMF_LABEL_PROVIDER.getImage(element);	176	return UIProvider.EMF_LABEL_PROVIDER.getImage(element);
162	}	177	}
163		178




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);

		}

		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 {




 * 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.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 RepositoriesLabelProvider(ECPModelContextProvider modelContextProvider) {
		super(modelContextProvider);
	}
  }

	@Override
	public String getText(Object element) {
		if (element instanceof ECPRepository) {
			ECPRepository repository = (ECPRepository) element;
			return repository.getLabel();
		}
      return repository.getLabel();
    }

		return super.getText(element);
	}

  @Override
  public Image getImage(Object element)
  {
    if (element instanceof ECPRepository)
    {
      return REPOSITORY;
    }

    return super.getImage(element);
  }
}

Return to bug 381818

Lines 13-30 Link Here

(-)src/org/eclipse/emf/ecp/ui/model/ModelLabelProvider.java (-15 lines)
13	import org.eclipse.emf.ecp.core.ECPProjectManager;	13	import org.eclipse.emf.ecp.core.ECPProjectManager;
14	import org.eclipse.emf.ecp.core.util.ECPModelContextProvider;	14	import org.eclipse.emf.ecp.core.util.ECPModelContextProvider;
15	import org.eclipse.emf.ecp.core.util.observer.IECPProjectsChangedUIObserver;	15	import org.eclipse.emf.ecp.core.util.observer.IECPProjectsChangedUIObserver;
16	import org.eclipse.emf.ecp.internal.ui.Activator;
17		16
18	import org.eclipse.jface.viewers.LabelProviderChangedEvent;	17	import org.eclipse.jface.viewers.LabelProviderChangedEvent;
19	import org.eclipse.swt.graphics.Image;
20		18
21	/**	19	/**
22	* @author Eike Stepper	20	* @author Eike Stepper
23	*/	21	*/
24	public class ModelLabelProvider extends ECPLabelProvider implements IECPProjectsChangedUIObserver {	22	public class ModelLabelProvider extends ECPLabelProvider implements IECPProjectsChangedUIObserver {
25	private static final Image PROJECT_OPEN = Activator.getImage("icons/project_open.gif"); //$NON-NLS-1$
26
27	private static final Image PROJECT_CLOSED = Activator.getImage("icons/project_closed.gif"); //$NON-NLS-1$
28		23
29	public ModelLabelProvider(ECPModelContextProvider modelContextProvider) {	24	public ModelLabelProvider(ECPModelContextProvider modelContextProvider) {
30	super(modelContextProvider);	25	super(modelContextProvider);
Lines 44-59 Link Here
44	}	39	}
45		40
46	return super.getText(element);	41	return super.getText(element);
47	}
48
49	@Override
50	public Image getImage(Object element) {
51	if (element instanceof ECPProject) {
52	ECPProject project = (ECPProject) element;
53	return project.isOpen() ? PROJECT_OPEN : PROJECT_CLOSED;
54	}
55
56	return super.getImage(element);
57	}	42	}
58		43
59	public void projectsChanged(ECPProject[] oldProjects, ECPProject[] newProjects) throws Exception {	44	public void projectsChanged(ECPProject[] oldProjects, ECPProject[] newProjects) throws Exception {

Lines 4-53 Link Here

(-)src/org/eclipse/emf/ecp/ui/model/RepositoriesLabelProvider.java (-33 / +13 lines)
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html	6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:	7	* Contributors:
9	* Eike Stepper - initial API and implementation	8	* Eike Stepper - initial API and implementation
10	*/	9	*/
11	package org.eclipse.emf.ecp.ui.model;	10	package org.eclipse.emf.ecp.ui.model;
12		11
13	import org.eclipse.emf.ecp.core.ECPRepository;	12	import org.eclipse.emf.ecp.core.ECPRepository;
14	import org.eclipse.emf.ecp.core.util.ECPModelContextProvider;	13	import org.eclipse.emf.ecp.core.util.ECPModelContextProvider;
15	import org.eclipse.emf.ecp.internal.ui.Activator;
16
17	import org.eclipse.swt.graphics.Image;
18		14
19	/**	15	/**
20	* @author Eike Stepper	16	* @author Eike Stepper
21	*/	17	*/
22	public class RepositoriesLabelProvider extends ECPLabelProvider	18	public class RepositoriesLabelProvider extends ECPLabelProvider {
23	{
24	private static final Image REPOSITORY = Activator.getImage("icons/repository.gif"); //$NON-NLS-1$
25		19
26	public RepositoriesLabelProvider(ECPModelContextProvider modelContextProvider)	20	public RepositoriesLabelProvider(ECPModelContextProvider modelContextProvider) {
27	{	21	super(modelContextProvider);
28	super(modelContextProvider);	22	}
29	}
30		23
31	@Override	24	@Override
32	public String getText(Object element)	25	public String getText(Object element) {
33	{	26	if (element instanceof ECPRepository) {
34	if (element instanceof ECPRepository)	27	ECPRepository repository = (ECPRepository) element;
35	{	28	return repository.getLabel();
36	ECPRepository repository = (ECPRepository)element;	29	}
37	return repository.getLabel();
38	}
39		30
40	return super.getText(element);	31	return super.getText(element);
41	}	32	}
42
43	@Override
44	public Image getImage(Object element)
45	{
46	if (element instanceof ECPRepository)
47	{
48	return REPOSITORY;
49	}
50
51	return super.getImage(element);
52	}
53	}	33	}