Attachment #64924 for bug #163352

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

Lines 12-17 Link Here

(-)src/org/eclipse/tptp/monitoring/logui/internal/wizards/LogSetManager.java (-2 / +111 lines)
12		12
13	package org.eclipse.tptp.monitoring.logui.internal.wizards;	13	package org.eclipse.tptp.monitoring.logui.internal.wizards;
14		14
		15	import java.io.ByteArrayOutputStream;
		16	import java.io.IOException;
		17	import java.io.StringWriter;
15	import java.net.URL;	18	import java.net.URL;
16	import java.util.ArrayList;	19	import java.util.ArrayList;
17	import java.util.HashMap;	20	import java.util.HashMap;
Lines 20-36 Link Here
20	import java.util.Map;	23	import java.util.Map;
21	import java.util.Set;	24	import java.util.Set;
22		25
		26	import org.apache.xml.serialize.OutputFormat;
		27	import org.apache.xml.serialize.XMLSerializer;
23	import org.eclipse.core.runtime.IConfigurationElement;	28	import org.eclipse.core.runtime.IConfigurationElement;
24	import org.eclipse.core.runtime.IStatus;	29	import org.eclipse.core.runtime.IStatus;
25	import org.eclipse.core.runtime.Platform;	30	import org.eclipse.core.runtime.Platform;
26	import org.eclipse.core.runtime.Status;	31	import org.eclipse.core.runtime.Status;
27	import org.eclipse.emf.common.util.URI;	32	import org.eclipse.emf.common.util.URI;
28	import org.eclipse.emf.ecore.util.EcoreUtil;	33	import org.eclipse.emf.ecore.util.EcoreUtil;
		34	import org.eclipse.emf.ecore.xmi.XMLResource;
29	import org.eclipse.hyades.internal.execution.local.common.Constants;	35	import org.eclipse.hyades.internal.execution.local.common.Constants;
30	import org.eclipse.hyades.models.hierarchy.TRCAgentProxy;	36	import org.eclipse.hyades.models.hierarchy.TRCAgentProxy;
31	import org.eclipse.hyades.ui.filters.IFilterScopes;	37	import org.eclipse.hyades.ui.filters.IFilterScopes;
32	import org.eclipse.hyades.ui.filters.internal.util.FilterInformationManager;	38	import org.eclipse.hyades.ui.filters.internal.util.FilterInformationManager;
33	import org.eclipse.hyades.ui.filters.internal.util.FilterQueries;	39	import org.eclipse.hyades.ui.filters.internal.util.FilterQueries;
		40	import org.eclipse.hyades.ui.filters.internal.util.FilterResourceFileHandler;
		41	import org.eclipse.hyades.ui.filters.internal.util.FilterResourceHandler;
34	import org.eclipse.hyades.ui.internal.util.XMLUtil;	42	import org.eclipse.hyades.ui.internal.util.XMLUtil;
35		43
36	import org.eclipse.jface.preference.IPreferenceStore;	44	import org.eclipse.jface.preference.IPreferenceStore;
Lines 38-44 Link Here
38	import org.eclipse.tptp.monitoring.logui.internal.LogUIMessages;	46	import org.eclipse.tptp.monitoring.logui.internal.LogUIMessages;
39	import org.eclipse.tptp.monitoring.logui.internal.MonitoringLogUIPlugin;	47	import org.eclipse.tptp.monitoring.logui.internal.MonitoringLogUIPlugin;
40	import org.eclipse.tptp.platform.common.ui.trace.internal.helpers.TraceUIManager;	48	import org.eclipse.tptp.platform.common.ui.trace.internal.helpers.TraceUIManager;
		49	import org.w3c.dom.Document;
41	import org.w3c.dom.Element;	50	import org.w3c.dom.Element;
		51	import org.w3c.dom.Node;
42	import org.w3c.dom.NodeList;	52	import org.w3c.dom.NodeList;
43		53
44	import com.ibm.icu.util.StringTokenizer;	54	import com.ibm.icu.util.StringTokenizer;
Lines 50-56 Link Here
50	public static final String LOGSET_TAG = "logset";	60	public static final String LOGSET_TAG = "logset";
51	public static final String LOGELEMENT_TAG = "LogFileElement";	61	public static final String LOGELEMENT_TAG = "LogFileElement";
52	public static final String DEFAULT_LOGSET = LogUIMessages._54;	62	public static final String DEFAULT_LOGSET = LogUIMessages._54;
53		63	public static final String FILTER_TAG = "filters";
		64	public static final String EXPORT_URI="/temp.txt";
		65	public static final Map RESOURCE_OPTIONS = new HashMap();
		66	{
		67	RESOURCE_OPTIONS.put(XMLResource.OPTION_DECLARE_XML, Boolean.FALSE);
		68	}
