Attachment #66473 for bug #163352

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




			 xmiString.append(lsMgr.generateLogSetPrefEntry(key));
			 populateLogSetFilterList(key,filterList);			 
		}			
		xmiString.append(FilterTransformationHelper.convertXmiToXml(lsMgr.generateLogSetFilterDefEntry(filterList)));
		xmiString.append(" </");				
		xmiString.append(LogSetManager.LOGSETS_KEY);
		xmiString.append(">");

		String filePath = sourceNameField.getText().trim();
	
    	String filePath = sourceNameField.getText().trim();
    	if (!filePath.endsWith(".logsxml"))
    		filePath += ".logsxml";
		

			OutputStream outputStream = new FileOutputStream(file.toString(), false);
			writer = new OutputStreamWriter(outputStream, "UTF8");
			
			writer.write(FilterTransformationHelper.indentXML(xmiString.toString()));
			writer.flush();
			writer.close();
			




				populateLogSetFilterList(rSource,elem,filterList);
			}
			
			lsMgr.loadLogSet(elem);			
		}
		
		if(filterList.size() > 0)
			lsMgr.saveLogSetFilters(filterList);

		for(int idx=0; idx<list.size(); idx++)
		{
			Element elem = (Element)list.get(idx);

			lsMgr.loadLogSet(elem);			
		}

		
		if(rSource != null)
			rSource.clear();

			    FileInputStream inputStream = new FileInputStream(fileName);
			    Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(inputStream);
			    Element root = doc.getDocumentElement();
			    NodeList nl = root.getChildNodes();

			    for(int l1 = 0; l1 < nl.getLength(); l1++)

	    		doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new InputSource(new StringReader(xmiString)));
	    		Element elem = doc.getDocumentElement();
	    		NodeList nl = elem.getChildNodes();
		    	for(int l1 = 0; l1 < nl.getLength(); l1++)
			    {
			    	if(nl.item(l1).getNodeName().equals(LogSetManager.FILTER_TAG))
			    	{
			    		Node node = nl.item(l1);
					    String xmlString = FilterTransformationHelper.toString(node);
			    		String xmiString = FilterTransformationHelper.convertXmlToXmi(xmlString);
			    		doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new InputSource(new StringReader(xmiString)));
			    		filterNode = doc.getDocumentElement();
			    		FilterResourceFileHandler rSource = FilterResourceFileHandler.instance(URI.createFileURI(fileName)); //filters list to store new imported filters 
			    		rSource.clear();
			    		String fl = FilterTransformationHelper.toString(filterNode);
			    		InputStream is = new ByteArrayInputStream(fl.getBytes());
						rSource.load(is, LogSetManager.RESOURCE_OPTIONS);
						return rSource;
			    	}




import org.apache.xml.serialize.OutputFormat;
import org.apache.xml.serialize.XMLSerializer;
import org.eclipse.tptp.monitoring.logui.internal.MonitoringLogUIPlugin;
import org.eclipse.tptp.monitoring.logui.internal.wizards.LogSetManager;

