Attachment #228485 for bug #403468

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 403468
Collapse All | Expand All




           </objectClass>
        </enablement>
     </decorator>
      <decorator
            adaptable="true"
            class="org.eclipse.emf.ecp.emfstore.internal.ui.decorator.ProjectEMFStoreBranchDecorator"
            id="org.eclipse.emf.ecp.emfstore.ui.decorators.EMFStoreBranchDecorator"
            label="EMFStoreBranch Decorator"
            lightweight="false"
            state="true">
         <enablement>
            <objectClass
                  name="org.eclipse.emf.ecp.core.ECPProject">
            </objectClass>
         </enablement>
         <description>
            Show branch and version if shared
         </description>
      </decorator>
   </extension>
   <extension
         point="org.eclipse.core.expressions.propertyTesters">

            commitObserver="org.eclipse.emf.ecp.emfstore.internal.ui.decorator.EMFStoreDirtyDecorator">
      </observer>
   </extension>
                <extension
                      point="org.eclipse.emf.emfstore.client.shareObserver">
                   <observer
                         shareObserver="org.eclipse.emf.ecp.emfstore.internal.ui.decorator.ProjectEMFStoreBranchDecorator">
                   </observer>
                </extension>
</plugin>




/**
 * 
 */
package org.eclipse.emf.ecp.emfstore.internal.ui.decorator;

import org.eclipse.emf.ecp.core.ECPProject;
import org.eclipse.emf.ecp.core.ECPProvider;
import org.eclipse.emf.ecp.core.ECPProviderRegistry;
import org.eclipse.emf.ecp.core.util.ECPUtil;
import org.eclipse.emf.ecp.emfstore.core.internal.EMFStoreProvider;
import org.eclipse.emf.ecp.spi.core.InternalProject;
import org.eclipse.emf.emfstore.client.ESLocalProject;
import org.eclipse.emf.emfstore.client.observer.ESShareObserver;
import org.eclipse.emf.emfstore.server.model.versionspec.ESPrimaryVersionSpec;

import org.eclipse.jface.viewers.ILabelDecorator;
import org.eclipse.jface.viewers.ILabelProviderListener;
import org.eclipse.swt.graphics.Image;

/**
 * @author jfaltermeier
 * 
 */
public class ProjectEMFStoreBranchDecorator implements ILabelDecorator, ESShareObserver {

	public void addListener(ILabelProviderListener listener) {
	}

	public void dispose() {
	}

	public boolean isLabelProperty(Object element, String property) {
		return false;
	}

	public void removeListener(ILabelProviderListener listener) {

	}

	public void shareDone(ESLocalProject localProject) {
		decorateText(localProject.getProjectName(), localProject);
	}

	public Image decorateImage(Image image, Object element) {
		return image;
	}

	public String decorateText(String text, Object element) {
		ESLocalProject localProject;
		if (element instanceof ESLocalProject) {
			localProject = (ESLocalProject) element;
		} else if (element instanceof ECPProject) {
			ECPProvider ecpProvider = ECPProviderRegistry.INSTANCE.getProvider(EMFStoreProvider.NAME);
			EMFStoreProvider provider = (EMFStoreProvider) ECPUtil.getResolvedElement(ecpProvider);
			InternalProject project = (InternalProject) element;
			localProject = provider.getProjectSpace(project);
		} else {
			return text;
		}

		if (localProject == null) {
			return text;
		}

		if (localProject.isShared()) {
			ESPrimaryVersionSpec versSpec;
			try {
				versSpec = localProject.getBaseVersion();
				return text + " [" + versSpec.getBranch() + ", Version " + versSpec.getIdentifier() + "]";
			} catch (NullPointerException e) {
				// possible npe because share is async. -> shareobserver
			}

		}
		return text;
	}

}




/**
 * 
 */
package org.eclipse.emf.ecp.emfstore.internal.ui.decorator;

import org.eclipse.emf.ecp.emfstore.core.internal.EMFStoreProjectWrapper;
import org.eclipse.emf.emfstore.client.ESRemoteProject;
import org.eclipse.emf.emfstore.server.exceptions.ESException;
import org.eclipse.emf.emfstore.server.model.ESBranchInfo;
import org.eclipse.emf.emfstore.server.model.versionspec.ESPrimaryVersionSpec;

import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.viewers.IDecoration;
import org.eclipse.jface.viewers.ILabelProviderListener;
import org.eclipse.jface.viewers.ILightweightLabelDecorator;

import java.util.List;

/**
 * Optional decorator. Not used in extension point
 * 
 * @author jfaltermeier
 * 
 */
public class RepositoryViewBranchDecorator implements ILightweightLabelDecorator {

	public void addListener(ILabelProviderListener listener) {
	}

	public void dispose() {
	}

	public boolean isLabelProperty(Object element, String property) {
		return false;
	}

	public void removeListener(ILabelProviderListener listener) {
	}

	public void decorate(Object element, IDecoration decoration) {
		if (element instanceof EMFStoreProjectWrapper) {
			EMFStoreProjectWrapper wrapper = (EMFStoreProjectWrapper) element;
			ESRemoteProject remoteProject = wrapper.getCheckoutData();

			if (remoteProject == null) {
				return;
			}

			try {
				List<ESBranchInfo> branches = remoteProject.getBranches(new NullProgressMonitor());
				for (ESBranchInfo bi : branches) {
					ESPrimaryVersionSpec versSpec = bi.getHead();
					decoration.addSuffix(" [" + versSpec.getBranch() + ", v" + versSpec.getIdentifier() + "]");
				}
			} catch (ESException ex) {
			}
		} else {
			return;
		}
	}
}