54	private IPreferenceStore preferenceStore = MonitoringLogUIPlugin.getDefault().getPreferenceStore();	69	private IPreferenceStore preferenceStore = MonitoringLogUIPlugin.getDefault().getPreferenceStore();
55	private String defaultLogSet;	70	private String defaultLogSet;
56	private Map logSetsList = new HashMap();	71	private Map logSetsList = new HashMap();
Lines 87-93 Link Here
87	loadParserRegistry();	102	loadParserRegistry();
88		103
89	}	104	}
90		105	public void saveLogSetFilters(List logSetFilterList) {
		106	FilterResourceHandler rTarget = FilterResourceHandler.instance(); //list of all existing filters
		107	Object[] targetFilterQueries = rTarget.toArray();
		108	if(targetFilterQueries.length > 0){
		109	for (int i = 0; i < targetFilterQueries.length; i++)
		110	{
		111	FilterQueries existingFQ = (FilterQueries) targetFilterQueries[i];
		112	if(existingFQ != null){
		113	String targetFilterName = (existingFQ).name();
		114	for (Iterator iter = logSetFilterList.iterator(); iter.hasNext();) {
		115	FilterQueries fq = (FilterQueries) iter.next();
		116	if(fq != null){
		117	if(targetFilterName.equals(fq.name())){
		118	rTarget.removeFilter(existingFQ);
		119	}
		120	rTarget.addFilter(fq);
		121	}
		122	}
		123	}
		124	}
		125	}
		126	else{
		127	for (Iterator iter = logSetFilterList.iterator(); iter.hasNext();) {
		128	FilterQueries fq = (FilterQueries) iter.next();
		129	if(fq != null){
		130	rTarget.addFilter(fq);
		131	}
		132	}
		133	}
		134	rTarget.save();
		135	}
		136	public static String toString(Node xml) {
		137	return toString(xml, true);
		138	}
		139
		140	public static String toString(Node xml, boolean printHeader) {
		141	return toString(xml, printHeader, true);
		142	}
		143
		144	public static String toString(Node xml, boolean printHeader,
		145	boolean printIndents) {
		146	short type = xml.getNodeType();
		147	if (type == 3) {
		148	return xml.getNodeValue();
		149	}
		150	XMLSerializer serializer = new XMLSerializer();
		151	serializer.setNamespaces(true);
		152	OutputFormat formatter = new OutputFormat();
		153	formatter.setOmitXMLDeclaration(!printHeader);
		154	formatter.setIndenting(printIndents);
		155	serializer.setOutputFormat(formatter);
		156	StringWriter writer = new StringWriter();
		157	serializer.setOutputCharStream(writer);
		158	try {
		159	if (type == 9) {
		160	serializer.serialize((Document) xml);
		161	} else {
		162	serializer.serialize((Element) xml);
		163	}
		164	} catch (IOException error) {
		165	throw new RuntimeException(error.getMessage(), error);
		166	}
		167	return writer.toString();
		168	}
		169	public String generateLogSetFilterDefEntry(List logSetFilterList){
170	if (logSetFilterList != null && (logSetFilterList.size() > 0)) {
171	StringBuffer xmlString = new StringBuffer();
172	xmlString.append(" <");
173	xmlString.append(FILTER_TAG);
174	xmlString.append("> ");
175	FilterResourceFileHandler rtarget = FilterResourceFileHandler.instance(URI.createFileURI(EXPORT_URI));
176	rtarget.clear();
177	for (Iterator iter = logSetFilterList.iterator(); iter.hasNext();) {
178	FilterQueries fq = (FilterQueries)iter.next();
179	if(fq != null){
180	rtarget.addFilter(fq.copy());
181	}
182	}
183	if (rtarget instanceof XMLResource) {
184	((XMLResource) rtarget).setEncoding("UTF-8");
185	}
186	ByteArrayOutputStream oStream = new ByteArrayOutputStream();
187	rtarget.save(oStream, RESOURCE_OPTIONS);
188	byte[] b = oStream.toByteArray();
189	String filterStr = new String(b);
190	xmlString.append(filterStr);
191	xmlString.append(" </");
192	xmlString.append(FILTER_TAG);
193	xmlString.append("> ");
194	return xmlString.toString();
195
196	}
197	return "";
198	}
199
91	public void loadLogSets(){	200	public void loadLogSets(){
92		201
93	String prefXML = preferenceStore.getString(LOGSETS_KEY);	202	String prefXML = preferenceStore.getString(LOGSETS_KEY);

Lines 23-28 Link Here

(-)src/org/eclipse/tptp/monitoring/logui/internal/wizards/ExportLogSetsUI.java (-2 / +35 lines)
23	import java.util.List;	23	import java.util.List;
24		24
25	import org.eclipse.core.runtime.Path;	25	import org.eclipse.core.runtime.Path;
		26	import org.eclipse.hyades.ui.filters.internal.util.FilterQueries;
		27	import org.eclipse.hyades.ui.filters.internal.util.FilterResourceHandler;
26	import org.eclipse.hyades.ui.internal.util.ContextIds;	28	import org.eclipse.hyades.ui.internal.util.ContextIds;
27	import org.eclipse.hyades.ui.internal.util.XMLUtil;	29	import org.eclipse.hyades.ui.internal.util.XMLUtil;
28	import org.eclipse.jface.dialogs.IDialogConstants;	30	import org.eclipse.jface.dialogs.IDialogConstants;
Lines 32-37 Link Here
32	import org.eclipse.swt.widgets.Composite;	34	import org.eclipse.swt.widgets.Composite;
33	import org.eclipse.tptp.monitoring.logui.internal.LogUIMessages;	35	import org.eclipse.tptp.monitoring.logui.internal.LogUIMessages;
34	import org.eclipse.tptp.monitoring.logui.internal.MonitoringLogUIPlugin;	36	import org.eclipse.tptp.monitoring.logui.internal.MonitoringLogUIPlugin;
		37	import org.eclipse.tptp.monitoring.logui.internal.wizards.LogFileElement.Filter;
35	import org.eclipse.tptp.platform.common.ui.internal.CommonUIPlugin;	38	import org.eclipse.tptp.platform.common.ui.internal.CommonUIPlugin;
36	import org.eclipse.ui.PlatformUI;	39	import org.eclipse.ui.PlatformUI;
37	import org.eclipse.ui.dialogs.IOverwriteQuery;	40	import org.eclipse.ui.dialogs.IOverwriteQuery;
Lines 59-69 Link Here
59		62
60	Iterator keySet = getDoubleList().getTargetItems().iterator();	63	Iterator keySet = getDoubleList().getTargetItems().iterator();
61	String key = "";	64	String key = "";
		65	List filterList = new ArrayList();
62	while(keySet.hasNext()) {	66	while(keySet.hasNext()) {
63	key = (String) keySet.next();	67	key = (String) keySet.next();
64	xmlString.append(lsMgr.generateLogSetPrefEntry(key));	68	xmlString.append(lsMgr.generateLogSetPrefEntry(key));
		69	populateLogSetFilterList(key,filterList);
65	}	70	}
66		71	xmlString.append(lsMgr.generateLogSetFilterDefEntry(filterList));
67	xmlString.append(" </");	72	xmlString.append(" </");
68	xmlString.append(LogSetManager.LOGSETS_KEY);	73	xmlString.append(LogSetManager.LOGSETS_KEY);
69	xmlString.append(">");	74	xmlString.append(">");
Lines 108-113 Link Here
108	return true;	113	return true;
109	}	114	}
110		115
		116	protected void populateLogSetFilterList(String key,List filterList){
		117	List logSet = (List) lsMgr.getLogSets().get(key);
		118	if (logSet != null) {
		119	LogFileElement element = null;
		120	Filter filter = null;
		121	for (Iterator iter1 = logSet.iterator(); iter1.hasNext();) {
		122	element = (LogFileElement) iter1.next();
		123	filter = element.getFilter();
		124	if (filter != null) {
		125	String filterName = filter.getName();
		126	FilterQueries fq = FilterResourceHandler.instance().filter(filterName);
		127	if(fq != null){
		128	boolean flag = true;
		129	for (Iterator iter2 = filterList.iterator(); iter2.hasNext();) {
		130	if(((FilterQueries)iter2.next()).name().equals(fq.name())){
		131	flag = false;
		132	break;
		133	}
		134	}
		135	if(flag){
		136	filterList.add(fq);
		137	}
		138	}
		139	}
		140	}
		141	}
		142	}
		143