import org.w3c.dom.Document;
import org.w3c.dom.Element;

			
			Document newDocument = builder.newDocument();
				
			Element element = (Element) document.getElementsByTagName(LogSetManager.FILTER_TAG).item(0);
			if(element != null)
			{
				buildXMLDocument(element, null, newDocument);
			}
			
			Node root = newDocument.getDocumentElement();
			
			return 	toString(root,false);
		}
		catch (Exception e) 
		{

			}
		}
	}
	
	public static String indentXML(String xml)
	{
		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
		try
		{
			DocumentBuilder builder = factory.newDocumentBuilder();
			
			Document document = builder.parse(new InputSource(new StringReader(xml)));
			
			return toString(document.getDocumentElement());
		}
		catch (Exception e) 
		{
			MonitoringLogUIPlugin.log(e);
			return xml;
		}
	}

	public static String convertXmlToXmi(String xmlString)
	{

			
			Document newDocument = builder.newDocument();
				
			Element element = (Element) document.getElementsByTagName(LogSetManager.FILTER_TAG).item(0);
			if(element != null)
			{
				buildXmiDocument(element, null, newDocument);
			}
			Node root = newDocument.getDocumentElement();
			Node root = newDocument.getElementsByTagName("logsets").item(0);
			
			return 	toString(root);
		}

			nodeName = "HierarchyExtensions:SimpleSearchQuery";
		}
		
		if(nodeName.equals(LogSetManager.FILTER_TAG))
		
		Node textChild = element.getFirstChild();
		if(textChild != null && textChild instanceof Text)
		{
			Element xmiElement = newDocument.createElement("xmi:XMI");
			
			xmiElement.setAttribute("xmi:version", "2.0");
			xmiElement.setAttribute("xmlns:xmi", "http://www.omg.org/XMI");
			xmiElement.setAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance");
			xmiElement.setAttribute("xmlns:HierarchyExtensions", "http://www.eclipse.org/hyades/models/hierarchy-extensions.xmi");
			xmiElement.setAttribute("xmlns:ecore", "http://www.eclipse.org/emf/2002/Ecore");

			parent = xmiElement;
			newDocument.appendChild(parent);
		}
		else
		NamedNodeMap attributes = element.getAttributes();
		for(int i = 0; i < attributes.getLength(); i++)
		{
			Element newElement = newDocument.createElement(nodeName);
			String name = attribute.getNodeName();
			if(name.equals("category"))
			{
				name = "xsi:type";
			}
			else if(nodeName.equals("valueType") && name.equals("type"))
			{
				name = "href";
			}
			
			Node textChild = element.getFirstChild();
			if(textChild != null && textChild instanceof Text)
			{
				value = value.replaceFirst("Hierarchial", "HierarchyExtensions:");
			}
			else if(value.startsWith("Event:"))
			{
				value = value.replaceFirst("Event:", "ecore:E");
			}
			else if(nodeName.equals("valueType") && name.equals("href"))
			{
				String data = ((Text)textChild).getData();
				if(data != null)
					newElement.appendChild(newDocument.createTextNode(data));
			}
			
			NamedNodeMap attributes = element.getAttributes();
			for(int i = 0; i < attributes.getLength(); i++)
			{
				Node attribute = attributes.item(i);
				String name = attribute.getNodeName();
				if(name.equals("category"))
				{
					name = "xsi:type";
				}
				else if(nodeName.equals("valueType") && name.equals("type"))
				{
					name = "href";
				}
				
				String value = attribute.getNodeValue();
				if(value.startsWith("Hierarchial"))
				{
					value = value.replaceFirst("Hierarchial", "HierarchyExtensions:");
				}
				else if(value.startsWith("Event:"))
				{
					value = value.replaceFirst("Event:", "ecore:E");
				}
				else if(nodeName.equals("valueType") && name.equals("href"))
				{
					value = "http://www.eclipse.org/emf/2002/Ecore#//E" + value;
				}
				else if(value.startsWith("ImportLogFilterType:"))
				{
					value = value.replaceFirst("ImportLogFilterType:", "org.eclipse.hyades.log.ui.ImportLogFilterType:");
				}
				
				newElement.setAttribute(name, value);
			}
			
			newElement.setAttribute(name, value);
		}
		
		if(parent == null)
		{
			newDocument.appendChild(newElement);
		}
		else
		{
			parent.appendChild(newElement);
			parent = newElement;
		}
		parent = newElement;
		
		if(nodeName.equals("filters"))
		{
			Element xmiElement = newDocument.createElement("xmi:XMI");
			
			xmiElement.setAttribute("xmi:version", "2.0");
			xmiElement.setAttribute("xmlns:xmi", "http://www.omg.org/XMI");
			xmiElement.setAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance");
			xmiElement.setAttribute("xmlns:HierarchyExtensions", "http://www.eclipse.org/hyades/models/hierarchy-extensions.xmi");
			xmiElement.setAttribute("xmlns:ecore", "http://www.eclipse.org/emf/2002/Ecore");
			
			parent.appendChild(xmiElement);
			
			parent = xmiElement;
		}

		NodeList children = element.getChildNodes();
		for(int i = 0; i < children.getLength(); i++)
		{

Return to bug 163352

Lines 69-82 Link Here

(-)src/org/eclipse/tptp/monitoring/logui/internal/wizards/ExportLogSetsUI.java (-6 / +4 lines)
69	xmiString.append(lsMgr.generateLogSetPrefEntry(key));	69	xmiString.append(lsMgr.generateLogSetPrefEntry(key));
70	populateLogSetFilterList(key,filterList);	70	populateLogSetFilterList(key,filterList);
71	}	71	}
72	xmiString.append(lsMgr.generateLogSetFilterDefEntry(filterList));	72	xmiString.append(FilterTransformationHelper.convertXmiToXml(lsMgr.generateLogSetFilterDefEntry(filterList)));
73	xmiString.append(" </");	73	xmiString.append(" </");
74	xmiString.append(LogSetManager.LOGSETS_KEY);	74	xmiString.append(LogSetManager.LOGSETS_KEY);
75	xmiString.append(">");	75	xmiString.append(">");
76		76
77	String xmlString = FilterTransformationHelper.convertXmiToXml(xmiString.toString());	77	String filePath = sourceNameField.getText().trim();
78
79	String filePath = sourceNameField.getText().trim();
80	if (!filePath.endsWith(".logsxml"))	78	if (!filePath.endsWith(".logsxml"))
81	filePath += ".logsxml";	79	filePath += ".logsxml";
82		80
Lines 103-109 Link Here
103	OutputStream outputStream = new FileOutputStream(file.toString(), false);	101	OutputStream outputStream = new FileOutputStream(file.toString(), false);
104	writer = new OutputStreamWriter(outputStream, "UTF8");	102	writer = new OutputStreamWriter(outputStream, "UTF8");
105		103
106	writer.write(xmlString.toString());	104	writer.write(FilterTransformationHelper.indentXML(xmiString.toString()));
107	writer.flush();	105	writer.flush();
108	writer.close();	106	writer.close();
109		107