Lines 38-43 Link Here

(-)src/org/eclipse/emf/ecp/emfstore/internal/ui/handler/CreateBranchHandler.java (+1 lines)
38	ESLocalProject projectSpace = EMFStoreProvider.INSTANCE.getProjectSpace(project);	38	ESLocalProject projectSpace = EMFStoreProvider.INSTANCE.getProjectSpace(project);
39	// TODO EMFStore constructor missing	39	// TODO EMFStore constructor missing
40	new UICreateBranchController(HandlerUtil.getActiveShell(event), projectSpace).execute();	40	new UICreateBranchController(HandlerUtil.getActiveShell(event), projectSpace).execute();
		41	project.notifyObjectsChanged(new Object[] { project }, false);
41	return null;	42	return null;
42	}	43	}
43		44

Return to bug 403468

Lines 805-810 Link Here

(-)plugin.xml (+22 lines)
805	</objectClass>	805	</objectClass>
806	</enablement>	806	</enablement>
807	</decorator>	807	</decorator>
		808	<decorator
		809	adaptable="true"
		810	class="org.eclipse.emf.ecp.emfstore.internal.ui.decorator.ProjectEMFStoreBranchDecorator"
		811	id="org.eclipse.emf.ecp.emfstore.ui.decorators.EMFStoreBranchDecorator"
		812	label="EMFStoreBranch Decorator"
		813	lightweight="false"
		814	state="true">
		815	<enablement>
		816	<objectClass
		817	name="org.eclipse.emf.ecp.core.ECPProject">
		818	</objectClass>
		819	</enablement>
		820	<description>
		821	Show branch and version if shared
		822	</description>
		823	</decorator>
808	</extension>	824	</extension>
809	<extension	825	<extension
810	point="org.eclipse.core.expressions.propertyTesters">	826	point="org.eclipse.core.expressions.propertyTesters">
Lines 861-864 Link Here
861	commitObserver="org.eclipse.emf.ecp.emfstore.internal.ui.decorator.EMFStoreDirtyDecorator">	877	commitObserver="org.eclipse.emf.ecp.emfstore.internal.ui.decorator.EMFStoreDirtyDecorator">
862	</observer>	878	</observer>
863	</extension>	879	</extension>
		880	<extension
		881	point="org.eclipse.emf.emfstore.client.shareObserver">
		882	<observer
		883	shareObserver="org.eclipse.emf.ecp.emfstore.internal.ui.decorator.ProjectEMFStoreBranchDecorator">
		884	</observer>
		885	</extension>
864	</plugin>	886	</plugin>

Added Link Here

(-)src/org/eclipse/emf/ecp/emfstore/internal/ui/decorator/ProjectEMFStoreBranchDecorator.java (+78 lines)
1	/**
2	*
3	*/
4	package org.eclipse.emf.ecp.emfstore.internal.ui.decorator;
5
6	import org.eclipse.emf.ecp.core.ECPProject;
7	import org.eclipse.emf.ecp.core.ECPProvider;
8	import org.eclipse.emf.ecp.core.ECPProviderRegistry;
9	import org.eclipse.emf.ecp.core.util.ECPUtil;
10	import org.eclipse.emf.ecp.emfstore.core.internal.EMFStoreProvider;
11	import org.eclipse.emf.ecp.spi.core.InternalProject;
12	import org.eclipse.emf.emfstore.client.ESLocalProject;
13	import org.eclipse.emf.emfstore.client.observer.ESShareObserver;
14	import org.eclipse.emf.emfstore.server.model.versionspec.ESPrimaryVersionSpec;
15
16	import org.eclipse.jface.viewers.ILabelDecorator;
17	import org.eclipse.jface.viewers.ILabelProviderListener;
18	import org.eclipse.swt.graphics.Image;
19
20	/**
21	* @author jfaltermeier
22	*
23	*/
24	public class ProjectEMFStoreBranchDecorator implements ILabelDecorator, ESShareObserver {
25
26	public void addListener(ILabelProviderListener listener) {
27	}
28
29	public void dispose() {
30	}
31
32	public boolean isLabelProperty(Object element, String property) {
33	return false;
34	}
35
36	public void removeListener(ILabelProviderListener listener) {
37
38	}
39
40	public void shareDone(ESLocalProject localProject) {
41	decorateText(localProject.getProjectName(), localProject);
42	}
43
44	public Image decorateImage(Image image, Object element) {
45	return image;
46	}
47
48	public String decorateText(String text, Object element) {
49	ESLocalProject localProject;
50	if (element instanceof ESLocalProject) {
51	localProject = (ESLocalProject) element;
52	} else if (element instanceof ECPProject) {
53	ECPProvider ecpProvider = ECPProviderRegistry.INSTANCE.getProvider(EMFStoreProvider.NAME);
54	EMFStoreProvider provider = (EMFStoreProvider) ECPUtil.getResolvedElement(ecpProvider);
55	InternalProject project = (InternalProject) element;
56	localProject = provider.getProjectSpace(project);
57	} else {
58	return text;
59	}
60
61	if (localProject == null) {
62	return text;
63	}
64
65	if (localProject.isShared()) {
66	ESPrimaryVersionSpec versSpec;
67	try {
68	versSpec = localProject.getBaseVersion();
69	return text + " [" + versSpec.getBranch() + ", Version " + versSpec.getIdentifier() + "]";
70	} catch (NullPointerException e) {
71	// possible npe because share is async. -> shareobserver
72	}
73
74	}
75	return text;
76	}
77
78	}