Attachment #51672 for bug #160221

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




import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.hyades.test.ui.TestUIConstants;
import org.eclipse.hyades.test.ui.TestUIImages;
import org.eclipse.hyades.test.ui.navigator.IPersistableProxyNode;
import org.eclipse.hyades.test.ui.navigator.IProxyNode;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.IMemento;


 * @author jgout
 * @since 3.2
 */
public class ExecutionFileProxyNode extends EMFResourceProxyNode {
		
	public ExecutionFileProxyNode(IFile file, Resource resource) {
		super(file, resource);
	}
	
	public ExecutionFileProxyNode(IFile file, IMemento memento) {
		super(file, memento);
	}

	public Image getImage() {
		return TestUIImages.INSTANCE.getImage(TestUIImages.IMG_EXECUTION);
	}
	
	protected String getNodeKind() {
    	return TestUIConstants.EXECUTION_FILE_NODE;
    }

	public boolean saveState(IMemento memento) { 
		//- data to retrieve the correct object 
		memento.putString(TestUIConstants.TAG_NODE_KIND, TestUIConstants.EXECUTION_FILE_NODE);
		//- data from EMFResourceProxyNode
		memento.putString(TestUIConstants.TAG_NAME, getText());
		IProxyNode [] children = getChildren();
		for (int i = 0; i < children.length; i++) {
			if(!saveChildState(memento, children[i])) {
				return false;
			}
		}
		return true;
	}
}

Lines 22-29 Link Here

(-)src/org/eclipse/hyades/test/ui/internal/navigator/proxy/DefaultExecutionResultProxyNode.java (-35 / +52 lines)
22	import org.eclipse.hyades.models.common.testprofile.TPFExecutionResult;	22	import org.eclipse.hyades.models.common.testprofile.TPFExecutionResult;
23	import org.eclipse.hyades.models.common.testprofile.TPFInvocationEvent;	23	import org.eclipse.hyades.models.common.testprofile.TPFInvocationEvent;
24	import org.eclipse.hyades.models.common.testprofile.TPFTest;	24	import org.eclipse.hyades.models.common.testprofile.TPFTest;
25	import org.eclipse.hyades.models.common.testprofile.TPFTestSuite;
26	import org.eclipse.hyades.test.core.util.EMFUtil;
27	import org.eclipse.hyades.test.ui.TestUIConstants;	25	import org.eclipse.hyades.test.ui.TestUIConstants;
28	import org.eclipse.hyades.test.ui.TestUIImages;	26	import org.eclipse.hyades.test.ui.TestUIImages;
29	import org.eclipse.hyades.test.ui.internal.model.EventUtil;	27	import org.eclipse.hyades.test.ui.internal.model.EventUtil;
Lines 39-50 Link Here
39		37
40	/**	38	/**
41	* @author jgout	39	* @author jgout
		40	* @author jcanches
42	* @since 3.2	41	* @since 3.2
43	*/	42	*/
44	public class DefaultExecutionResultProxyNode extends TypedElementProxyNode implements IExecutionResultProxyNode, IPersistableProxyNode {	43	public class DefaultExecutionResultProxyNode extends TypedElementProxyNode implements IExecutionResultProxyNode, IPersistableProxyNode {
45		44
		45	private final static String TAG_VERDICT = "verdict"; //$NON-NLS-1$
		46	private final static String TAG_TIMESTAMP = "timestamp"; //$NON-NLS-1$
		47
46	private IProxyNode[] children;	48	private IProxyNode[] children;
47	private int verdict;	49	private int verdict;
		50	private long timestamp;
		51	private String cachedName;
48		52
49	/**	53	/**
50	* @param er	54	* @param er
Lines 53-59 Link Here
53	public DefaultExecutionResultProxyNode(TPFExecutionResult er, Object parent) {	57	public DefaultExecutionResultProxyNode(TPFExecutionResult er, Object parent) {
54	super(er, parent);	58	super(er, parent);
55		59
56	String name;
57	LinkedList c = new LinkedList();	60	LinkedList c = new LinkedList();
58	TPFExecutionHistory history = er.getExecutionHistory();	61	TPFExecutionHistory history = er.getExecutionHistory();
59	if (history != null ) {	62	if (history != null ) {
Lines 64-106 Link Here
64	}	67	}
65	children = (IProxyNode[]) c.toArray(new IProxyNode[c.size()]);	68	children = (IProxyNode[]) c.toArray(new IProxyNode[c.size()]);
66	//- save the name of this element	69	//- save the name of this element
67	if(er.getName() != null) {	70	String name = er.getName();
68	name = er.getName();	71	String testName = null;
		72	TPFTest test = er.getTest();
		73	if(test != null) {
		74	testName = test.getName();
		75	}
		76	if (name != null) {
		77	if (testName != null && !testName.equals(name)) {
		78	name += " [" + testName + "]"; //$NON-NLS-1$//$NON-NLS-2$
		79	}
69	} else {	80	} else {
70	name = "unamed"; //$NON-NLS-1$	81	if (testName != null) {
71	}	82	name = testName;
72	TPFTest test = er.getTest();	83	}
73	if((er.getTest() != null) && (((er.getTest()).getName()) != null)) {
74	if (test instanceof TPFTestSuite) {
75	if (er.getExecutionHistory().getExecutionEvents()!=null && er.getExecutionHistory().getExecutionEvents().size()>0) {
76	long timeStamp = ((TPFExecutionEvent)er.getExecutionHistory().getExecutionEvents().get(0)).getTimestamp();
77	String dateStamp = EventUtil.getTime(timeStamp);
78	name += " ["+dateStamp+"]"; //$NON-NLS-1$//$NON-NLS-2$
79	}
80	} else {
81	name += " [" + (er.getTest()).getName() + "]"; //$NON-NLS-1$ //$NON-NLS-2$
82	}
83	}	84	}
84	setName(name);	85	setName(name);
		86	if (!(parent instanceof IExecutionResultProxyNode)) {
		87	if (er.getExecutionHistory().getExecutionEvents() != null && er.getExecutionHistory().getExecutionEvents().size()>0) {
		88	timestamp = ((TPFExecutionEvent)er.getExecutionHistory().getExecutionEvents().get(0)).getTimestamp();
		89	}
		90	}
85	verdict = er.getVerdict().getValue();	91	verdict = er.getVerdict().getValue();
86	}	92	}
87		93
88	public DefaultExecutionResultProxyNode(IMemento memento, Object parent) {	94	public DefaultExecutionResultProxyNode(IMemento memento, Object parent) {
89	super(memento, parent);	95	super(memento, parent);
90	Integer v = memento.getInteger(TestUIConstants.TAG_VERDICT);	96	Integer v = memento.getInteger(TAG_VERDICT);
91	if(v == null) {	97	String l = memento.getString(TAG_TIMESTAMP);
		98	if(v == null \|\| l == null) {
92	//- old memento, we need to rebuild the proxy from execution file	99	//- old memento, we need to rebuild the proxy from execution file
93	throw new ProxyNeedToBeRebuiltException();	100	throw new ProxyNeedToBeRebuiltException();
94	} else {	101	} else {
95	verdict = v.intValue();	102	verdict = v.intValue();
96	}	103	}
		104	try {
		105	timestamp = Long.parseLong(l);
		106	} catch (NumberFormatException e) {
		107	timestamp = 0L;
		108	}
97	IMemento [] childrenMemento = memento.getChildren(TestUIConstants.TAG_CHILD);	109	IMemento [] childrenMemento = memento.getChildren(TestUIConstants.TAG_CHILD);
98	LinkedList execChildren = new LinkedList();	110	LinkedList execChildren = new LinkedList();
99	for (int i = 0; i < childrenMemento.length; i++) {	111	for (int i = 0; i < childrenMemento.length; i++) {
100	IMemento mementoChild = childrenMemento[i];	112	IMemento mementoChild = childrenMemento[i];
101	//- inherit the TAG_URI_ROOT which is an extra data contained by the parent	113	//- inherit the TAG_URI_ROOT which is an extra data contained by the parent
102	mementoChild.putString(TestUIConstants.TAG_URI_ROOT, memento.getString(TestUIConstants.TAG_URI_ROOT));	114	mementoChild.putString(TestUIConstants.TAG_URI_ROOT, memento.getString(TestUIConstants.TAG_URI_ROOT));
103	String type = mementoChild.getString(TestUIConstants.TAG_TYPE);	115	String type = getType();
104	if(type == null) {	116	if(type == null) {
105	throw new ProxyNeedToBeRebuiltException();	117	throw new ProxyNeedToBeRebuiltException();
106	}	118	}
Lines 133-138 Link Here
133	}	145	}
134	}	146	}
135		147
		148	public String getText() {
		149	if (timestamp != 0L) {
		150	if (cachedName == null) {
		151	String dateStamp = EventUtil.getTime(timestamp);
		152	cachedName = super.getText() + " ["+dateStamp+"]"; //$NON-NLS-1$//$NON-NLS-2$
		153	}
		154	return cachedName;
		155	}
		156	return super.getText();
		157	}
		158
136	public Image getImage() {	159	public Image getImage() {
137	return TestUIImages.INSTANCE.getImage(TestUIImages.IMG_EXECUTION);	160	return TestUIImages.INSTANCE.getImage(TestUIImages.IMG_EXECUTION);
138	}	161	}
Lines 142-148 Link Here
142	}	165	}
143		166
144	public TPFExecutionResult getExecutionResult() {	167	public TPFExecutionResult getExecutionResult() {
145	EObject exec = EMFUtil.getResourceSet().getEObject(getOriginatorURI(), true);	168	EObject exec = super.getEObject();
146	if (exec instanceof TPFExecutionResult) {	169	if (exec instanceof TPFExecutionResult) {
147	return (TPFExecutionResult) exec;	170	return (TPFExecutionResult) exec;
148	} else {	171	} else {
Lines 154-173 Link Here
154	return verdict;	177	return verdict;
155	}	178	}
156		179
157	public String getFactoryID() {	180	protected String getNodeKind() {
158	return "EMFResourceProxyFactory"; //$NON-NLS-1$	181	return TestUIConstants.EXECUTION_RESULT_NODE;
159	}	182	}
160		183
161	public boolean saveState(IMemento memento) {	184	public boolean saveState(IMemento memento) {
162	//- data to retrieve the correct object	185	//- data to retrieve the correct object
163	memento.putString(TestUIConstants.TAG_NODE_KIND, TestUIConstants.EXECUTION_RESULT_NODE);	186	memento.putInteger(TAG_VERDICT, getVerdict());
164	memento.putInteger(TestUIConstants.TAG_VERDICT, getVerdict());	187	memento.putString(TAG_TIMESTAMP, Long.toString(timestamp));
165	//- data from TypedElementProxyNode
166	memento.putString(TestUIConstants.TAG_TYPE, getType());
167	//- data from CMNNamedElementProxyNode
168	memento.putString(TestUIConstants.TAG_NAME, getText());
169	//- data from EObjectProxyNode
170	memento.putString(TestUIConstants.TAG_URI_FRAGMENT, getOriginatorURI().fragment());
171	//- children (testcases)	188	//- children (testcases)
172	for (int i = 0; i < children.length; i++) {	189	for (int i = 0; i < children.length; i++) {
173	DefaultExecutionResultProxyNode child = (DefaultExecutionResultProxyNode)children[i];	190	DefaultExecutionResultProxyNode child = (DefaultExecutionResultProxyNode)children[i];
Lines 176-182 Link Here
176	return false;	193	return false;
177	}	194	}
178	}	195	}
179	return true;	196	return super.saveState(memento);
180	}	197	}
181		198
182		199

Lines 29-36 Link Here

(-)src/org/eclipse/hyades/test/ui/internal/navigator/proxy/EMFResourceProxyNode.java (-3 / +25 lines)
29	* @author jgout	29	* @author jgout
30	* @since 3.2	30	* @since 3.2
31	*/	31	*/
32	public class EMFResourceProxyNode extends FileProxyNode {	32	public abstract class EMFResourceProxyNode extends FileProxyNode implements IPersistableProxyNode {
33		33
		34	private static final String TAG_NAME = "name"; //$NON-NLS-1$
		35
34	private List children;	36	private List children;
35	private String name;	37	private String name;
36		38
Lines 55-65 Link Here
55	name = name.substring(0, name.length()-(file.getFileExtension().length()+1));	57	name = name.substring(0, name.length()-(file.getFileExtension().length()+1));
56	}	58	}
57		59
58	public EMFResourceProxyNode(IFile file, String name, IMemento [] childrenState) {	60	public EMFResourceProxyNode(IFile file, IMemento rootMemento) {
59	super(file);	61	super(file);
60	this.name = name;	62	this.name = rootMemento.getString(TAG_NAME);
61	children = new LinkedList();	63	children = new LinkedList();
62	IProxyNode child = null;	64	IProxyNode child = null;
		65	IMemento[] childrenState = rootMemento.getChildren(TestUIConstants.TAG_CHILD);
63	for (int i = 0; i < childrenState.length; i++) {	66	for (int i = 0; i < childrenState.length; i++) {
64	IMemento memento = childrenState[i];	67	IMemento memento = childrenState[i];
65	child = HyadesProxyNodeFactory.getInstance().recreate(memento, this);	68	child = HyadesProxyNodeFactory.getInstance().recreate(memento, this);
Lines 96-99 Link Here
96	return super.getAdapter(adapter);	99	return super.getAdapter(adapter);
97	}	100	}
98	}	101	}
		102
		103	public String getFactoryID() {
		104	return EMFResourceProxyFactory.ID;
		105	}
		106
		107	public boolean saveState(IMemento memento) {
		108	memento.putString(TestUIConstants.TAG_NODE_KIND, getNodeKind());
		109	memento.putString(TAG_NAME, getText());
		110	IProxyNode [] children = getChildren();
		111	for (int i = 0; i < children.length; i++) {
		112	if(!saveChildState(memento, children[i])) {
		113	return false;
		114	}
		115	}
		116	return true;
		117	}
		118
		119	protected abstract String getNodeKind();
		120
99	}	121	}




		if (value instanceof IConfigurationElement) {
			//- if the factory has not yet been loaded
			IConfigurationElement element = (IConfigurationElement) value;
			ITypedElementProxyFactory factory = null;
			try {
				ITypedElementProxyFactory factory = null;
				if("factory".equals(element.getName())) { //$NON-NLS-1$
					factory = (ITypedElementProxyFactory)element.createExecutableExtension("class"); //$NON-NLS-1$
				} else {
					//- old extension point
					factory = (ITypedElementProxyFactory)element.createExecutableExtension("factory"); //$NON-NLS-1$
				}
				return factory;
			} catch (CoreException e) {
				UiPlugin.logError(e);
				//- problem building the instance of factory using reflection
				factory = new DefaultTypedElementProxyFactory();
			}
			factories.put(factoryID, factory);
			return factory;
		} else {
			//- the factory has been loaded yet
			if (value instanceof ITypedElementProxyFactory) {




import org.eclipse.hyades.test.ui.navigator.IProxyNode;
import org.eclipse.hyades.test.ui.navigator.ITestCaseProxyNode;
import org.eclipse.hyades.test.ui.navigator.TypedElementProxyNode;
import org.eclipse.hyades.ui.extension.IAssociationConstants;
import org.eclipse.hyades.ui.extension.IAssociationDescriptor;
import org.eclipse.hyades.ui.extension.IAssociationMapping;
import org.eclipse.hyades.ui.internal.extension.AssociationMappingRegistry;

	public DefaultTestCaseProxyNode(TPFTestCase tc, Object parent) {
		super(tc, parent);
		AssociationMappingRegistry registry = (AssociationMappingRegistry)TestUIExtension.getTestCaseMappingRegistry();
		IAssociationMapping associationMapping = registry.getAssociationMapping(IAssociationConstants.EP_TYPE_DESCRIPTIONS);
		descriptor = associationMapping.getDefaultAssociationDescriptor(tc.getType());
	}

	public DefaultTestCaseProxyNode(IMemento memento, Object parent) {
		super(memento, parent);
		AssociationMappingRegistry registry = (AssociationMappingRegistry)TestUIExtension.getTestCaseMappingRegistry();
		IAssociationMapping associationMapping = registry.getAssociationMapping(IAssociationConstants.EP_TYPE_DESCRIPTIONS);
		descriptor = associationMapping.getDefaultAssociationDescriptor(getType());		
	}
	

		}
	}
	
	protected String getNodeKind() {
		return TestUIConstants.TESTCASE_NODE;
	}
	
	public boolean saveState(IMemento memento) {
		//- data to retrieve the correct object 
		memento.putString(TestUIConstants.TAG_NODE_KIND, TestUIConstants.TESTCASE_NODE);
		//- data from TypedElementProxyNode
		memento.putString(TestUIConstants.TAG_TYPE, getType());
		//- data from CMNNamedElementProxyNode
		memento.putString(TestUIConstants.TAG_NAME, getText());
		//- data from EObjectProxyNode
		memento.putString(TestUIConstants.TAG_URI_FRAGMENT, getOriginatorURI().fragment());
		return true;
	}
}





