495,498c495,498
< 		m_projectToolBar->addAction(m_instantiateDesAct);
< 		m_projectToolBar->addAction(m_editInstAct);
< 		m_projectToolBar->addAction(m_deleteInstantiationAct);
< 		m_projectToolBar->addAction(m_regenerateInstantiationAct);
---
> 		//m_projectToolBar->addAction(m_instantiateDesAct);
> 		//m_projectToolBar->addAction(m_editInstAct);
> 		//m_projectToolBar->addAction(m_deleteInstantiationAct);
> 		//m_projectToolBar->addAction(m_regenerateInstantiationAct);
606d605
< 			std::cout<<"projectworkspace540"<<std::endl;
621c620,623
<                 disconnect(m_pProjStructUiPart, SIGNAL(onEnterCurrentInst()), projectEditor(), SLOT(onEditInst())); 
---
> 
> 		// rjl: tried to comment this out to stop double
> 		//                editing of instantiation
> 		                disconnect(m_pProjStructUiPart, SIGNAL(onEnterCurrentInst()), projectEditor(), SLOT(onEditInst())); 
645c647
< 		m_regenerateInstantiationAct->setEnabled(true);
---
> 		m_regenerateInstantiationAct->setEnabled(false);
657,658c659,660
< 			//connect(m_pProjStructUiPart, SIGNAL(onCurrentTemplateInstantiation()), projectEditor(), SLOT(onInstantiateTemplate()));
< 			std::cout<<"projectworkspace540"<<std::endl;
---
> 			//connect(m_pProjStructUiPart,
> 		SIGNAL(onCurrentTemplateInstantiation()), projectEditor(), SLOT(onInstantiateTemplate()));
662a665,670
> 		else
> 		{
> 		  //rjl: commented out item below as doubleclicking
> 		  //was failing when multiple instantiations
> 		  //			disconnect(m_pProjStructUiPart,SIGNAL(onEnterCurrentInst()), projectEditor(), SLOT(onEditInst()));
> 		}
703c711
< 	m_regenerateInstantiationAct->setEnabled(true);
---
> 	m_regenerateInstantiationAct->setEnabled(false);
767c775
< 	m_regenerateInstantiationAct->setEnabled(true);
---
> 	m_regenerateInstantiationAct->setEnabled(false);