Lines 74-84 Link Here

(-)src/org/eclipse/tptp/monitoring/logui/internal/wizards/ImportLogSetsUI.java (-12 / +18 lines)
74	populateLogSetFilterList(rSource,elem,filterList);	74	populateLogSetFilterList(rSource,elem,filterList);
75	}	75	}
76		76
77	lsMgr.loadLogSet(elem);
78	}	77	}
79		78
80	if(filterList.size() > 0)	79	if(filterList.size() > 0)
81	lsMgr.saveLogSetFilters(filterList);	80	lsMgr.saveLogSetFilters(filterList);
		81
		82	for(int idx=0; idx<list.size(); idx++)
		83	{
		84	Element elem = (Element)list.get(idx);
		85
		86	lsMgr.loadLogSet(elem);
		87	}
		88
82		89
83	if(rSource != null)	90	if(rSource != null)
84	rSource.clear();	91	rSource.clear();
Lines 132-153 Link Here
132	FileInputStream inputStream = new FileInputStream(fileName);	139	FileInputStream inputStream = new FileInputStream(fileName);
133	Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(inputStream);	140	Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(inputStream);
134	Element root = doc.getDocumentElement();	141	Element root = doc.getDocumentElement();
135	String xmlString = FilterTransformationHelper.toString(root);	142	NodeList nl = root.getChildNodes();
136		143
137	String xmiString = FilterTransformationHelper.convertXmlToXmi(xmlString);	144	for(int l1 = 0; l1 < nl.getLength(); l1++)
138
139	doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new InputSource(new StringReader(xmiString)));
140	Element elem = doc.getDocumentElement();
141	NodeList nl = elem.getChildNodes();
142	for(int l1 = 0; l1 < nl.getLength(); l1++)
143	{	145	{
144	if(nl.item(l1).getNodeName().equals(LogSetManager.FILTER_TAG))	146	if(nl.item(l1).getNodeName().equals(LogSetManager.FILTER_TAG))
145	{	147	{
146	filterNode = (Element)nl.item(l1);	148	Node node = nl.item(l1);
		149	String xmlString = FilterTransformationHelper.toString(node);
		150	String xmiString = FilterTransformationHelper.convertXmlToXmi(xmlString);
		151	doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new InputSource(new StringReader(xmiString)));
		152	filterNode = doc.getDocumentElement();
147	FilterResourceFileHandler rSource = FilterResourceFileHandler.instance(URI.createFileURI(fileName)); //filters list to store new imported filters	153	FilterResourceFileHandler rSource = FilterResourceFileHandler.instance(URI.createFileURI(fileName)); //filters list to store new imported filters
148	rSource.clear();	154	rSource.clear();
149		155	String fl = FilterTransformationHelper.toString(filterNode);
150	InputStream is = new ByteArrayInputStream(FilterTransformationHelper.toString(filterNode).getBytes());	156	InputStream is = new ByteArrayInputStream(fl.getBytes());
151	rSource.load(is, LogSetManager.RESOURCE_OPTIONS);	157	rSource.load(is, LogSetManager.RESOURCE_OPTIONS);
152	return rSource;	158	return rSource;
153	}	159	}

Lines 21-26 Link Here

(-)src/org/eclipse/tptp/monitoring/logui/internal/util/FilterTransformationHelper.java (-64 / +76 lines)
21	import org.apache.xml.serialize.OutputFormat;	21	import org.apache.xml.serialize.OutputFormat;
22	import org.apache.xml.serialize.XMLSerializer;	22	import org.apache.xml.serialize.XMLSerializer;
23	import org.eclipse.tptp.monitoring.logui.internal.MonitoringLogUIPlugin;	23	import org.eclipse.tptp.monitoring.logui.internal.MonitoringLogUIPlugin;
		24	import org.eclipse.tptp.monitoring.logui.internal.wizards.LogSetManager;
24		25
25	import org.w3c.dom.Document;	26	import org.w3c.dom.Document;
26	import org.w3c.dom.Element;	27	import org.w3c.dom.Element;
Lines 43-57 Link Here
43		44
44	Document newDocument = builder.newDocument();	45	Document newDocument = builder.newDocument();
45		46
46	Element element = (Element) document.getElementsByTagName("logsets").item(0);	47	Element element = (Element) document.getElementsByTagName(LogSetManager.FILTER_TAG).item(0);
47	if(element != null)	48	if(element != null)
48	{	49	{
49	buildXMLDocument(element, null, newDocument);	50	buildXMLDocument(element, null, newDocument);
50	}	51	}
51		52
52	Node root = newDocument.getElementsByTagName("logsets").item(0);	53	Node root = newDocument.getDocumentElement();
53		54
54	return toString(root);	55	return toString(root,false);
55	}	56	}
56	catch (Exception e)	57	catch (Exception e)
57	{	58	{
Lines 141-146 Link Here
141	}	142	}
142	}	143	}
143	}	144	}
		145
		146	public static String indentXML(String xml)
		147	{
		148	DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
		149	try
		150	{
		151	DocumentBuilder builder = factory.newDocumentBuilder();
		152
		153	Document document = builder.parse(new InputSource(new StringReader(xml)));
		154
		155	return toString(document.getDocumentElement());
		156	}
		157	catch (Exception e)
		158	{
		159	MonitoringLogUIPlugin.log(e);
		160	return xml;
		161	}
		162	}
