Projects >> infoglue >>6027fda676a261a2b0d94e29bcd72c03caa2fd67

Chunk
Conflicting content 
		logger.info("componentId:" + this.componentId);
		logger.info("slotId:" + this.slotId);
		logger.info("specifyBaseTemplate:" + this.specifyBaseTemplate);
<<<<<<< HEAD
		logger.info("hideComponentPropertiesOnLoad:" + this.hideComponentPropertiesOnLoad);
		
=======

		logger.info("hideComponentPropertiesOnLoad:" + this.hideComponentPropertiesOnLoad);

>>>>>>> fa18b9278b900bb3fc87bf6dc1a3ac2a7b6740df
		initialize();
		logger.info("masterLanguageId:" + this.masterLanguageVO.getId());
Solution content 
		logger.info("componentId:" + this.componentId);
		logger.info("slotId:" + this.slotId);
		logger.info("specifyBaseTemplate:" + this.specifyBaseTemplate);
		logger.info("hideComponentPropertiesOnLoad:" + this.hideComponentPropertiesOnLoad);
		initialize();
		logger.info("masterLanguageId:" + this.masterLanguageVO.getId());
File
ViewSiteNodePageComponentsAction.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
		
		logger.info("newComponentId:" + newComponentId);
		
<<<<<<< HEAD
		this.url = getComponentRendererUrl() + getComponentRendererAction() + "?siteNodeId=" + this.siteNodeId + "&languageId=" + this.languageId + "&contentId=" + this.contentId +  "&hideComponentPropertiesOnLoad=" + this.hideComponentPropertiesOnLoad + "&focusElementId=" + newComponentId + "&activatedComponentId=" + newComponentId + "&componentContentId=" + this.componentId + "&showSimple=" + this.showSimple + "&stateChanged=" + this.stateChanged;
=======
		this.url = getComponentRendererUrl() + getComponentRendererAction() + "?siteNodeId=" + this.siteNodeId + "&languageId=" + this.languageId + "&contentId=" + this.contentId + "&focusElementId=" + newComponentId + "&activatedComponentId=" + newComponentId + "&componentContentId=" + this.componentId + "&showSimple=" + this.showSimple + "&stateChanged=" + this.stateChanged + "&hideComponentPropertiesOnLoad=" + this.hideComponentPropertiesOnLoad;
>>>>>>> fa18b9278b900bb3fc87bf6dc1a3ac2a7b6740df
		//logger.info("this.url:" + this.url);
		//this.getResponse().sendRedirect(url);
Solution content 
		
		
		logger.info("newComponentId:" + newComponentId);
		
		this.url = getComponentRendererUrl() + getComponentRendererAction() + "?siteNodeId=" + this.siteNodeId + "&languageId=" + this.languageId + "&contentId=" + this.contentId + "&focusElementId=" + newComponentId + "&activatedComponentId=" + newComponentId + "&componentContentId=" + this.componentId + "&showSimple=" + this.showSimple + "&stateChanged=" + this.stateChanged + "&hideComponentPropertiesOnLoad=" + this.hideComponentPropertiesOnLoad;
		//logger.info("this.url:" + this.url);
		//this.getResponse().sendRedirect(url);
File
ViewSiteNodePageComponentsAction.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method invocation
Variable
Chunk
Conflicting content 
		logger.info("slotId:" + this.slotId);
		logger.info("specifyBaseTemplate:" + this.specifyBaseTemplate);
		logger.info("pagePartContentId:" + this.pagePartContentId);
<<<<<<< HEAD
=======