public class FileProxyMarkerPersister implements IFileProxyPersister {

	private static final String TAG_FACTORY_ID = "factoryID"; //$NON-NLS-1$
    private static final String TAG_PROXY_STATE = "proxyState"; //$NON-NLS-1$
    private static final String TAG_LAST_SAVE_STAMP = "lastSaveStamp"; //$NON-NLS-1$
    private static final String MARKER_PROXYSTATE = "org.eclipse.hyades.test.ui.proxyStateMarker"; //$NON-NLS-1$

                //- if this file has changed since last save do not read the saved state
                if(currentModStamp != lastSaveStamp) return null;
                //- marker exists so retrieve factory id and proxy state
                String factoryID = markers[0].getAttribute(TAG_FACTORY_ID, null);
                if (FileProxyNodeCache.NullProxy.FACTORY_ID.equals(factoryID)) return FileProxyNodeCache.nullProxy;
                String proxyState = markers[0].getAttribute(TAG_PROXY_STATE, null);
                if (proxyState == null) {

                    //- create a file marker to store the proxy state
                    IMarker marker = _file.createMarker(MARKER_PROXYSTATE);
                    marker.setAttribute(TAG_LAST_SAVE_STAMP, Long.toString(lastSaveStamp));
                    marker.setAttribute(TAG_FACTORY_ID, factoryId);
                    if (state != null) {
                    	marker.setAttribute(TAG_PROXY_STATE, state);
                    }




import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.hyades.test.ui.TestUIConstants;
import org.eclipse.hyades.test.ui.TestUIImages;
import org.eclipse.hyades.test.ui.navigator.IPersistableProxyNode;
import org.eclipse.hyades.test.ui.navigator.IProxyNode;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.IMemento;


 * @author jgout
 * @since 3.2
 */
public class DatapoolFileProxyNode extends EMFResourceProxyNode {
		
	public DatapoolFileProxyNode(IFile file, Resource resource) {
		super(file, resource);
	}
	
	public DatapoolFileProxyNode(IFile file, IMemento memento) {
		super(file, memento);
	}
	
	public Image getImage() {
		return TestUIImages.INSTANCE.getImage(TestUIImages.IMG_DATAPOOL);
	}
	
	protected String getNodeKind() {
		return TestUIConstants.DATAPOOL_FILE_NODE;
	}
	
	public boolean saveState(IMemento memento) {
		//- data to retrieve the correct object 
		memento.putString(TestUIConstants.TAG_NODE_KIND, TestUIConstants.DATAPOOL_FILE_NODE);
		//- data from EMFResourceProxyNode
		memento.putString(TestUIConstants.TAG_NAME, getText());
		IProxyNode [] children = getChildren();
		for (int i = 0; i < children.length; i++) {
			if(!saveChildState(memento, children[i])) {
				return false;
			}
		}
		return true;
	}
}




import org.eclipse.hyades.test.ui.TestUIConstants;
import org.eclipse.hyades.test.ui.TestUIImages;
import org.eclipse.hyades.test.ui.navigator.CMNNamedElementProxyNode;
import org.eclipse.hyades.test.ui.navigator.IPersistableProxyNode;
import org.eclipse.hyades.test.ui.navigator.IProxyNode;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.IMemento;

 * @author jgout
 * @since 3.2
 */
public class ArtifactProxyNode extends CMNNamedElementProxyNode {
	

	/**
	 * @param memento
	 * @param parent

		return new IProxyNode[0];
	}
	
	protected String getNodeKind() {
		return TestUIConstants.ARTIFACT_NODE;
	}
	
	public boolean saveState(IMemento memento) { 
		//- data to retrieve the correct object
		memento.putString(TestUIConstants.TAG_NODE_KIND, TestUIConstants.ARTIFACT_NODE);
		//- data from CMNNamedElementProxyNode
		memento.putString(TestUIConstants.TAG_NAME, getText());
		//- data from EObjectProxyNode
		memento.putString(TestUIConstants.TAG_URI_FRAGMENT, getOriginatorURI().fragment());
		return true;
	}
	
}

Lines 14-19 Link Here

(-)src/org/eclipse/hyades/test/ui/internal/navigator/proxy/DefaultTestComponentlProxyNode.java (+6 lines)
14	import org.eclipse.emf.ecore.EObject;	14	import org.eclipse.emf.ecore.EObject;
15	import org.eclipse.hyades.models.common.testprofile.TPFTestComponent;	15	import org.eclipse.hyades.models.common.testprofile.TPFTestComponent;
16	import org.eclipse.hyades.test.core.util.EMFUtil;	16	import org.eclipse.hyades.test.core.util.EMFUtil;
		17	import org.eclipse.hyades.test.ui.TestUIConstants;
17	import org.eclipse.hyades.test.ui.TestUIImages;	18	import org.eclipse.hyades.test.ui.TestUIImages;
18	import org.eclipse.hyades.test.ui.navigator.IProxyNode;	19	import org.eclipse.hyades.test.ui.navigator.IProxyNode;
19	import org.eclipse.hyades.test.ui.navigator.ITestComponentProxyNode;	20	import org.eclipse.hyades.test.ui.navigator.ITestComponentProxyNode;
Lines 55-58 Link Here
55	return null;	56	return null;
56	}	57	}
57	}	58	}
		59
		60	protected String getNodeKind() {
		61	return TestUIConstants.TESTCOMPONENT_NODE;
		62	}
		63
58	}	64	}




import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.hyades.test.ui.TestUIConstants;
import org.eclipse.hyades.test.ui.TestUIImages;
import org.eclipse.hyades.test.ui.navigator.IPersistableProxyNode;
import org.eclipse.hyades.test.ui.navigator.IProxyNode;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.IMemento;


 * @author jgout
 * @since 3.2
 */
public class TestSuiteFileProxyNode extends EMFResourceProxyNode {
	
	public TestSuiteFileProxyNode(IFile file, Resource res) {
		super(file, res);
	}
	
	public TestSuiteFileProxyNode(IFile file, IMemento memento) {
		super(file, memento);
	}

	public Image getImage() {
		return TestUIImages.INSTANCE.getImage(TestUIImages.IMG_TEST_SUITE);
	}
	
	protected String getNodeKind() {
    	return TestUIConstants.TESTSUITE_FILE_NODE;
    }

	public boolean saveState(IMemento memento) {
		//- data to retrieve the correct object 
		memento.putString(TestUIConstants.TAG_NODE_KIND, TestUIConstants.TESTSUITE_FILE_NODE);
		//- data from EMFResourceProxyNode
		memento.putString(TestUIConstants.TAG_NAME, getText());
		IProxyNode [] children = getChildren();
		for (int i = 0; i < children.length; i++) {
			if(!saveChildState(memento, children[i])) {
				return false;
			}
		}
		return true;
	}
}




import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.hyades.test.ui.TestUIConstants;
import org.eclipse.hyades.test.ui.TestUIImages;
import org.eclipse.hyades.test.ui.navigator.IPersistableProxyNode;
import org.eclipse.hyades.test.ui.navigator.IProxyNode;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.IMemento;


 * @author jgout
 * @since 3.2
 */
public class DeploymentFileProxyNode extends EMFResourceProxyNode {
		
	public DeploymentFileProxyNode(IFile file, Resource resource) {
		super(file, resource);
	}
	
	public DeploymentFileProxyNode(IFile file, IMemento memento) {
		super(file, memento);
	}

	public Image getImage() {
		return TestUIImages.INSTANCE.getImage(TestUIImages.IMG_DEPLOYMENT);
	}

	protected String getNodeKind() {
		return TestUIConstants.DEPLOY_FILE_NODE;
	}
	
	public boolean saveState(IMemento memento) {
		//- data to retrieve the correct object 
		memento.putString(TestUIConstants.TAG_NODE_KIND, TestUIConstants.DEPLOY_FILE_NODE);
		//- data from EMFResourceProxyNode
		memento.putString(TestUIConstants.TAG_NAME, getText());
		IProxyNode [] children = getChildren();
		for (int i = 0; i < children.length; i++) {
			if(!saveChildState(memento, children[i])) {
				return false;
			}
		}
		return true;
	}
}




import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.hyades.test.ui.TestUIConstants;
import org.eclipse.hyades.test.ui.TestUIImages;
import org.eclipse.hyades.test.ui.navigator.IPersistableProxyNode;
import org.eclipse.hyades.test.ui.navigator.IProxyNode;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.IMemento;


 * @author jgout
 * @since 3.2
 */
public class LocationFileProxyNode extends EMFResourceProxyNode {
		
	public LocationFileProxyNode(IFile file, Resource resource) {
		super(file, resource);
	}
	
	public LocationFileProxyNode(IFile file, IMemento memento) {
		super(file, memento);
	}
	public Image getImage() {
		return TestUIImages.INSTANCE.getImage(TestUIImages.IMG_LOCATION);
	}
	
	protected String getNodeKind() {
    	return TestUIConstants.LOCATION_FILE_NODE;
    }

	public boolean saveState(IMemento memento) {
		//- data to retrieve the correct object 
		memento.putString(TestUIConstants.TAG_NODE_KIND, TestUIConstants.LOCATION_FILE_NODE);
		//- data from EMFResourceProxyNode
		memento.putString(TestUIConstants.TAG_NAME, getText());
		IProxyNode [] children = getChildren();
		for (int i = 0; i < children.length; i++) {
			if(!saveChildState(memento, children[i])) {
				return false;
			}
		}
		return true;
	}	
}

Lines 4-10 Link Here

(-)src/org/eclipse/hyades/test/ui/internal/navigator/proxy/FileProxyMetadataPersister.java (-6 / +9 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	* $Id: FileProxyMetadataPersister.java,v 1.1 2006/09/28 15:14:48 jcanches Exp $	7	* $Id: $
8	*	8	*
9	* Contributors:	9	* Contributors:
10	* IBM Corporation - initial API and implementation	10	* IBM Corporation - initial API and implementation
Lines 12-17 Link Here
12		12
13	package org.eclipse.hyades.test.ui.internal.navigator.proxy;	13	package org.eclipse.hyades.test.ui.internal.navigator.proxy;
14		14
		15	import java.io.BufferedInputStream;
		16	import java.io.BufferedOutputStream;
15	import java.io.File;	17	import java.io.File;
16	import java.io.FileInputStream;	18	import java.io.FileInputStream;
17	import java.io.FileNotFoundException;	19	import java.io.FileNotFoundException;
Lines 44-50 Link Here
44		46
45	public class FileProxyMetadataPersister implements IFileProxyPersister {	47	public class FileProxyMetadataPersister implements IFileProxyPersister {
46		48
47	private static final String TAG_PROXY_STATE = "proxyState"; //$NON-NLS-1$	49	private static final String TAG_FACTORY_ID = "factoryID"; //$NON-NLS-1$
		50	private static final String TAG_PROXY_STATE = "proxyState"; //$NON-NLS-1$
48	private static final String TAG_LAST_SAVE_STAMP = "lastSaveStamp"; //$NON-NLS-1$	51	private static final String TAG_LAST_SAVE_STAMP = "lastSaveStamp"; //$NON-NLS-1$
49		52
50	private IPath storageArea;	53	private IPath storageArea;
Lines 65-71 Link Here
65	protected Writer createWriter(IFile file) throws IOException {	68	protected Writer createWriter(IFile file) throws IOException {
66	IPath path = getStoragePath(file);	69	IPath path = getStoragePath(file);
67	File storageFile = createFile(path);	70	File storageFile = createFile(path);
68	GZIPOutputStream stream = new GZIPOutputStream(new FileOutputStream(storageFile));	71	GZIPOutputStream stream = new GZIPOutputStream(new BufferedOutputStream(new FileOutputStream(storageFile)));
69	return new OutputStreamWriter(stream);	72	return new OutputStreamWriter(stream);
70	}	73	}
71		74
Lines 74-80 Link Here
74	File storageFile = new File(path.toOSString());	77	File storageFile = new File(path.toOSString());
75	if (storageFile.canRead()) {	78	if (storageFile.canRead()) {
76	try {	79	try {
77	return new InputStreamReader(new GZIPInputStream(new FileInputStream(storageFile)));	80	return new InputStreamReader(new GZIPInputStream(new BufferedInputStream(new FileInputStream(storageFile))));
78	} catch (FileNotFoundException e) {	81	} catch (FileNotFoundException e) {
79	UiPlugin.logError(e);	82	UiPlugin.logError(e);
80	} catch (IOException e) {	83	} catch (IOException e) {
Lines 101-107 Link Here
101	long lastSaveStamp = stamp != null ? Long.parseLong(stamp) : 0;	104	long lastSaveStamp = stamp != null ? Long.parseLong(stamp) : 0;
102	//- if this file has changed since last save do not read the saved state	105	//- if this file has changed since last save do not read the saved state
103	if(currentModStamp != lastSaveStamp) return null;	106	if(currentModStamp != lastSaveStamp) return null;
104	String factoryId = memento.getString(TestUIConstants.TAG_FACTORY_ID);	107	String factoryId = memento.getString(TAG_FACTORY_ID);
105	if (FileProxyNodeCache.NullProxy.FACTORY_ID.equals(factoryId)) return FileProxyNodeCache.nullProxy;	108	if (FileProxyNodeCache.NullProxy.FACTORY_ID.equals(factoryId)) return FileProxyNodeCache.nullProxy;
106	IMemento proxyState = memento.getChild(TAG_PROXY_STATE);	109	IMemento proxyState = memento.getChild(TAG_PROXY_STATE);
107	if (proxyState == null) return null;	110	if (proxyState == null) return null;
Lines 169-175 Link Here
169	try {	172	try {
170	XMLMemento memento = XMLMemento.createWriteRoot("proxyStateMemento"); //$NON-NLS-1$	173	XMLMemento memento = XMLMemento.createWriteRoot("proxyStateMemento"); //$NON-NLS-1$
171	memento.putString(TAG_LAST_SAVE_STAMP, Long.toString(file.getModificationStamp()));	174	memento.putString(TAG_LAST_SAVE_STAMP, Long.toString(file.getModificationStamp()));
172	memento.putString(TestUIConstants.TAG_FACTORY_ID, proxy.getFactoryID());	175	memento.putString(TAG_FACTORY_ID, proxy.getFactoryID());
173	IMemento state = memento.createChild(TAG_PROXY_STATE);	176	IMemento state = memento.createChild(TAG_PROXY_STATE);
174	proxy.saveState(state);	177	proxy.saveState(state);
175	memento.save(writer);	178	memento.save(writer);




 */
public class EMFResourceProxyFactory implements IFileProxyFactory, IPersistableFileProxyFactory {
	
	/**
	 * Factory id.
	 */
	public final static String ID = "EMFResourceProxyFactory"; //$NON-NLS-1$
	
	/** This method is called to build a node that contains multiple EMF objects as children.
	 *  The object created depends of the extension of the file (.datapool -> DatapoolFileProxyNode)
	 *  using as name the name of the file since if there are multiple objects inside, we can't

                mementoChild.putString(TestUIConstants.TAG_URI_ROOT, memento.getString(TestUIConstants.TAG_URI_ROOT));               
            }
            if(nodeKind.equals(TestUIConstants.ARTIFACT_FILE_NODE)) {
				return new ArtifactFileProxyNode(file, memento);
			} else if(nodeKind.equals(TestUIConstants.DATAPOOL_FILE_NODE)) {
				return new DatapoolFileProxyNode(file, memento);
			} else if(nodeKind.equals(TestUIConstants.DEPLOY_FILE_NODE)) {
				return new DeploymentFileProxyNode(file, memento);
			} else if(nodeKind.equals(TestUIConstants.EXECUTION_FILE_NODE)) {
				return new ExecutionFileProxyNode(file, memento);
			} else if(nodeKind.equals(TestUIConstants.LOCATION_FILE_NODE)) {
				return new LocationFileProxyNode(file, memento);
			} else if(nodeKind.equals(TestUIConstants.TESTCOMPONENT_FILE_NODE)) {
				return new TestComponentFileProxyNode(file, memento);
			} else if(nodeKind.equals(TestUIConstants.TESTSUITE_FILE_NODE)) {
				return new TestSuiteFileProxyNode(file, memento);
			}
		} else {
			return proxy;




import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.hyades.test.ui.TestUIConstants;
import org.eclipse.hyades.test.ui.TestUIImages;
import org.eclipse.hyades.test.ui.navigator.IPersistableProxyNode;
import org.eclipse.hyades.test.ui.navigator.IProxyNode;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.IMemento;


 * @author jgout
 * @since 3.2
 */
public class TestComponentFileProxyNode extends EMFResourceProxyNode {
		
	public TestComponentFileProxyNode(IFile file, Resource resource) {
		super(file, resource);
	}
	
	public TestComponentFileProxyNode(IFile file, IMemento memento) {
		super(file, memento);
	}

	public Image getImage() {
		return TestUIImages.INSTANCE.getImage(TestUIImages.IMG_TEST_COMPONENT);
	}
	
	protected String getNodeKind() {
    	return TestUIConstants.TESTCOMPONENT_FILE_NODE;
    }

	public boolean saveState(IMemento memento) {
		//- data to retrieve the correct object 
		memento.putString(TestUIConstants.TAG_NODE_KIND, TestUIConstants.TESTCOMPONENT_FILE_NODE);
		//- data from EMFResourceProxyNode
		memento.putString(TestUIConstants.TAG_NAME, getText());
		IProxyNode [] children = getChildren();
		for (int i = 0; i < children.length; i++) {
			if(!saveChildState(memento, children[i]))
				return false;
		}
		return true;
	}
}




import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.hyades.test.ui.TestUIConstants;
import org.eclipse.hyades.test.ui.TestUIImages;
import org.eclipse.hyades.test.ui.navigator.IPersistableProxyNode;
import org.eclipse.hyades.test.ui.navigator.IProxyNode;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.IMemento;


 * @author jgout
 * @since 3.2
 */
public class ArtifactFileProxyNode extends EMFResourceProxyNode {
	
	public ArtifactFileProxyNode(IFile file, Resource res) {
		super(file, res);
	}
	
	public ArtifactFileProxyNode(IFile file, IMemento memento) {
		super(file, memento);
	}
	
	public Image getImage() {
		return TestUIImages.INSTANCE.getImage(TestUIImages.IMG_ARTIFACT);
	}

	public String getNodeKind() {
		return TestUIConstants.ARTIFACT_FILE_NODE;
	}
	
	public boolean saveState(IMemento memento) {
		//- data to retrieve the correct object 
		memento.putString(TestUIConstants.TAG_NODE_KIND, TestUIConstants.ARTIFACT_FILE_NODE);
		//- data from EMFResourceProxyNode
		memento.putString(TestUIConstants.TAG_NAME, getText());
		IProxyNode [] children = getChildren();
		for (int i = 0; i < children.length; i++) {
			if(!saveChildState(memento, children[i])) {
				return false;
			}
		}
		return true;
	}
}




import org.eclipse.hyades.test.ui.TestUIConstants;
import org.eclipse.hyades.test.ui.TestUIImages;
import org.eclipse.hyades.test.ui.navigator.CMNNamedElementProxyNode;
import org.eclipse.hyades.test.ui.navigator.IPersistableProxyNode;
import org.eclipse.hyades.test.ui.navigator.IProxyNode;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.IMemento;

 * @author jgout
 * @since 3.2
 */
public class DatapoolProxyNode extends CMNNamedElementProxyNode {
	/**
	 * @param dp
	 * @param parent

		return new IProxyNode[0];
	}
	
	protected String getNodeKind() {
		return TestUIConstants.DATAPOOL_NODE;
	}
	
	public boolean saveState(IMemento memento) {
		//- data to retrieve the correct object 
		memento.putString(TestUIConstants.TAG_NODE_KIND, TestUIConstants.DATAPOOL_NODE);
		//- data from CMNNamedElementProxyNode
		memento.putString(TestUIConstants.TAG_NAME, getText());
		//- data from EObjectProxyNode
		memento.putString(TestUIConstants.TAG_URI_FRAGMENT, getOriginatorURI().fragment());
		return true;
	}
}




import org.eclipse.hyades.test.ui.TestUIConstants;
import org.eclipse.hyades.test.ui.TestUIImages;
import org.eclipse.hyades.test.ui.navigator.CMNNamedElementProxyNode;
import org.eclipse.hyades.test.ui.navigator.IPersistableProxyNode;
import org.eclipse.hyades.test.ui.navigator.IProxyNode;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.IMemento;

 * @author jgout
 * @since 3.2
 */
public class DeploymentProxyNode extends CMNNamedElementProxyNode {
	/**
	 * @param deploy
	 * @param parent

		return new IProxyNode[0];
	}
	
	protected String getNodeKind() {
    	return TestUIConstants.DEPLOY_NODE;
    }
	
	public boolean saveState(IMemento memento) {
		//- data to retrieve the correct object 
		memento.putString(TestUIConstants.TAG_NODE_KIND, TestUIConstants.DEPLOY_NODE);
		//- data from CMNNamedElementProxyNode
		memento.putString(TestUIConstants.TAG_NAME, getText());
		//- data from EObjectProxyNode
		memento.putString(TestUIConstants.TAG_URI_FRAGMENT, getOriginatorURI().fragment());
		return true;
	}
}




import org.eclipse.hyades.test.ui.TestUIConstants;
import org.eclipse.hyades.test.ui.TestUIImages;
import org.eclipse.hyades.test.ui.navigator.CMNNamedElementProxyNode;
import org.eclipse.hyades.test.ui.navigator.IPersistableProxyNode;
import org.eclipse.hyades.test.ui.navigator.IProxyNode;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.IMemento;

 * @author jgout
 * @since 3.2
 */
public class LocationProxyNode extends CMNNamedElementProxyNode {
	/**
	 * @param loc
	 * @param parent

		return new IProxyNode[0];
	}
	
	protected String getNodeKind() {
    	return TestUIConstants.LOCATION_NODE;
    }

	public boolean saveState(IMemento memento) {
		//- data to retrieve the correct object 
		memento.putString(TestUIConstants.TAG_NODE_KIND, TestUIConstants.LOCATION_NODE);
		//- data from CMNNamedElementProxyNode
		memento.putString(TestUIConstants.TAG_NAME, getText());
		//- data from EObjectProxyNode
		memento.putString(TestUIConstants.TAG_URI_FRAGMENT, getOriginatorURI().fragment());
		return true;
	}
}




import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.Platform;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.hyades.models.common.common.CMNNamedElement;
import org.eclipse.hyades.test.core.util.EMFUtil;
import org.eclipse.hyades.test.ui.TestUIConstants;
import org.eclipse.hyades.test.ui.UiPlugin;
import org.eclipse.hyades.test.ui.navigator.actions.IProxyNodeRenamer;
import org.eclipse.hyades.test.ui.navigator.actions.RenamerUIInlineEditor;
import org.eclipse.hyades.test.ui.navigator.actions.RenamerUIStatus;
import org.eclipse.hyades.ui.editor.IHyadesEditorPart;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IEditorReference;

 * Proxy node for <code>CMNNamedElement</code> element.
 * @author jgout
 */
/**
 * @author jgout
 * @since 
 */
public abstract class CMNNamedElementProxyNode extends EObjectProxyNode implements IProxyNodeRenamer  {
	
	private final static String TAG_NAME = "name"; //$NON-NLS-1$
	private final static String TAG_DESCRIPTION = "description"; //$NON-NLS-1$
	
	private String name;
	private String description;

    /**
     * Constructor used to load an already built proxy.

     */
	public CMNNamedElementProxyNode(IMemento memento, Object parent) {
		super(memento, parent);
		this.name = memento.getString(TAG_NAME);
		if(this.name == null) {
			throw new IllegalArgumentException("Malformed saved proxy state: unable to retrieve name field"); //$NON-NLS-1$
		}
		this.description = memento.getString(TAG_DESCRIPTION);
	}
	
	/** 

	public CMNNamedElementProxyNode(EObject eObject, Object parent) {
		super(eObject, parent);
		if(eObject instanceof CMNNamedElement) {
			CMNNamedElement namedElement = (CMNNamedElement)eObject;
			this.name = namedElement.getName();
			this.description = namedElement.getDescription();
		} else {
			throw new IllegalArgumentException("CMNNamedElementProxyNode can only be built upon CMNNamedElement"); //$NON-NLS-1$
		}

		this.name = name;
	}
	
	public String getName() {
		return this.description;
	}
	
	/**
	 * Returns the description of the named element.
	 * @return
	 */
	public String getDescription() {
		return this.description;
	}
	
 	/**
 	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
 	 */

	public RenamerUIStatus performUserInteraction(String oldName) {
		return new RenamerUIInlineEditor();
	}
	
	public boolean saveState(IMemento memento) { 
		memento.putString(TAG_NAME, getName());
		return super.saveState(memento);
	}
	
}




import org.eclipse.hyades.test.ui.TestUIExtension;
import org.eclipse.hyades.test.ui.TestUIImages;
import org.eclipse.hyades.test.ui.internal.navigator.proxy.TypedElementFactoryManager;
import org.eclipse.hyades.ui.extension.IAssociationConstants;
import org.eclipse.hyades.ui.extension.IAssociationDescriptor;
import org.eclipse.hyades.ui.extension.IAssociationMapping;
import org.eclipse.hyades.ui.internal.extension.AssociationMappingRegistry;

	public DefaultTestSuiteProxyNode(TPFTestSuite ts, Object parent) {
		super(ts, parent);
		AssociationMappingRegistry registry = (AssociationMappingRegistry)TestUIExtension.getTestSuiteMappingRegistry();
		IAssociationMapping associationMapping = registry.getAssociationMapping(IAssociationConstants.EP_TYPE_DESCRIPTIONS);
		descriptor = associationMapping.getDefaultAssociationDescriptor(ts.getType());
		LinkedList tcProxies = new LinkedList();
		EList testcases = ts.getTestCases();

		super(memento, parent);
		//- set the descriptor according to the saved type. This is used in getImage() 
		AssociationMappingRegistry registry = (AssociationMappingRegistry)TestUIExtension.getTestSuiteMappingRegistry();
		IAssociationMapping associationMapping = registry.getAssociationMapping(IAssociationConstants.EP_TYPE_DESCRIPTIONS);
		descriptor = associationMapping.getDefaultAssociationDescriptor(getType());

		IMemento [] tcStates = memento.getChildren(TestUIConstants.TAG_CHILD);

			IMemento mementoChild = tcStates[i];
            //- inherit the TAG_URI_ROOT which is an extra data contained by the parent
            mementoChild.putString(TestUIConstants.TAG_URI_ROOT, memento.getString(TestUIConstants.TAG_URI_ROOT));
			String type = getType();
			if(type == null) {
				throw new IllegalArgumentException("Malformed saved proxy state: unable to retrieve type field"); //$NON-NLS-1$
			}

		}
	}
	
	protected String getNodeKind() {
		return TestUIConstants.TESTSUITE_NODE;
     * @return the ID of the factory that is used to recreate this proxy node.
     */
	public String getFactoryID() {
		return "EMFResourceProxyFactory"; //$NON-NLS-1$
	}
	
    /**

     * @return the returned value is no longer significant.
     */
	public boolean saveState(IMemento memento) {
		//- data to retrieve the correct object 
		memento.putString(TestUIConstants.TAG_NODE_KIND, TestUIConstants.TESTSUITE_NODE);
		//- data from TypedElementProxyNode
		memento.putString(TestUIConstants.TAG_TYPE, getType());
		//- data from CMNNamedElementProxyNode
		memento.putString(TestUIConstants.TAG_NAME, getText());
		//- data from EObjectProxyNode
		memento.putString(TestUIConstants.TAG_URI_FRAGMENT, getOriginatorURI().fragment());
		//- children (testcases)
		for (int i = 0; i < testCases.length; i++) {
			CMNNamedElementProxyNode tcProxy = testCases[i];

Lines 21-26 Link Here

(-)src/org/eclipse/hyades/test/ui/navigator/EObjectProxyNode.java (-2 / +18 lines)
21	import org.eclipse.emf.ecore.util.EcoreUtil;	21	import org.eclipse.emf.ecore.util.EcoreUtil;
22	import org.eclipse.hyades.test.core.util.EMFUtil;	22	import org.eclipse.hyades.test.core.util.EMFUtil;
23	import org.eclipse.hyades.test.ui.TestUIConstants;	23	import org.eclipse.hyades.test.ui.TestUIConstants;
		24	import org.eclipse.hyades.test.ui.internal.navigator.proxy.EMFResourceProxyFactory;
24	import org.eclipse.ui.IMemento;	25	import org.eclipse.ui.IMemento;
25		26
26	/** EMF object proxy element for the test navigator.	27	/** EMF object proxy element for the test navigator.
Lines 28-34 Link Here
28	* EMF objects wrapped by subclasses will be stored in the test navigator resource set	29	* EMF objects wrapped by subclasses will be stored in the test navigator resource set
29	* @author jgout	30	* @author jgout
30	*/	31	*/
31	public abstract class EObjectProxyNode implements IProxyNode {	32	public abstract class EObjectProxyNode implements IProxyNode, IPersistableProxyNode {
		33
		34	private static final String TAG_URI_FRAGMENT = "uriFragment"; //$NON-NLS-1$
		35
32	private URI originatorURI;	36	private URI originatorURI;
33	private Object parent;	37	private Object parent;
34		38
Lines 46-52 Link Here
46	//- get the fragment part from the whole uri	50	//- get the fragment part from the whole uri
47	uriFragmentName = oldURI.fragment();	51	uriFragmentName = oldURI.fragment();
48	} else {	52	} else {
49	uriFragmentName = memento.getString(TestUIConstants.TAG_URI_FRAGMENT);	53	uriFragmentName = memento.getString(TAG_URI_FRAGMENT);
50	}	54	}
51	//- this data is not persisted but added by the proxy node loader (FileProxyManager#buildProxy)	55	//- this data is not persisted but added by the proxy node loader (FileProxyManager#buildProxy)
52	String uriRootName = memento.getString(TestUIConstants.TAG_URI_ROOT);	56	String uriRootName = memento.getString(TestUIConstants.TAG_URI_ROOT);
Lines 141-144 Link Here
141	return Platform.getAdapterManager().getAdapter(this, adapter);	145	return Platform.getAdapterManager().getAdapter(this, adapter);
142	}	146	}
143		147
		148	public String getFactoryID() {
		149	return EMFResourceProxyFactory.ID;
		150	}
		151
		152	public boolean saveState(IMemento memento) {
		153	memento.putString(TestUIConstants.TAG_NODE_KIND, getNodeKind());
		154	memento.putString(TAG_URI_FRAGMENT, getOriginatorURI().fragment());
		155	return true;
		156	}
		157
		158	protected abstract String getNodeKind();
		159
144	}	160	}

Lines 14-20 Link Here

(-)src/org/eclipse/hyades/test/ui/navigator/TypedElementProxyNode.java (-2 / +9 lines)
14	import org.eclipse.hyades.models.common.testprofile.TPFExecutionResult;	14	import org.eclipse.hyades.models.common.testprofile.TPFExecutionResult;
15	import org.eclipse.hyades.models.common.testprofile.TPFTest;	15	import org.eclipse.hyades.models.common.testprofile.TPFTest;
16	import org.eclipse.hyades.models.common.testprofile.TPFTestComponent;	16	import org.eclipse.hyades.models.common.testprofile.TPFTestComponent;
17	import org.eclipse.hyades.test.ui.TestUIConstants;
18	import org.eclipse.ui.IMemento;	17	import org.eclipse.ui.IMemento;
19		18
20	/** General proxy for typed element.	19	/** General proxy for typed element.
Lines 22-27 Link Here
22	* @author jgout	21	* @author jgout
23	*/	22	*/
24	public abstract class TypedElementProxyNode extends CMNNamedElementProxyNode implements ITypedElementProxyNode {	23	public abstract class TypedElementProxyNode extends CMNNamedElementProxyNode implements ITypedElementProxyNode {
		24
		25	private static final String TAG_TYPE = "type"; //$NON-NLS-1$
		26
25	private String type;	27	private String type;
26		28
27	/**	29	/**
Lines 61-67 Link Here
61	*/	63	*/
62	public TypedElementProxyNode(IMemento memento, Object parent) {	64	public TypedElementProxyNode(IMemento memento, Object parent) {
63	super(memento, parent);	65	super(memento, parent);
64	this.type = memento.getString(TestUIConstants.TAG_TYPE);	66	this.type = memento.getString(TAG_TYPE);
65	if (this.type == null) {	67	if (this.type == null) {
66	throw new IllegalArgumentException("Malformed saved proxy state: unable to retrieve type field"); //$NON-NLS-1$	68	throw new IllegalArgumentException("Malformed saved proxy state: unable to retrieve type field"); //$NON-NLS-1$
67	}	69	}
Lines 74-77 Link Here
74	return type;	76	return type;
75	}	77	}
76		78
		79	public boolean saveState(IMemento memento) {
		80	memento.putString(TAG_TYPE, getType());
		81	return super.saveState(memento);
		82	}
		83
77	}	84	}

Lines 13-20 Link Here

(-)src/org/eclipse/hyades/test/ui/internal/navigator/messages.properties (+4 lines)
13	# NLS_MESSAGEFORMAT_VAR	13	# NLS_MESSAGEFORMAT_VAR
14	# NLS_ENCODING=UTF-8	14	# NLS_ENCODING=UTF-8
15		15
		16	# Followings are used as labels of tree items in test navigator
16	TEST_NAVIGATOR_UNNAMED_ELEMENT=unnamed	17	TEST_NAVIGATOR_UNNAMED_ELEMENT=unnamed
17	PROXY_LOADING_ERROR=loading error	18	PROXY_LOADING_ERROR=loading error
		19
18	OpenWithActionGroup_ActionLabel=Open Wit&h	20	OpenWithActionGroup_ActionLabel=Open Wit&h
19	FileFolderInContainerPaste_NameTwoArg=Copy ({0}) of {1}	21	FileFolderInContainerPaste_NameTwoArg=Copy ({0}) of {1}
20	FileFolderInContainerPaste_NameOneArg=Copy of {0}	22	FileFolderInContainerPaste_NameOneArg=Copy of {0}
Lines 24-26 Link Here
24	FileFolderInContainerPaste_MessageLabel=Enter a new name for ''{0}''	26	FileFolderInContainerPaste_MessageLabel=Enter a new name for ''{0}''
25	TestNavigatorActionGroup_ToggleAction_Text=Link with Editor	27	TestNavigatorActionGroup_ToggleAction_Text=Link with Editor
26	RenameAction_ActionName=Rena&me	28	RenameAction_ActionName=Rena&me
		29	# The following is used as a range, e.g. "[1 - 100]", or "[901 - 1000]".
		30	CHILD_GROUP=[{0} - {1}]




package org.eclipse.hyades.test.ui.internal.navigator;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;

import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.hyades.models.common.common.CMNNamedElement;
import org.eclipse.hyades.models.common.testprofile.TPFTest;
import org.eclipse.hyades.test.core.util.EMFUtil;
import org.eclipse.hyades.test.ui.TestUIExtension;
import org.eclipse.hyades.test.ui.UiPlugin;
import org.eclipse.hyades.test.ui.internal.editor.BaseEditorPart;
import org.eclipse.hyades.test.ui.internal.model.ResourceUtil.ResourceAdaptable;
import org.eclipse.hyades.test.ui.internal.navigator.TestNavigatorProvider.IProxyGroup;
import org.eclipse.hyades.test.ui.internal.navigator.action.TestNavigatorActionGroup;
import org.eclipse.hyades.test.ui.internal.navigator.action.ToggleViewAction;
import org.eclipse.hyades.test.ui.internal.navigator.proxy.FileFactoryManager;

import org.eclipse.hyades.test.ui.navigator.IProxyNodeListener;
import org.eclipse.hyades.test.ui.navigator.ITestNavigator;
import org.eclipse.hyades.test.ui.navigator.ITypeProviderContext;
import org.eclipse.hyades.test.ui.navigator.ITypedElementProxyNode;
import org.eclipse.hyades.ui.extension.IAssociationConstants;
import org.eclipse.hyades.ui.extension.IAssociationDescriptor;
import org.eclipse.hyades.ui.extension.IAssociationMapping;

        } catch (NumberFormatException e) {
        }
        NavigatorViewerSorter viewerSorter = new NavigatorViewerSorter(this, criteria) {
        	
            protected int compareCategories(Object e1, Object e2) {
            	if (e1 instanceof IProxyGroup) {
            		if (e2 instanceof IProxyGroup) {
            			return ((IProxyGroup)e1).getOrder() - ((IProxyGroup)e2).getOrder();
            		}
            		return -1;
            	}
            	if (e2 instanceof IProxyGroup) {
            		return 1;
            	}
				return super.compareCategories(e1, e2);
			}

			public int category(Object element) {
            	if (element instanceof IResource) return super.category(element);
				if (element instanceof IAdaptable) {
					IResource res = (IResource)((IAdaptable)element).getAdapter(IResource.class);
					if (res != null) {
						return super.category(res);
					}
				}
				return super.category(element);
			}

			protected String getValue(Viewer viewer, Object e) {
                String value = super.getValue(viewer, e);
                if (e instanceof ITypedElementProxyNode) {
                	ITypedElementProxyNode proxy = (ITypedElementProxyNode) e;
                    if (getCriteria() == NavigatorViewerSorter.TYPE) {
                        String type = proxy.getType();
                        if (type != null)
                            value = type + value;
                        else
                            value = "zZz" + type; //$NON-NLS-1$
                                value = "zZz" + type; //$NON-NLS-1$
                        }
                        value = eObject.eClass().getName() + value;
                    }
                }

                return value;
            }
        };

        if (input instanceof IFileEditorInput) {
            IFileEditorInput fileInput = (IFileEditorInput) input;
            IFile file = fileInput.getFile();
            selectReveal(new StructuredSelection(file));
            return true;
            if ((resource != null) && (!resource.getContents().isEmpty())) {
                IStructuredSelection structuredSelection = getStructuredSelection();
                if (structuredSelection.size() == 1) {
                    Object currentSelection = structuredSelection.getFirstElement();
                    if (currentSelection instanceof EObject) {
                        if (((EObject) currentSelection).eResource() == resource)
                            return true;
                    }
                }

                selectReveal(new StructuredSelection(resource.getContents().get(0)));
                return true;
            }
        }

        return false;

     * @return
     */
    public static Iterator getAllInstancesIterator() {
    	if (testNavigatorByWorkbenchWindow == null) {
    		return Collections.EMPTY_LIST.iterator();
    	} else {
    		return testNavigatorByWorkbenchWindow.values().iterator();
    	}
    }
    
    /* (non-Javadoc)

Lines 19-30 Link Here

(-)src/org/eclipse/hyades/test/ui/internal/navigator/TestNavigatorProvider.java (-1 / +104 lines)
19	import org.eclipse.hyades.test.ui.navigator.IProxyNode;	19	import org.eclipse.hyades.test.ui.navigator.IProxyNode;
20	import org.eclipse.jface.viewers.ITreeContentProvider;	20	import org.eclipse.jface.viewers.ITreeContentProvider;
21	import org.eclipse.jface.viewers.Viewer;	21	import org.eclipse.jface.viewers.Viewer;
		22	import org.eclipse.osgi.util.NLS;
		23	import org.eclipse.swt.graphics.Image;
22		24
23	/**	25	/**
24	* @author jgout	26	* @author jgout
25	*/	27	*/
26	public abstract class TestNavigatorProvider extends TestNavigatorLabelProvider implements ITreeContentProvider {	28	public abstract class TestNavigatorProvider extends TestNavigatorLabelProvider implements ITreeContentProvider {
27		29
		30	private final static int MAX_PROXY_NODE_CHILDREN = 100;
		31
28	public Object getParent(Object element) {	32	public Object getParent(Object element) {
29	if (element instanceof IProxyNode) {	33	if (element instanceof IProxyNode) {
30	Object parent = ((IProxyNode) element).getParent();	34	Object parent = ((IProxyNode) element).getParent();
Lines 42-58 Link Here
42	IProxyNode proxy = (IProxyNode) parentElement;	46	IProxyNode proxy = (IProxyNode) parentElement;
43	return proxy.getChildren().length > 0;	47	return proxy.getChildren().length > 0;
44	}	48	}
		49	if (parentElement instanceof IProxyGroup) {
		50	return true;
		51	}
45	return false;	52	return false;
46	}	53	}
47		54
48	public Object[] getChildren(Object parentElement) {	55	public Object[] getChildren(Object parentElement) {
49	if (parentElement instanceof IProxyNode) {	56	if (parentElement instanceof IProxyNode) {
50	IProxyNode proxy = (IProxyNode) parentElement;	57	IProxyNode proxy = (IProxyNode) parentElement;
51	return proxy.getChildren();	58	return foldProxyNodes(proxy);
		59	}
		60	if (parentElement instanceof IProxyGroup) {
		61	return ((IProxyGroup)parentElement).getChildren();
52	}	62	}
53	return new Object[0];	63	return new Object[0];
54	}	64	}
55		65
		66	public String getText(Object element) {
		67	if (element instanceof IProxyGroup) {
		68	return ((IProxyGroup)element).getText();
		69	}
		70	return super.getText(element);
		71	}
		72
		73	public Image getImage(Object element) {
		74	if (element instanceof IProxyGroup) {
		75	return ((IProxyGroup)element).getImage();
		76	}
		77	return super.getImage(element);
		78	}
		79
56		80
57	public Object[] getElements(Object inputElement) {	81	public Object[] getElements(Object inputElement) {
58	if (inputElement instanceof IWorkspaceRoot) {	82	if (inputElement instanceof IWorkspaceRoot) {
Lines 70-74 Link Here
70		94
71	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {	95	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
72	}	96	}
		97
		98	public static interface IProxyGroup {
		99	IProxyNode[] getChildren();
		100	String getText();
		101	Image getImage();
		102	int getOrder();
		103	}
		104
		105	private static class ProxyGroup implements IProxyGroup {
		106	private IProxyNode parent;
		107	private int sequence;
		108	public ProxyGroup(IProxyNode node, int sequence) {
		109	this.parent = node;
		110	this.sequence = sequence;
		111	}
		112	public IProxyNode[] getChildren() {
		113	int start = sequence * MAX_PROXY_NODE_CHILDREN;
		114	IProxyNode[] completeChildren = parent.getChildren();
		115	IProxyNode[] children = new IProxyNode[MAX_PROXY_NODE_CHILDREN];
		116	System.arraycopy(completeChildren, start, children, 0, MAX_PROXY_NODE_CHILDREN);
		117	return children;
		118	}
		119	public String getText() {
		120	int start = sequence * MAX_PROXY_NODE_CHILDREN + 1;
		121	int end = (sequence + 1) * MAX_PROXY_NODE_CHILDREN;
		122	return NLS.bind(TestNavigatorMessages.CHILD_GROUP, new String[] { Integer.toString(start), Integer.toString(end) });
		123	}
		124	public Image getImage() {
		125	return parent.getImage();
		126	}
		127	public int getOrder() {
		128	return sequence;
		129	}
		130	}
		131
		132	private static class RemainingProxyGroup implements IProxyGroup {
		133	private IProxyNode parent;
		134	public RemainingProxyGroup(IProxyNode parent) {
		135	this.parent = parent;
		136	}
		137	public IProxyNode[] getChildren() {
		138	IProxyNode[] completeChildren = parent.getChildren();
		139	int completeLength = completeChildren.length;
		140	int length = completeLength % MAX_PROXY_NODE_CHILDREN;
		141	IProxyNode[] children = new IProxyNode[length];
		142	System.arraycopy(completeChildren, completeLength - length, children, 0, length);
		143	return children;
		144	}
		145	public String getText() {
		146	IProxyNode[] completeChildren = parent.getChildren();
		147	int end = completeChildren.length;
		148	int length = end % MAX_PROXY_NODE_CHILDREN;
		149	int start = end - length + 1;
		150	return NLS.bind(TestNavigatorMessages.CHILD_GROUP, new String[] { Integer.toString(start), Integer.toString(end) });
		151	}
		152	public Image getImage() {
		153	return parent.getImage();
		154	}
		155	public int getOrder() {
		156	return Integer.MAX_VALUE;
		157	}
		158	}
		159
		160	protected Object[] foldProxyNodes(IProxyNode parent) {
161	IProxyNode[] children = parent.getChildren();
162	int length = children.length;
163	if (length <= MAX_PROXY_NODE_CHILDREN) return children;
164	int size = length / MAX_PROXY_NODE_CHILDREN;
165	int remaining = length % MAX_PROXY_NODE_CHILDREN;
166	int totalSize = size + (remaining > 0 ? 1 : 0);
167	Object[] groups = new IProxyGroup[totalSize];
168	for (int i = 0; i < size; i++) {
169	groups[i] = new ProxyGroup(parent, i);
170	}
171	if (remaining > 0) {
172	groups[size] = new RemainingProxyGroup(parent);
173	}
174	return groups;
175	}
73		176
74	}	177	}




package org.eclipse.hyades.test.ui.internal.navigator;

import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedList;

import org.eclipse.core.resources.IFile;
import org.eclipse.hyades.test.ui.internal.navigator.proxy.FileProxyNodeCache;
import org.eclipse.hyades.test.ui.navigator.IProxyNode;
import org.eclipse.jface.viewers.DecoratingLabelProvider;
import org.eclipse.jface.viewers.IBaseLabelProvider;
import org.eclipse.jface.viewers.ILabelDecorator;

 */
public class TestDecoratingLabelProvider extends DecoratingLabelProvider implements ILabelProviderListener{

	private final TestNavigator testNavigator;
	
	/**
	 * @param provider
	 * @param decorator
	 * @param testNavigator
	 */
	public TestDecoratingLabelProvider(ILabelProvider provider, ILabelDecorator decorator, TestNavigator testNavigator) {
		super(provider, decorator);
		this.testNavigator = testNavigator;
		listeners = new LinkedList();
	}
	
	public void addListener(ILabelProviderListener listener) {
		ILabelDecorator decorator = getLabelDecorator();
		if(decorator != null) {
			decorator.addListener(this);
		}
		//- avoid multiple listener registration
		if(!listeners.contains(listener)) {
			ILabelProvider labelProvider = getLabelProvider();
			if(labelProvider != null) {
				labelProvider.addListener(listener);
			}
			listeners.add(listener);
		}
	}
	
	public void dispose() {
		ILabelDecorator decorator = getLabelDecorator();
		if(decorator != null) {
			decorator.removeListener(this);
		}
		super.dispose();
			ILabelProvider labelProvider = getLabelProvider();
			if(labelProvider != null) {
				labelProvider.removeListener(listener);
			}
			listeners.remove(listener);
		}
	}

	/* (non-Javadoc)

                    //- need to check is there is not a proxy define for this file
                    IFile file = (IFile) elem;
                    if (file.exists()) {
                    	IProxyNode converted = FileProxyNodeCache.getInstance().getCachedProxy(file);
                    	if (converted != null) {
                    		if (TestNavigator.getFileProxyManager().getParent(converted) != null) {
                    			others.add(converted);
                    		}
                    	}
                    } else {
                        others.add(elem);
                    }
                } else {
                    others.add(elem);
                }
            }
            if (others.size() > 0) {
	            event = new LabelProviderChangedEvent((IBaseLabelProvider) event.getSource(), others.toArray());
	            fireLabelProviderChanged(event);
            }
        }
		//- delegate to all registered listeners with the new event content
		for (Iterator it = listeners.iterator(); it.hasNext();) {
			ILabelProviderListener l = (ILabelProviderListener) it.next();
			l.labelProviderChanged(event);
		}
	}
}

Lines 35-38 Link Here

(-)src/org/eclipse/hyades/test/ui/internal/navigator/TestNavigatorMessages.java (+1 lines)
35	public static String FileFolderInContainerPaste_MessageLabel;	35	public static String FileFolderInContainerPaste_MessageLabel;
36	public static String TestNavigatorActionGroup_ToggleAction_Text;	36	public static String TestNavigatorActionGroup_ToggleAction_Text;
37	public static String RenameAction_ActionName;	37	public static String RenameAction_ActionName;
		38	public static String CHILD_GROUP;
38	}	39	}




import org.eclipse.hyades.models.common.common.CMNNamedElement;
import org.eclipse.hyades.models.common.common.CommonPackage;
import org.eclipse.hyades.test.core.util.EMFUtil;
import org.eclipse.hyades.test.ui.navigator.CMNNamedElementProxyNode;
import org.eclipse.hyades.ui.util.IDisposable;
import org.eclipse.hyades.ui.util.INamedElement;
import org.eclipse.ui.IElementFactory;

		}
	}
	
	public static class UIProxyNamedElement implements INamedElement, IDisposable {

		private CMNNamedElementProxyNode proxy;
		private CMNNamedElement loadedObject;
		
		public UIProxyNamedElement(CMNNamedElementProxyNode proxy) {
			this.proxy = proxy;
		}
		
		private CMNNamedElement loadNamedElement() {
			if (loadedObject == null) {
				loadedObject = (CMNNamedElement) proxy.getEObject();
			}
			return loadedObject;
		}
		
		public String getDescription() {
			return proxy.getDescription();
		}

		public String getName() {
			return proxy.getText();
		}

		public void setDescription(String description) {
			throw new UnsupportedOperationException();
		}

		public void setName(String name) {
			throw new UnsupportedOperationException();
		}

		public Object getAdapter(Class adapter) {
			if(INamedElement.class == adapter)
				return this;
			return proxy.getAdapter(adapter);
		}

		public void dispose() {
			loadedObject = null;
		}
		
	}
	
	public static interface NameChangeObserver
	{
		public void update(CMNNamedElement namedElement, String oldName);

Lines 13-26 Link Here

(-)src/org/eclipse/hyades/test/ui/adapter/CMNNamedElementPropertySource.java (-2 / +7 lines)
13		13
14	import org.eclipse.hyades.models.common.common.CMNNamedElement;	14	import org.eclipse.hyades.models.common.common.CMNNamedElement;
15	import org.eclipse.hyades.test.ui.internal.model.CMNNamedElementUtil.UINamedElement;	15	import org.eclipse.hyades.test.ui.internal.model.CMNNamedElementUtil.UINamedElement;
		16	import org.eclipse.hyades.test.ui.internal.model.CMNNamedElementUtil.UIProxyNamedElement;
		17	import org.eclipse.hyades.test.ui.navigator.CMNNamedElementProxyNode;
16	import org.eclipse.hyades.ui.adapter.NamedElementPropertySource;	18	import org.eclipse.hyades.ui.adapter.NamedElementPropertySource;
17		19
18		20
19	public class CMNNamedElementPropertySource	21	public class CMNNamedElementPropertySource
20	extends NamedElementPropertySource	22	extends NamedElementPropertySource
21	{	23	{
22	public CMNNamedElementPropertySource(CMNNamedElement namedElement)	24	public CMNNamedElementPropertySource(CMNNamedElement namedElement) {
23	{
24	super(new UINamedElement(namedElement));	25	super(new UINamedElement(namedElement));
25	}	26	}
		27
		28	public CMNNamedElementPropertySource(CMNNamedElementProxyNode proxy) {
		29	super(new UIProxyNamedElement(proxy));
		30	}
26	}	31	}

Lines 39-48 Link Here

(-)src/org/eclipse/hyades/test/tools/ui/java/internal/junit/navigator/JUnitTestSuiteProxyNode.java (-6 lines)
39	return "org.eclipse.hyades.test.tools.ui.JUnitTestSuiteFactory"; //$NON-NLS-1$	39	return "org.eclipse.hyades.test.tools.ui.JUnitTestSuiteFactory"; //$NON-NLS-1$
40	}	40	}
41		41
42	/* (non-Javadoc)
43	* @see org.eclipse.hyades.test.ui.navigator.IPersistableProxyNode#saveState(org.eclipse.ui.IMemento)
44	*/
45	public boolean saveState(IMemento memento) {
46	return super.saveState(memento);
47	}
48	}	42	}




import org.eclipse.hyades.models.common.common.CMNNamedElement;
import org.eclipse.hyades.test.ui.adapter.CMNNamedElementPropertySource;
import org.eclipse.hyades.test.ui.adapter.INamedElementPropertySource;
import org.eclipse.hyades.test.ui.navigator.CMNNamedElementProxyNode;
import org.eclipse.hyades.test.ui.navigator.IExecutionResultProxyNode;
import org.eclipse.hyades.test.ui.navigator.ITestCaseProxyNode;
import org.eclipse.hyades.test.ui.navigator.ITestComponentProxyNode;

public class TestJavaPropertySource implements INamedElementPropertySource {

	public IPropertySource getPropertySource(Object adaptableObject) {
		if (adaptableObject instanceof CMNNamedElementProxyNode) {
			return new CMNNamedElementPropertySource((CMNNamedElementProxyNode)adaptableObject);
		}
		if(adaptableObject instanceof ITestSuiteProxyNode) {
			return new CMNNamedElementPropertySource(((ITestSuiteProxyNode)adaptableObject).getTestSuite());
		}
		if(adaptableObject instanceof ITestCaseProxyNode) {
			return new CMNNamedElementPropertySource(((ITestCaseProxyNode)adaptableObject).getTestCase());
		}
		if(adaptableObject instanceof ITestComponentProxyNode) {
			return new CMNNamedElementPropertySource(((ITestComponentProxyNode)adaptableObject).getTestComponent());
		}
		if(adaptableObject instanceof IExecutionResultProxyNode) {
			return new CMNNamedElementPropertySource(((IExecutionResultProxyNode)adaptableObject).getExecutionResult());
		}
		if (adaptableObject instanceof CMNNamedElement){
			return new CMNNamedElementPropertySource((CMNNamedElement)adaptableObject);
		}
		return null;
	}
}

Return to bug 160221

Lines 15-22 Link Here

(-)src/org/eclipse/hyades/test/ui/internal/navigator/proxy/ExecutionFileProxyNode.java (-22 / +7 lines)
15	import org.eclipse.emf.ecore.resource.Resource;	15	import org.eclipse.emf.ecore.resource.Resource;
16	import org.eclipse.hyades.test.ui.TestUIConstants;	16	import org.eclipse.hyades.test.ui.TestUIConstants;
17	import org.eclipse.hyades.test.ui.TestUIImages;	17	import org.eclipse.hyades.test.ui.TestUIImages;
18	import org.eclipse.hyades.test.ui.navigator.IPersistableProxyNode;
19	import org.eclipse.hyades.test.ui.navigator.IProxyNode;
20	import org.eclipse.swt.graphics.Image;	18	import org.eclipse.swt.graphics.Image;
21	import org.eclipse.ui.IMemento;	19	import org.eclipse.ui.IMemento;
22		20
Lines 24-58 Link Here
24	* @author jgout	22	* @author jgout
25	* @since 3.2	23	* @since 3.2
26	*/	24	*/
27	public class ExecutionFileProxyNode extends EMFResourceProxyNode implements IPersistableProxyNode {	25	public class ExecutionFileProxyNode extends EMFResourceProxyNode {
28		26
29	public ExecutionFileProxyNode(IFile file, Resource resource) {	27	public ExecutionFileProxyNode(IFile file, Resource resource) {
30	super(file, resource);	28	super(file, resource);
31	}	29	}
32		30
33	public ExecutionFileProxyNode(IFile file, String name, IMemento[] childrenState) {	31	public ExecutionFileProxyNode(IFile file, IMemento memento) {
34	super(file, name, childrenState);	32	super(file, memento);
35	}	33	}
36		34
37	public Image getImage() {	35	public Image getImage() {
38	return TestUIImages.INSTANCE.getImage(TestUIImages.IMG_EXECUTION);	36	return TestUIImages.INSTANCE.getImage(TestUIImages.IMG_EXECUTION);
39	}	37	}
40		38
41	public String getFactoryID() {	39	protected String getNodeKind() {
42	return "EMFResourceProxyFactory"; //$NON-NLS-1$	40	return TestUIConstants.EXECUTION_FILE_NODE;
43	}	41	}
44		42
45	public boolean saveState(IMemento memento) {
46	//- data to retrieve the correct object
47	memento.putString(TestUIConstants.TAG_NODE_KIND, TestUIConstants.EXECUTION_FILE_NODE);
48	//- data from EMFResourceProxyNode
49	memento.putString(TestUIConstants.TAG_NAME, getText());
50	IProxyNode [] children = getChildren();
51	for (int i = 0; i < children.length; i++) {
52	if(!saveChildState(memento, children[i])) {
53	return false;
54	}
55	}
56	return true;
57	}
58	}	43	}

Lines 114-133 Link Here

(-)src/org/eclipse/hyades/test/ui/internal/navigator/proxy/TypedElementFactoryManager.java (-4 / +5 lines)
114	if (value instanceof IConfigurationElement) {	114	if (value instanceof IConfigurationElement) {
115	//- if the factory has not yet been loaded	115	//- if the factory has not yet been loaded
116	IConfigurationElement element = (IConfigurationElement) value;	116	IConfigurationElement element = (IConfigurationElement) value;
		117	ITypedElementProxyFactory factory = null;
117	try {	118	try {
118	ITypedElementProxyFactory factory = null;
119	if("factory".equals(element.getName())) { //$NON-NLS-1$	119	if("factory".equals(element.getName())) { //$NON-NLS-1$
120	factory = (ITypedElementProxyFactory)element.createExecutableExtension("class"); //$NON-NLS-1$	120	factory = (ITypedElementProxyFactory)element.createExecutableExtension("class"); //$NON-NLS-1$
121	} else {	121	} else {
122	//- old extension point	122	//- old extension point
123	factory = (ITypedElementProxyFactory)element.createExecutableExtension("factory"); //$NON-NLS-1$	123	factory = (ITypedElementProxyFactory)element.createExecutableExtension("factory"); //$NON-NLS-1$
124	}	124	}
125	return factory;
126	} catch (CoreException e) {	125	} catch (CoreException e) {
127	UiPlugin.logError(e);	126	UiPlugin.logError(e);
128	//- problem building the instance of factory using reflection	127	//- problem building the instance of factory using reflection
129	return new DefaultTypedElementProxyFactory();	128	factory = new DefaultTypedElementProxyFactory();
130	}	129	}
		130	factories.put(factoryID, factory);
		131	return factory;
131	} else {	132	} else {
132	//- the factory has been loaded yet	133	//- the factory has been loaded yet
133	if (value instanceof ITypedElementProxyFactory) {	134	if (value instanceof ITypedElementProxyFactory) {

Lines 45-50 Link Here

(-)src/org/eclipse/hyades/test/ui/internal/navigator/proxy/FileProxyMarkerPersister.java (-2 / +3 lines)
45		45
46	public class FileProxyMarkerPersister implements IFileProxyPersister {	46	public class FileProxyMarkerPersister implements IFileProxyPersister {
47		47
		48	private static final String TAG_FACTORY_ID = "factoryID"; //$NON-NLS-1$
48	private static final String TAG_PROXY_STATE = "proxyState"; //$NON-NLS-1$	49	private static final String TAG_PROXY_STATE = "proxyState"; //$NON-NLS-1$
49	private static final String TAG_LAST_SAVE_STAMP = "lastSaveStamp"; //$NON-NLS-1$	50	private static final String TAG_LAST_SAVE_STAMP = "lastSaveStamp"; //$NON-NLS-1$
50	private static final String MARKER_PROXYSTATE = "org.eclipse.hyades.test.ui.proxyStateMarker"; //$NON-NLS-1$	51	private static final String MARKER_PROXYSTATE = "org.eclipse.hyades.test.ui.proxyStateMarker"; //$NON-NLS-1$
Lines 65-71 Link Here
65	//- if this file has changed since last save do not read the saved state	66	//- if this file has changed since last save do not read the saved state
66	if(currentModStamp != lastSaveStamp) return null;	67	if(currentModStamp != lastSaveStamp) return null;
67	//- marker exists so retrieve factory id and proxy state	68	//- marker exists so retrieve factory id and proxy state
68	String factoryID = markers[0].getAttribute(TestUIConstants.TAG_FACTORY_ID, null);	69	String factoryID = markers[0].getAttribute(TAG_FACTORY_ID, null);
69	if (FileProxyNodeCache.NullProxy.FACTORY_ID.equals(factoryID)) return FileProxyNodeCache.nullProxy;	70	if (FileProxyNodeCache.NullProxy.FACTORY_ID.equals(factoryID)) return FileProxyNodeCache.nullProxy;
70	String proxyState = markers[0].getAttribute(TAG_PROXY_STATE, null);	71	String proxyState = markers[0].getAttribute(TAG_PROXY_STATE, null);
71	if (proxyState == null) {	72	if (proxyState == null) {
Lines 232-238 Link Here
232	//- create a file marker to store the proxy state	233	//- create a file marker to store the proxy state
233	IMarker marker = _file.createMarker(MARKER_PROXYSTATE);	234	IMarker marker = _file.createMarker(MARKER_PROXYSTATE);
234	marker.setAttribute(TAG_LAST_SAVE_STAMP, Long.toString(lastSaveStamp));	235	marker.setAttribute(TAG_LAST_SAVE_STAMP, Long.toString(lastSaveStamp));
235	marker.setAttribute(TestUIConstants.TAG_FACTORY_ID, factoryId);	236	marker.setAttribute(TAG_FACTORY_ID, factoryId);
236	if (state != null) {	237	if (state != null) {
237	marker.setAttribute(TAG_PROXY_STATE, state);	238	marker.setAttribute(TAG_PROXY_STATE, state);
238	}	239	}

Lines 37-42 Link Here

(-)src/org/eclipse/hyades/test/ui/internal/navigator/proxy/EMFResourceProxyFactory.java (-7 / +12 lines)
37	*/	37	*/
38	public class EMFResourceProxyFactory implements IFileProxyFactory, IPersistableFileProxyFactory {	38	public class EMFResourceProxyFactory implements IFileProxyFactory, IPersistableFileProxyFactory {
39		39
		40	/**
		41	* Factory id.
		42	*/
		43	public final static String ID = "EMFResourceProxyFactory"; //$NON-NLS-1$
		44
40	/** This method is called to build a node that contains multiple EMF objects as children.	45	/** This method is called to build a node that contains multiple EMF objects as children.
41	* The object created depends of the extension of the file (.datapool -> DatapoolFileProxyNode)	46	* The object created depends of the extension of the file (.datapool -> DatapoolFileProxyNode)
42	* using as name the name of the file since if there are multiple objects inside, we can't	47	* using as name the name of the file since if there are multiple objects inside, we can't
Lines 130-148 Link Here
130	mementoChild.putString(TestUIConstants.TAG_URI_ROOT, memento.getString(TestUIConstants.TAG_URI_ROOT));	135	mementoChild.putString(TestUIConstants.TAG_URI_ROOT, memento.getString(TestUIConstants.TAG_URI_ROOT));
131	}	136	}
132	if(nodeKind.equals(TestUIConstants.ARTIFACT_FILE_NODE)) {	137	if(nodeKind.equals(TestUIConstants.ARTIFACT_FILE_NODE)) {
133	return new ArtifactFileProxyNode(file, memento.getString(TestUIConstants.TAG_NAME), mementoChildren);	138	return new ArtifactFileProxyNode(file, memento);
134	} else if(nodeKind.equals(TestUIConstants.DATAPOOL_FILE_NODE)) {	139	} else if(nodeKind.equals(TestUIConstants.DATAPOOL_FILE_NODE)) {
135	return new DatapoolFileProxyNode(file, memento.getString(TestUIConstants.TAG_NAME), mementoChildren);	140	return new DatapoolFileProxyNode(file, memento);
136	} else if(nodeKind.equals(TestUIConstants.DEPLOY_FILE_NODE)) {	141	} else if(nodeKind.equals(TestUIConstants.DEPLOY_FILE_NODE)) {
137	return new DeploymentFileProxyNode(file, memento.getString(TestUIConstants.TAG_NAME), mementoChildren);	142	return new DeploymentFileProxyNode(file, memento);
138	} else if(nodeKind.equals(TestUIConstants.EXECUTION_FILE_NODE)) {	143	} else if(nodeKind.equals(TestUIConstants.EXECUTION_FILE_NODE)) {
139	return new ExecutionFileProxyNode(file, memento.getString(TestUIConstants.TAG_NAME), mementoChildren);	144	return new ExecutionFileProxyNode(file, memento);
140	} else if(nodeKind.equals(TestUIConstants.LOCATION_FILE_NODE)) {	145	} else if(nodeKind.equals(TestUIConstants.LOCATION_FILE_NODE)) {
141	return new LocationFileProxyNode(file, memento.getString(TestUIConstants.TAG_NAME), mementoChildren);	146	return new LocationFileProxyNode(file, memento);
142	} else if(nodeKind.equals(TestUIConstants.TESTCOMPONENT_FILE_NODE)) {	147	} else if(nodeKind.equals(TestUIConstants.TESTCOMPONENT_FILE_NODE)) {
143	return new TestComponentFileProxyNode(file, memento.getString(TestUIConstants.TAG_NAME), mementoChildren);	148	return new TestComponentFileProxyNode(file, memento);
144	} else if(nodeKind.equals(TestUIConstants.TESTSUITE_FILE_NODE)) {	149	} else if(nodeKind.equals(TestUIConstants.TESTSUITE_FILE_NODE)) {
145	return new TestSuiteFileProxyNode(file, memento.getString(TestUIConstants.TAG_NAME), mementoChildren);	150	return new TestSuiteFileProxyNode(file, memento);
146	}	151	}
147	} else {	152	} else {
148	return proxy;	153	return proxy;

Lines 14-30 Link Here

(-)src/org/eclipse/hyades/test/ui/navigator/CMNNamedElementProxyNode.java (-9 / +28 lines)
14	import org.eclipse.core.resources.IFile;	14	import org.eclipse.core.resources.IFile;
15	import org.eclipse.core.resources.IResource;	15	import org.eclipse.core.resources.IResource;
16	import org.eclipse.core.runtime.Platform;	16	import org.eclipse.core.runtime.Platform;
17	import org.eclipse.emf.common.util.URI;
18	import org.eclipse.emf.ecore.EObject;	17	import org.eclipse.emf.ecore.EObject;
19	import org.eclipse.emf.ecore.resource.Resource;	18	import org.eclipse.emf.ecore.resource.Resource;
20	import org.eclipse.hyades.models.common.common.CMNNamedElement;	19	import org.eclipse.hyades.models.common.common.CMNNamedElement;
21	import org.eclipse.hyades.test.core.util.EMFUtil;	20	import org.eclipse.hyades.test.core.util.EMFUtil;
22	import org.eclipse.hyades.test.ui.TestUIConstants;
23	import org.eclipse.hyades.test.ui.UiPlugin;	21	import org.eclipse.hyades.test.ui.UiPlugin;
24	import org.eclipse.hyades.test.ui.navigator.actions.IProxyNodeRenamer;	22	import org.eclipse.hyades.test.ui.navigator.actions.IProxyNodeRenamer;
25	import org.eclipse.hyades.test.ui.navigator.actions.RenamerUIInlineEditor;	23	import org.eclipse.hyades.test.ui.navigator.actions.RenamerUIInlineEditor;
26	import org.eclipse.hyades.test.ui.navigator.actions.RenamerUIStatus;	24	import org.eclipse.hyades.test.ui.navigator.actions.RenamerUIStatus;
27	import org.eclipse.hyades.ui.editor.IHyadesEditorPart;
28	import org.eclipse.ui.IEditorInput;	25	import org.eclipse.ui.IEditorInput;
29	import org.eclipse.ui.IEditorPart;	26	import org.eclipse.ui.IEditorPart;
30	import org.eclipse.ui.IEditorReference;	27	import org.eclipse.ui.IEditorReference;
Lines 38-49 Link Here
38	* Proxy node for <code>CMNNamedElement</code> element.	35	* Proxy node for <code>CMNNamedElement</code> element.
39	* @author jgout	36	* @author jgout
40	*/	37	*/
41	/**
42	* @author jgout
43	* @since
44	*/
45	public abstract class CMNNamedElementProxyNode extends EObjectProxyNode implements IProxyNodeRenamer {	38	public abstract class CMNNamedElementProxyNode extends EObjectProxyNode implements IProxyNodeRenamer {
		39
		40	private final static String TAG_NAME = "name"; //$NON-NLS-1$
		41	private final static String TAG_DESCRIPTION = "description"; //$NON-NLS-1$
		42
46	private String name;	43	private String name;
		44	private String description;
47		45
48	/**	46	/**
49	* Constructor used to load an already built proxy.	47	* Constructor used to load an already built proxy.
Lines 52-61 Link Here
52	*/	50	*/
53	public CMNNamedElementProxyNode(IMemento memento, Object parent) {	51	public CMNNamedElementProxyNode(IMemento memento, Object parent) {
54	super(memento, parent);	52	super(memento, parent);
55	this.name = memento.getString(TestUIConstants.TAG_NAME);	53	this.name = memento.getString(TAG_NAME);
56	if(this.name == null) {	54	if(this.name == null) {
57	throw new IllegalArgumentException("Malformed saved proxy state: unable to retrieve name field"); //$NON-NLS-1$	55	throw new IllegalArgumentException("Malformed saved proxy state: unable to retrieve name field"); //$NON-NLS-1$
58	}	56	}
		57	this.description = memento.getString(TAG_DESCRIPTION);
59	}	58	}
60		59
61	/**	60	/**
Lines 66-72 Link Here
66	public CMNNamedElementProxyNode(EObject eObject, Object parent) {	65	public CMNNamedElementProxyNode(EObject eObject, Object parent) {
67	super(eObject, parent);	66	super(eObject, parent);
68	if(eObject instanceof CMNNamedElement) {	67	if(eObject instanceof CMNNamedElement) {
69	this.name = ((CMNNamedElement)eObject).getName();	68	CMNNamedElement namedElement = (CMNNamedElement)eObject;
		69	this.name = namedElement.getName();
		70	this.description = namedElement.getDescription();
70	} else {	71	} else {
71	throw new IllegalArgumentException("CMNNamedElementProxyNode can only be built upon CMNNamedElement"); //$NON-NLS-1$	72	throw new IllegalArgumentException("CMNNamedElementProxyNode can only be built upon CMNNamedElement"); //$NON-NLS-1$
72	}	73	}
Lines 90-95 Link Here
90	this.name = name;	91	this.name = name;
91	}	92	}
92		93
		94	public String getName() {
		95	return this.description;
		96	}
		97
		98	/**
		99	* Returns the description of the named element.
		100	* @return
		101	*/
		102	public String getDescription() {
		103	return this.description;
		104	}
		105
93	/**	106	/**
94	* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)	107	* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
95	*/	108	*/
Lines 171-174 Link Here
171	public RenamerUIStatus performUserInteraction(String oldName) {	184	public RenamerUIStatus performUserInteraction(String oldName) {
172	return new RenamerUIInlineEditor();	185	return new RenamerUIInlineEditor();
173	}	186	}
		187
		188	public boolean saveState(IMemento memento) {
		189	memento.putString(TAG_NAME, getName());
		190	return super.saveState(memento);
		191	}
		192
174	}	193	}

Lines 11-33 Link Here

(-)src/org/eclipse/hyades/test/ui/TestUIConstants.java (-1 / +20 lines)
11	*******************************************************************************/	11	*******************************************************************************/
12	package org.eclipse.hyades.test.ui;	12	package org.eclipse.hyades.test.ui;
13		13
14	/** Constants storage interface	14	/**
		15	* Constants storage interface
15	* @author jgout	16	* @author jgout
16	*/	17	*/
17	public interface TestUIConstants {	18	public interface TestUIConstants {
18		19
		20	/**
		21	* @deprecated use TAG_FRAGMENT instead. We no longer should persiste the full URI because it contains file path
		22	*/
19	public static final String TAG_FACTORY_ID = "factoryID"; //$NON-NLS-1$	23	public static final String TAG_FACTORY_ID = "factoryID"; //$NON-NLS-1$
20	public static final String TAG_NODE_KIND = "nodeKind"; //$NON-NLS-1$	24	public static final String TAG_NODE_KIND = "nodeKind"; //$NON-NLS-1$
		25	/**
		26	* @deprecated use TAG_FRAGMENT instead. We no longer should persiste the full URI because it contains file path
		27	*/
21	public static final String TAG_NAME = "name"; //$NON-NLS-1$	28	public static final String TAG_NAME = "name"; //$NON-NLS-1$
22	public static final String TAG_TYPE = "type"; //$NON-NLS-1$	29	public static final String TAG_TYPE = "type"; //$NON-NLS-1$
23	/**	30	/**
24	* @deprecated use TAG_FRAGMENT instead. We no longer should persiste the full URI because it contains file path	31	* @deprecated use TAG_FRAGMENT instead. We no longer should persiste the full URI because it contains file path
25	*/	32	*/
26	public static final String TAG_URI = "uri"; //$NON-NLS-1$	33	public static final String TAG_URI = "uri"; //$NON-NLS-1$
		34	/**
		35	* @deprecated This constant was mistakenly published.
		36	*/
27	public static final String TAG_URI_FRAGMENT = "uriFragment"; //$NON-NLS-1$	37	public static final String TAG_URI_FRAGMENT = "uriFragment"; //$NON-NLS-1$
28	public static final String TAG_URI_ROOT = "uriRoot"; //$NON-NLS-1$	38	public static final String TAG_URI_ROOT = "uriRoot"; //$NON-NLS-1$
		39	/**
		40	* @deprecated This constant was mistakenly published.
		41	*/
29	public static final String TAG_IDENTIFIER = "identifier"; //$NON-NLS-1$	42	public static final String TAG_IDENTIFIER = "identifier"; //$NON-NLS-1$
		43	/**
		44	* @deprecated This constant was mistakenly published.
		45	*/
30	public static final String TAG_UNDERLYING_RESOURCE = "underlyingResource"; //$NON-NLS-1$	46	public static final String TAG_UNDERLYING_RESOURCE = "underlyingResource"; //$NON-NLS-1$
		47	/**
		48	* @deprecated This constant was mistakenly published.
		49	*/
31	public static final String TAG_VERDICT = "verdict"; //$NON-NLS-1$	50	public static final String TAG_VERDICT = "verdict"; //$NON-NLS-1$
32		51
33	//- hyades default value of tag TAG_NODE_KIND	52	//- hyades default value of tag TAG_NODE_KIND