144		163
145	public static String convertXmlToXmi(String xmlString)	164	public static String convertXmlToXmi(String xmlString)
146	{	165	{
Lines 153-165 Link Here
153		172
154	Document newDocument = builder.newDocument();	173	Document newDocument = builder.newDocument();
155		174
156	Element element = (Element) document.getElementsByTagName("logsets").item(0);	175	Element element = (Element) document.getElementsByTagName(LogSetManager.FILTER_TAG).item(0);
157	if(element != null)	176	if(element != null)
158	{	177	{
159	buildXmiDocument(element, null, newDocument);	178	buildXmiDocument(element, null, newDocument);
160	}	179	}
161		180	Node root = newDocument.getDocumentElement();
162	Node root = newDocument.getElementsByTagName("logsets").item(0);
163		181
164	return toString(root);	182	return toString(root);
165	}	183	}
Lines 179-254 Link Here
179	nodeName = "HierarchyExtensions:SimpleSearchQuery";	197	nodeName = "HierarchyExtensions:SimpleSearchQuery";
180	}	198	}
181		199
182	Element newElement = newDocument.createElement(nodeName);	200	if(nodeName.equals(LogSetManager.FILTER_TAG))
183
184	Node textChild = element.getFirstChild();
185	if(textChild != null && textChild instanceof Text)
186	{	201	{
187	String data = ((Text)textChild).getData();	202	Element xmiElement = newDocument.createElement("xmi:XMI");
188	if(data != null)	203
189	newElement.appendChild(newDocument.createTextNode(data));	204	xmiElement.setAttribute("xmi:version", "2.0");
		205	xmiElement.setAttribute("xmlns:xmi", "http://www.omg.org/XMI");
		206	xmiElement.setAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance");
		207	xmiElement.setAttribute("xmlns:HierarchyExtensions", "http://www.eclipse.org/hyades/models/hierarchy-extensions.xmi");
		208	xmiElement.setAttribute("xmlns:ecore", "http://www.eclipse.org/emf/2002/Ecore");
		209
		210	parent = xmiElement;
		211	newDocument.appendChild(parent);
190	}	212	}
191		213	else
192	NamedNodeMap attributes = element.getAttributes();
193	for(int i = 0; i < attributes.getLength(); i++)
194	{	214	{
195	Node attribute = attributes.item(i);	215	Element newElement = newDocument.createElement(nodeName);
196	String name = attribute.getNodeName();
197	if(name.equals("category"))
198	{
199	name = "xsi:type";
200	}
201	else if(nodeName.equals("valueType") && name.equals("type"))
202	{
203	name = "href";
204	}
205		216
206	String value = attribute.getNodeValue();	217	Node textChild = element.getFirstChild();
207	if(value.startsWith("Hierarchial"))	218	if(textChild != null && textChild instanceof Text)
208	{
209	value = value.replaceFirst("Hierarchial", "HierarchyExtensions:");
210	}
211	else if(value.startsWith("Event:"))
212	{
213	value = value.replaceFirst("Event:", "ecore:E");
214	}
215	else if(nodeName.equals("valueType") && name.equals("href"))
216	{	219	{
217	value = "http://www.eclipse.org/emf/2002/Ecore#//E" + value;	220	String data = ((Text)textChild).getData();
		221	if(data != null)
		222	newElement.appendChild(newDocument.createTextNode(data));
218	}	223	}
219	else if(value.startsWith("ImportLogFilterType:"))	224
		225	NamedNodeMap attributes = element.getAttributes();
		226	for(int i = 0; i < attributes.getLength(); i++)
220	{	227	{
221	value = value.replaceFirst("ImportLogFilterType:", "org.eclipse.hyades.log.ui.ImportLogFilterType:");	228	Node attribute = attributes.item(i);
		229	String name = attribute.getNodeName();
		230	if(name.equals("category"))
		231	{
		232	name = "xsi:type";
		233	}
		234	else if(nodeName.equals("valueType") && name.equals("type"))
		235	{
		236	name = "href";
		237	}
		238
		239	String value = attribute.getNodeValue();
		240	if(value.startsWith("Hierarchial"))
		241	{
		242	value = value.replaceFirst("Hierarchial", "HierarchyExtensions:");
		243	}
		244	else if(value.startsWith("Event:"))
		245	{
		246	value = value.replaceFirst("Event:", "ecore:E");
		247	}
		248	else if(nodeName.equals("valueType") && name.equals("href"))
		249	{
		250	value = "http://www.eclipse.org/emf/2002/Ecore#//E" + value;
		251	}
		252	else if(value.startsWith("ImportLogFilterType:"))
		253	{
		254	value = value.replaceFirst("ImportLogFilterType:", "org.eclipse.hyades.log.ui.ImportLogFilterType:");
		255	}
		256
		257	newElement.setAttribute(name, value);
222	}	258	}
223		259
224	newElement.setAttribute(name, value);
225	}
226
227	if(parent == null)
228	{
229	newDocument.appendChild(newElement);
230	}
231	else
232	{
233	parent.appendChild(newElement);	260	parent.appendChild(newElement);
		261	parent = newElement;
234	}	262	}
235	parent = newElement;
236		263
237	if(nodeName.equals("filters"))
238	{
239	Element xmiElement = newDocument.createElement("xmi:XMI");
240
241	xmiElement.setAttribute("xmi:version", "2.0");
242	xmiElement.setAttribute("xmlns:xmi", "http://www.omg.org/XMI");
243	xmiElement.setAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance");
244	xmiElement.setAttribute("xmlns:HierarchyExtensions", "http://www.eclipse.org/hyades/models/hierarchy-extensions.xmi");
245	xmiElement.setAttribute("xmlns:ecore", "http://www.eclipse.org/emf/2002/Ecore");
246
247	parent.appendChild(xmiElement);
248
249	parent = xmiElement;
250	}
251
252	NodeList children = element.getChildNodes();	264	NodeList children = element.getChildNodes();
253	for(int i = 0; i < children.getLength(); i++)	265	for(int i = 0; i < children.getLength(); i++)
254	{	266	{