>>>>>>> fa18b9278b900bb3fc87bf6dc1a3ac2a7b6740df
		logger.info("hideComponentPropertiesOnLoad:" + this.hideComponentPropertiesOnLoad);
		try
		{
Solution content 
		logger.info("slotId:" + this.slotId);
		logger.info("specifyBaseTemplate:" + this.specifyBaseTemplate);
		logger.info("pagePartContentId:" + this.pagePartContentId);
		logger.info("hideComponentPropertiesOnLoad:" + this.hideComponentPropertiesOnLoad);
		try
		{
File
ViewSiteNodePageComponentsAction.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
			
			logger.info("newComponentId:" + newComponentId);
			
<<<<<<< HEAD
			this.url = getComponentRendererUrl() + getComponentRendererAction() + "?siteNodeId=" + this.siteNodeId + "&languageId=" + this.languageId + "&contentId=" + this.contentId + "&hideComponentPropertiesOnLoad=" + this.hideComponentPropertiesOnLoad + "&focusElementId=" + newComponentId + "&activatedComponentId=" + newComponentId + "&componentContentId=" + this.componentId + "&showSimple=" + this.showSimple + "&stateChanged=" + stateChanged;
=======
			this.url = getComponentRendererUrl() + getComponentRendererAction() + "?siteNodeId=" + this.siteNodeId + "&languageId=" + this.languageId + "&contentId=" + this.contentId + "&focusElementId=" + newComponentId + "&activatedComponentId=" + newComponentId + "&componentContentId=" + this.componentId + "&showSimple=" + this.showSimple + "&stateChanged=" + stateChanged  + "&hideComponentPropertiesOnLoad=" + this.hideComponentPropertiesOnLoad;
>>>>>>> fa18b9278b900bb3fc87bf6dc1a3ac2a7b6740df
			//this.getResponse().sendRedirect(url);		

			this.url = this.getResponse().encodeURL(url);
Solution content 
			
			logger.info("newComponentId:" + newComponentId);
			
			this.url = getComponentRendererUrl() + getComponentRendererAction() + "?siteNodeId=" + this.siteNodeId + "&languageId=" + this.languageId + "&contentId=" + this.contentId + "&focusElementId=" + newComponentId + "&activatedComponentId=" + newComponentId + "&componentContentId=" + this.componentId + "&showSimple=" + this.showSimple + "&stateChanged=" + stateChanged  + "&hideComponentPropertiesOnLoad=" + this.hideComponentPropertiesOnLoad;
			//this.getResponse().sendRedirect(url);		

			this.url = this.getResponse().encodeURL(url);
File
ViewSiteNodePageComponentsAction.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method invocation
Variable
Chunk
Conflicting content 
		logger.info("componentId:" + this.componentId);
		logger.info("slotId:" + this.slotId);
		logger.info("specifyBaseTemplate:" + this.specifyBaseTemplate);
<<<<<<< HEAD
		logger.info("hideComponentPropertiesOnLoad:" + this.hideComponentPropertiesOnLoad);
=======

		logger.info("hideComponentPropertiesOnLoad:" + this.hideComponentPropertiesOnLoad);
		
>>>>>>> fa18b9278b900bb3fc87bf6dc1a3ac2a7b6740df
		initialize();

		logger.info("masterLanguageId:" + this.masterLanguageVO.getId());
Solution content 
		logger.info("componentId:" + this.componentId);
		logger.info("slotId:" + this.slotId);
		logger.info("specifyBaseTemplate:" + this.specifyBaseTemplate);
		logger.info("hideComponentPropertiesOnLoad:" + this.hideComponentPropertiesOnLoad);

		initialize();

		logger.info("masterLanguageId:" + this.masterLanguageVO.getId());
File
ViewSiteNodePageComponentsAction.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
					
					ContentVersionController.getContentVersionController().updateAttributeValue(contentVersionVO.getContentVersionId(), "ComponentStructure", modifiedXML, this.getInfoGluePrincipal());

<<<<<<< HEAD
					this.url = getComponentRendererUrl() + getComponentRendererAction() + "?siteNodeId=" + this.siteNodeId + "&languageId=" + this.languageId + "&contentId=" + this.contentId + "&hideComponentPropertiesOnLoad=" + this.hideComponentPropertiesOnLoad + "&focusElementId=" + componentId + "&componentContentId=" + componentContentVO.getId() + "&showSimple=" + this.showSimple + "&stateChanged=" + stateChanged;
=======
					this.url = getComponentRendererUrl() + getComponentRendererAction() + "?siteNodeId=" + this.siteNodeId + "&languageId=" + this.languageId + "&contentId=" + this.contentId + "&focusElementId=" + componentId + "&componentContentId=" + componentContentVO.getId() + "&showSimple=" + this.showSimple + "&stateChanged=" + stateChanged  + "&hideComponentPropertiesOnLoad=" + this.hideComponentPropertiesOnLoad;
>>>>>>> fa18b9278b900bb3fc87bf6dc1a3ac2a7b6740df
				}
				else if(allowed && (component.getParentNode() != parentComponentComponentsElement || !slotId.equalsIgnoreCase(component.getAttribute("name"))))
				{
Solution content 
					
					ContentVersionController.getContentVersionController().updateAttributeValue(contentVersionVO.getContentVersionId(), "ComponentStructure", modifiedXML, this.getInfoGluePrincipal());

					this.url = getComponentRendererUrl() + getComponentRendererAction() + "?siteNodeId=" + this.siteNodeId + "&languageId=" + this.languageId + "&contentId=" + this.contentId + "&focusElementId=" + componentId + "&componentContentId=" + componentContentVO.getId() + "&showSimple=" + this.showSimple + "&stateChanged=" + stateChanged  + "&hideComponentPropertiesOnLoad=" + this.hideComponentPropertiesOnLoad;
				}
				else if(allowed && (component.getParentNode() != parentComponentComponentsElement || !slotId.equalsIgnoreCase(component.getAttribute("name"))))
				{
File
ViewSiteNodePageComponentsAction.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method invocation
Variable
Chunk
Conflicting content 
			}
			else
			{
<<<<<<< HEAD
				this.url = getComponentRendererUrl() + getComponentRendererAction() + "?siteNodeId=" + this.siteNodeId + "&languageId=" + this.languageId + "&contentId=" + this.contentId + "&hideComponentPropertiesOnLoad=" + this.hideComponentPropertiesOnLoad + "&focusElementId=" + this.componentId + (!hideComponentPropertiesOnLoad ? "&activatedComponentId=" + this.componentId : "") + "&componentContentId=" + componentContentId + "&showSimple=" + this.showSimple + "&stateChanged=" + stateChanged;
=======
				this.url = getComponentRendererUrl() + getComponentRendererAction() + "?siteNodeId=" + this.siteNodeId + "&languageId=" + this.languageId + "&contentId=" + this.contentId + "&focusElementId=" + this.componentId + (!hideComponentPropertiesOnLoad ? "&activatedComponentId=" + this.componentId : "") + "&componentContentId=" + componentContentId + "&showSimple=" + this.showSimple + "&stateChanged=" + stateChanged + "&hideComponentPropertiesOnLoad=" + this.hideComponentPropertiesOnLoad;
>>>>>>> fa18b9278b900bb3fc87bf6dc1a3ac2a7b6740df
				//this.getResponse().sendRedirect(url);		
	
				this.url = this.getResponse().encodeURL(url);
Solution content 
			}
			else
			{
				this.url = getComponentRendererUrl() + getComponentRendererAction() + "?siteNodeId=" + this.siteNodeId + "&languageId=" + this.languageId + "&contentId=" + this.contentId + "&focusElementId=" + this.componentId + (!hideComponentPropertiesOnLoad ? "&activatedComponentId=" + this.componentId : "") + "&componentContentId=" + componentContentId + "&showSimple=" + this.showSimple + "&stateChanged=" + stateChanged + "&hideComponentPropertiesOnLoad=" + this.hideComponentPropertiesOnLoad;
				//this.getResponse().sendRedirect(url);		
	
				this.url = this.getResponse().encodeURL(url);
File
ViewSiteNodePageComponentsAction.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method invocation
Variable
Chunk
Conflicting content 
		logger.info("componentId:" + this.componentId);
		logger.info("doChangeComponent:" + this.getRequest().getQueryString());
		logger.info("masterLanguageId:" + this.masterLanguageVO.getId());
<<<<<<< HEAD
=======

>>>>>>> fa18b9278b900bb3fc87bf6dc1a3ac2a7b6740df
		logger.info("hideComponentPropertiesOnLoad:" + this.hideComponentPropertiesOnLoad);
		this.hasChangeComponentRecursivelyAccess = this.hasAccessTo("ComponentEditor.ChangeComponentRecursively", true);
Solution content 
		logger.info("componentId:" + this.componentId);
		logger.info("doChangeComponent:" + this.getRequest().getQueryString());
		logger.info("masterLanguageId:" + this.masterLanguageVO.getId());
		logger.info("hideComponentPropertiesOnLoad:" + this.hideComponentPropertiesOnLoad);
		this.hasChangeComponentRecursivelyAccess = this.hasAccessTo("ComponentEditor.ChangeComponentRecursively", true);
File
ViewSiteNodePageComponentsAction.java
Developer's decision
Version 1
Kind of conflict
Blank