111	protected List populateFilterList() {	144	protected List populateFilterList() {
112		145
113	lsMgr = LogSetManager.getInstance();	146	lsMgr = LogSetManager.getInstance();





package org.eclipse.tptp.monitoring.logui.internal.wizards;

import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;

import javax.xml.parsers.DocumentBuilderFactory;
import org.eclipse.emf.common.util.URI;
import org.eclipse.hyades.ui.filters.internal.util.FilterQueries;
import org.eclipse.hyades.ui.filters.internal.util.FilterResourceFileHandler;
import org.eclipse.hyades.ui.internal.util.ContextIds;
import org.eclipse.hyades.ui.internal.util.XMLUtil;
import org.eclipse.jface.dialogs.IMessageProvider;

import org.eclipse.tptp.monitoring.logui.internal.MonitoringLogUIPlugin;
import org.eclipse.tptp.platform.common.ui.internal.CommonUIPlugin;
import org.eclipse.ui.PlatformUI;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;

public class ImportLogSetsUI extends ImportExportLogSetsUI {

	public boolean finish() {
		
		List list = doubleList.getTargetItems();
		List filterList = new ArrayList();
		FilterResourceFileHandler rSource = populateLogSetFilterXML();
		String name=null;
		for(int idx=0; idx<list.size(); idx++)
		{
			Element elem = (Element)list.get(idx);
			
			if(idx==0){
				name = elem.getAttribute("name");
				populateLogSetFilterList(rSource,elem,filterList);
				lsMgr.loadLogSet(elem);			
			}
		}
		lsMgr.saveLogSetFilters(filterList);
		rSource.clear();

		if(name != null)
		{
			lsMgr.setDefaultLogSet(name);

		return true;
	}

	private void populateLogSetFilterList(FilterResourceFileHandler rSource , Element elem,List filterList){
		NodeList logNodeList = XMLUtil.getChildrenByName(elem,LogSetManager.LOGELEMENT_TAG);
		Element element = null;
		for (int i = 0, maxi = logNodeList.getLength(); i < maxi; i++) {
			if (logNodeList.item(i) instanceof Element) {
				element = (Element) logNodeList.item(i);
				NodeList filterNodes = XMLUtil.getChildrenByName(element, "filter");
				if (filterNodes != null && filterNodes.getLength() > 0) {
					if (filterNodes.item(0) instanceof Element) {
						String filterName = ((Element) filterNodes.item(0)).getAttribute("name");
						FilterQueries fq = rSource.filter(filterName);
						if(fq != null){
							boolean flag = true;
							for (Iterator iter2 = filterList.iterator(); iter2.hasNext();) {
								if(((FilterQueries)iter2.next()).name().equals(fq.name())){
									flag = false;
									break;
								}
							}
							if(flag){
								filterList.add(fq);
							}
						}
					}
				}
			}
			
		}
	}
	protected FilterResourceFileHandler populateLogSetFilterXML()
	{
		String fileName = sourceNameField.getText().trim();
		List tempfilterList = new ArrayList();
		Node filterNode = null;
		if ((new File(fileName)).exists())
		{
			try {
			    FileInputStream inputStream = new FileInputStream(fileName);
			    Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(inputStream);
			    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))
			    	{
			    		filterNode = (Element)nl.item(l1);
			    		FilterResourceFileHandler rSource = FilterResourceFileHandler.instance(URI.createFileURI(fileName)); //filters list to store new imported filters 
			    		rSource.clear();
			    		InputStream is = new ByteArrayInputStream(LogSetManager.toString(filterNode).getBytes());
						rSource.load(is, LogSetManager.RESOURCE_OPTIONS);
						return rSource;
			    	}
			    }
			}
			catch(Exception exception)
			{
				exception.printStackTrace();
				MonitoringLogUIPlugin.log(exception);
			}
		}
		return null;
	}

	protected List populateFilterList()
	{
		String fileName = sourceNameField.getText().trim();

Lines 13-19 Link Here

(-)src-common-internal/org/eclipse/hyades/ui/filters/internal/util/FilterResourceFileHandler.java (+34 lines)
13	package org.eclipse.hyades.ui.filters.internal.util;	13	package org.eclipse.hyades.ui.filters.internal.util;
14		14
15	import java.io.IOException;	15	import java.io.IOException;
		16	import java.io.InputStream;
		17	import java.io.OutputStream;
16	import java.util.Collections;	18	import java.util.Collections;
		19	import java.util.Map;
17	import java.util.Vector;	20	import java.util.Vector;
18		21
19	import org.eclipse.emf.common.util.URI;	22	import org.eclipse.emf.common.util.URI;
Lines 119-124 Link Here
119	CommonPlugin.logError(e);	122	CommonPlugin.logError(e);
120	}	123	}
121	}	124	}
		125	public void save(OutputStream oStream,Map resourceMap)
		126	{
		127	try
		128	{
		129	if (_resource instanceof XMLResource) {
		130	((XMLResource)_resource).setEncoding("UTF-8");
		131	}
		132	_resource.save(oStream,resourceMap);
		133
		134	} catch (IOException e) {
		135	CommonPlugin.logError(e);
		136	}
		137	}
		138	public void load(InputStream is,Map resourceMap)
		139	{
		140	if (_resource == null)
		141	{
		142	restoreResource();
		143	}
		144	else
		145	{
		146	try
		147	{
		148	unload(false);
		149	_resource.load(is,resourceMap);
		150	}
		151	catch (IOException e) {
		152	CommonPlugin.logError(e);
		153	}
		154	}
		155	}
122		156
123	public void load()	157	public void load()
124	{	158	{

Return to bug 163352